diff options
| -rw-r--r-- | sw/source/ui/dialog/swdlgfact.cxx | 6 | ||||
| -rw-r--r-- | sw/source/ui/inc/table.hrc | 2 | ||||
| -rw-r--r-- | sw/source/ui/shells/tabsh.cxx | 21 | ||||
| -rw-r--r-- | sw/source/ui/table/makefile.mk | 2 | ||||
| -rw-r--r-- | sw/util/makefile.mk | 1 |
5 files changed, 15 insertions, 17 deletions
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 7313bb91de..4e27969016 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -93,7 +93,6 @@ #include <glossary.hxx> //add for SwGlossaryDlg #include <inpdlg.hxx> //add for SwFldInputDlg #include <insfnote.hxx> //add for SwInsFootNoteDlg -#include <insrc.hxx> //add for SwInsRowColDlg #include <insrule.hxx> //add for SwInsertGrfRulerDlg #include <instable.hxx> //add for SwInsTableDlg #include <javaedit.hxx> //add for SwJavaEditDialog @@ -1359,14 +1358,11 @@ AbstractInsFootNoteDlg* SwAbstractDialogFactory_Impl::CreateInsFootNoteDlg( int } VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateVclSwViewDialog( int nResId, - SwView& rView, BOOL bCol ) //add for SwInsRowColDlg, SwLineNumberingDlg + SwView& rView, BOOL /*bCol*/ ) //add for SwInsRowColDlg, SwLineNumberingDlg { Dialog* pDlg=NULL; switch ( nResId ) { - case DLG_INS_ROW_COL : - pDlg = new SwInsRowColDlg( rView, bCol ); - break; case DLG_LINE_NUMBERING : pDlg = new SwLineNumberingDlg( &rView ); break; diff --git a/sw/source/ui/inc/table.hrc b/sw/source/ui/inc/table.hrc index 330dffa512..3294331c86 100644 --- a/sw/source/ui/inc/table.hrc +++ b/sw/source/ui/inc/table.hrc @@ -33,7 +33,7 @@ #define DLG_INSERT_TABLE RC_TABLE_BEGIN #define DLG_FORMAT_TABLE (RC_TABLE_BEGIN + 1) #define DLG_CONV_TEXT_TABLE (RC_TABLE_BEGIN + 2) -#define DLG_INS_ROW_COL (RC_TABLE_BEGIN + 3) +//#define DLG_INS_ROW_COL (RC_TABLE_BEGIN + 3) moved to svx #define DLG_ROW_HEIGHT (RC_TABLE_BEGIN + 4) #define DLG_SPLIT (RC_TABLE_BEGIN + 5) #define DLG_COL_WIDTH (RC_TABLE_BEGIN + 6) diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx index 2e1182e46b..577ea95c64 100644 --- a/sw/source/ui/shells/tabsh.cxx +++ b/sw/source/ui/shells/tabsh.cxx @@ -969,14 +969,19 @@ void SwTableShell::Execute(SfxRequest &rReq) case FN_TABLE_INSERT_ROW_DLG: { if ( FN_TABLE_INSERT_ROW_DLG != nSlot || !rSh.IsInRepeatedHeadline()) - { - SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!"); - VclAbstractDialog* pDlg = pFact->CreateVclSwViewDialog( DLG_INS_ROW_COL, - GetView(), FN_TABLE_INSERT_COL_DLG == nSlot ); - DBG_ASSERT(pDlg, "Dialogdiet fail!"); - pDlg->Execute(); - delete pDlg; + { + SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); + ::std::auto_ptr<SvxAbstractInsRowColDlg> pDlg( pFact ? pFact->CreateSvxInsRowColDlg( GetView().GetWindow(), nSlot == FN_TABLE_INSERT_COL_DLG, nSlot) : 0); + + if( pDlg.get() && (pDlg->Execute() == 1) ) + { + USHORT nDispatchSlot = (nSlot == FN_TABLE_INSERT_COL_DLG) ? FN_TABLE_INSERT_COL : FN_TABLE_INSERT_ROW; + SfxUInt16Item aCountItem( nDispatchSlot, static_cast< UINT16 >(pDlg->getInsertCount()) ); + SfxBoolItem aAfter( FN_PARAM_INSERT_AFTER, !pDlg->isInsertBefore() ); + SfxViewFrame* pVFrame = GetView().GetViewFrame(); + if( pVFrame ) + pVFrame->GetDispatcher()->Execute( nDispatchSlot, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, &aCountItem, &aAfter, 0L); + } } } break; diff --git a/sw/source/ui/table/makefile.mk b/sw/source/ui/table/makefile.mk index f862365cc3..5e39d0af3a 100644 --- a/sw/source/ui/table/makefile.mk +++ b/sw/source/ui/table/makefile.mk @@ -50,7 +50,6 @@ SRC1FILES = \ colwd.src \ convert.src \ chartins.src \ - insrc.src \ instable.src \ mergetbl.src \ rowht.src \ @@ -63,7 +62,6 @@ SLOFILES = \ $(SLO)$/colwd.obj \ $(SLO)$/convert.obj \ $(SLO)$/chartins.obj \ - $(SLO)$/insrc.obj \ $(SLO)$/instable.obj \ $(SLO)$/mergetbl.obj \ $(SLO)$/rowht.obj \ diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk index 405604c9ee..4fc3be91b9 100644 --- a/sw/util/makefile.mk +++ b/sw/util/makefile.mk @@ -255,7 +255,6 @@ LIB3OBJFILES = \ $(SLO)$/glossary.obj \ $(SLO)$/inpdlg.obj \ $(SLO)$/insfnote.obj \ - $(SLO)$/insrc.obj \ $(SLO)$/instable.obj \ $(SLO)$/insrule.obj \ $(SLO)$/javaedit.obj \ |