summaryrefslogtreecommitdiff
path: root/sw/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui')
-rw-r--r--sw/source/ui/dialog/swdlgfact.cxx116
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx18
2 files changed, 31 insertions, 103 deletions
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index f3f71dd0dfa4..ddc6e0edd2ec 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -674,23 +674,10 @@ AbstractSwAsciiFilterDlg* SwAbstractDialogFactory_Impl::CreateSwAsciiFilterDlg(
VclAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwInsertBookmarkDlg( vcl::Window *pParent,
SwWrtShell &rSh,
- SfxRequest& rReq,
- int nResId )
+ SfxRequest& rReq )
{
- Dialog* pDlg=nullptr;
- switch ( nResId )
- {
- case DLG_INSERT_BOOKMARK :
- pDlg = VclPtr<SwInsertBookmarkDlg>::Create( pParent, rSh, rReq );
- break;
-
- default:
- break;
- }
-
- if ( pDlg )
- return new VclAbstractDialog_Impl( pDlg );
- return nullptr;
+ VclPtr<SwInsertBookmarkDlg> pDlg = VclPtr<SwInsertBookmarkDlg>::Create( pParent, rSh, rReq );
+ return new VclAbstractDialog_Impl( pDlg );
}
AbstractSwBreakDlg * SwAbstractDialogFactory_Impl::CreateSwBreakDlg(vcl::Window *pParent,
@@ -719,22 +706,10 @@ AbstractSwConvertTableDlg* SwAbstractDialogFactory_Impl::CreateSwConvertTableDlg
return new AbstractSwConvertTableDlg_Impl(pDlg);
}
-VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwCaptionDialog ( vcl::Window *pParent, SwView &rV,int nResId)
+VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwCaptionDialog ( vcl::Window *pParent, SwView &rV)
{
- VclPtr<Dialog> pDlg;
- switch ( nResId )
- {
- case DLG_CAPTION :
- pDlg = VclPtr<SwCaptionDialog>::Create( pParent, rV );
- break;
-
- default:
- break;
- }
-
- if ( pDlg.get() )
- return new VclAbstractDialog_Impl( pDlg );
- return nullptr;
+ VclPtr<Dialog> pDlg = VclPtr<SwCaptionDialog>::Create( pParent, rV );
+ return new VclAbstractDialog_Impl( pDlg );
}
AbstractSwInsertDBColAutoPilot* SwAbstractDialogFactory_Impl::CreateSwInsertDBColAutoPilot( SwView& rView,
@@ -781,11 +756,10 @@ SwLabDlgMethod SwAbstractDialogFactory_Impl::GetSwLabDlgStaticMethod ()
SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwParaDlg ( vcl::Window *pParent, SwView& rVw,
const SfxItemSet& rCoreSet ,
- const OUString *pCollName,
bool bDraw ,
const OString& sDefPage)
{
- VclPtr<SfxTabDialog> pDlg = VclPtr<SwParaDlg>::Create( pParent, rVw, rCoreSet, DLG_STD, pCollName, bDraw, sDefPage );
+ VclPtr<SfxTabDialog> pDlg = VclPtr<SwParaDlg>::Create( pParent, rVw, rCoreSet, DLG_STD, nullptr, bDraw, sDefPage );
return new AbstractTabDialog_Impl( pDlg );
}
@@ -833,38 +807,16 @@ AbstractSwAutoFormatDlg * SwAbstractDialogFactory_Impl::CreateSwAutoFormatDlg(vc
return new AbstractSwAutoFormatDlg_Impl(pDlg);
}
-SfxAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwBorderDlg(vcl::Window* pParent, SfxItemSet& rSet, SwBorderModes nType, int nResId )
+SfxAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwBorderDlg(vcl::Window* pParent, SfxItemSet& rSet, SwBorderModes nType )
{
- VclPtr<SfxModalDialog> pDlg;
- switch ( nResId )
- {
- case RC_DLG_SWBORDERDLG :
- pDlg = VclPtr<SwBorderDlg>::Create( pParent, rSet, nType );
- break;
- default:
- break;
- }
-
- if ( pDlg.get() )
- return new SwAbstractSfxDialog_Impl( pDlg );
- return nullptr;
+ VclPtr<SfxModalDialog> pDlg = VclPtr<SwBorderDlg>::Create( pParent, rSet, nType );
+ return new SwAbstractSfxDialog_Impl( pDlg );
}
-SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwWrapDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, int nResId )
+SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwWrapDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh )
{
- VclPtr<SfxModalDialog> pDlg;
- switch ( nResId )
- {
- case RC_DLG_SWWRAPDLG :
- pDlg = VclPtr<SwWrapDlg>::Create( pParent, rSet, pSh, true/*bDrawMode*/ );
- break;
- default:
- break;
- }
-
- if ( pDlg.get() )
- return new SwAbstractSfxDialog_Impl( pDlg );
- return nullptr;
+ VclPtr<SfxModalDialog> pDlg = VclPtr<SwWrapDlg>::Create( pParent, rSet, pSh, true/*bDrawMode*/ );
+ return new SwAbstractSfxDialog_Impl( pDlg );
}
VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwTableWidthDlg(vcl::Window *pParent, SwTableFUNC &rFnc)
@@ -886,21 +838,10 @@ AbstractSwFieldDlg * SwAbstractDialogFactory_Impl::CreateSwFieldDlg(SfxBindings*
return new AbstractSwFieldDlg_Impl(pDlg);
}
-SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwFieldEditDlg ( SwView& rVw, int nResId )
+SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwFieldEditDlg ( SwView& rVw )
{
- VclPtr<SfxModalDialog> pDlg;
- switch ( nResId )
- {
- case RC_DLG_SWFLDEDITDLG :
- pDlg = VclPtr<SwFieldEditDlg>::Create( rVw );
- break;
- default:
- break;
- }
-
- if ( pDlg.get() )
- return new SwAbstractSfxDialog_Impl( pDlg );
- return nullptr;
+ VclPtr<SfxModalDialog> pDlg = VclPtr<SwFieldEditDlg>::Create( rVw );
+ return new SwAbstractSfxDialog_Impl( pDlg );
}
AbstractSwRenameXNamedDlg * SwAbstractDialogFactory_Impl::CreateSwRenameXNamedDlg(vcl::Window* pParent,
@@ -927,10 +868,9 @@ SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateFrameTabDialog(const O
SfxViewFrame *pFrame, vcl::Window *pParent,
const SfxItemSet& rCoreSet,
bool bNewFrame,
- const OString& sDefPage,
- const OUString* pFormatStr )
+ const OString& sDefPage )
{
- VclPtr<SfxTabDialog> pDlg = VclPtr<SwFrameDlg>::Create(pFrame, pParent, rCoreSet, bNewFrame, rDialogType, false/*bFormat*/, sDefPage, pFormatStr);
+ VclPtr<SfxTabDialog> pDlg = VclPtr<SwFrameDlg>::Create(pFrame, pParent, rCoreSet, bNewFrame, rDialogType, false/*bFormat*/, sDefPage, nullptr);
return new AbstractTabDialog_Impl(pDlg);
}
@@ -993,25 +933,15 @@ AbstractJavaEditDialog * SwAbstractDialogFactory_Impl::CreateJavaEditDialog(
return new AbstractJavaEditDialog_Impl( pDlg );
}
-AbstractMailMergeDlg * SwAbstractDialogFactory_Impl::CreateMailMergeDlg( int nResId,
+AbstractMailMergeDlg * SwAbstractDialogFactory_Impl::CreateMailMergeDlg(
vcl::Window* pParent, SwWrtShell& rSh,
const OUString& rSourceName,
const OUString& rTableName,
sal_Int32 nCommandType,
const uno::Reference< sdbc::XConnection>& xConnection )
{
- VclPtr<SwMailMergeDlg> pDlg;
- switch ( nResId )
- {
- case DLG_MAILMERGE :
- pDlg = VclPtr<SwMailMergeDlg>::Create( pParent, rSh, rSourceName, rTableName, nCommandType, xConnection, nullptr );
- break;
- default:
- break;
- }
- if ( pDlg.get() )
- return new AbstractMailMergeDlg_Impl( pDlg );
- return nullptr;
+ VclPtr<SwMailMergeDlg> pDlg = VclPtr<SwMailMergeDlg>::Create( pParent, rSh, rSourceName, rTableName, nCommandType, xConnection, nullptr );
+ return new AbstractMailMergeDlg_Impl( pDlg );
}
AbstractMailMergeCreateFromDlg * SwAbstractDialogFactory_Impl::CreateMailMergeCreateFromDlg(vcl::Window* pParent)
@@ -1058,10 +988,10 @@ SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwTabDialog( int nResI
AbstractMultiTOXTabDialog * SwAbstractDialogFactory_Impl::CreateMultiTOXTabDialog(
vcl::Window* pParent, const SfxItemSet& rSet,
SwWrtShell &rShell,
- SwTOXBase* pCurTOX, sal_uInt16 nToxType,
+ SwTOXBase* pCurTOX,
bool bGlobal)
{
- VclPtr<SwMultiTOXTabDialog> pDlg = VclPtr<SwMultiTOXTabDialog>::Create( pParent, rSet, rShell, pCurTOX, nToxType, bGlobal );
+ VclPtr<SwMultiTOXTabDialog> pDlg = VclPtr<SwMultiTOXTabDialog>::Create( pParent, rSet, rShell, pCurTOX, USHRT_MAX, bGlobal );
return new AbstractMultiTOXTabDialog_Impl( pDlg );
}
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 49baf298764a..6110e98d536c 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -378,13 +378,13 @@ public:
virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg() override;
virtual AbstractSwAsciiFilterDlg* CreateSwAsciiFilterDlg ( SwDocShell& rDocSh,
SvStream* pStream ) override;
- virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( vcl::Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId ) override;
+ virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( vcl::Window *pParent, SwWrtShell &rSh, SfxRequest& rReq ) override;
virtual AbstractSwBreakDlg * CreateSwBreakDlg(vcl::Window *pParent, SwWrtShell &rSh) override;
virtual VclAbstractDialog * CreateSwChangeDBDlg(SwView& rVw) override;
virtual SfxAbstractTabDialog * CreateSwCharDlg(vcl::Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet,
SwCharDlgMode nDialogMode, const OUString* pFormatStr = nullptr) override;
virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg(SwView& rView, bool bToTable) override;
- virtual VclAbstractDialog * CreateSwCaptionDialog ( vcl::Window *pParent, SwView &rV,int nResId) override;
+ virtual VclAbstractDialog * CreateSwCaptionDialog ( vcl::Window *pParent, SwView &rV) override;
virtual AbstractSwInsertDBColAutoPilot* CreateSwInsertDBColAutoPilot(SwView& rView,
css::uno::Reference< css::sdbc::XDataSource> rxSource,
@@ -402,7 +402,6 @@ public:
virtual SfxAbstractTabDialog* CreateSwParaDlg ( vcl::Window *pParent,
SwView& rVw,
const SfxItemSet& rCoreSet,
- const OUString *pCollName,
bool bDraw,
const OString& sDefPage = OString() ) override;
@@ -413,14 +412,14 @@ public:
virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pShell,
bool bSetAutoFormat = true,
const SwTableAutoFormat* pSelFormat = nullptr ) override;
- virtual SfxAbstractDialog * CreateSwBorderDlg (vcl::Window* pParent, SfxItemSet& rSet, SwBorderModes nType, int nResId ) override;
+ virtual SfxAbstractDialog * CreateSwBorderDlg (vcl::Window* pParent, SfxItemSet& rSet, SwBorderModes nType ) override;
- virtual SfxAbstractDialog * CreateSwWrapDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, int nResId ) override;
+ virtual SfxAbstractDialog * CreateSwWrapDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh ) override;
virtual VclAbstractDialog * CreateSwTableWidthDlg(vcl::Window *pParent, SwTableFUNC &rFnc) override;
virtual SfxAbstractTabDialog* CreateSwTableTabDlg(vcl::Window* pParent, SfxItemPool& Pool,
const SfxItemSet* pItemSet, SwWrtShell* pSh) override;
virtual AbstractSwFieldDlg * CreateSwFieldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent) override;
- virtual SfxAbstractDialog* CreateSwFieldEditDlg ( SwView& rVw, int nResId ) override;
+ virtual SfxAbstractDialog* CreateSwFieldEditDlg ( SwView& rVw ) override;
virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg(vcl::Window* pParent,
css::uno::Reference< css::container::XNamed > & xNamed,
css::uno::Reference< css::container::XNameAccess > & xNameAccess) override;
@@ -431,8 +430,7 @@ public:
SfxViewFrame *pFrame, vcl::Window *pParent,
const SfxItemSet& rCoreSet,
bool bNewFrame = true,
- const OString& sDefPage = OString(),
- const OUString* pFormatStr = nullptr) override;
+ const OString& sDefPage = OString()) override;
virtual SfxAbstractApplyTabDialog* CreateTemplateDialog(
vcl::Window *pParent,
SfxStyleSheetBase& rBase,
@@ -452,7 +450,7 @@ public:
virtual AbstractInsTableDlg* CreateInsTableDlg(SwView& rView) override;
virtual AbstractJavaEditDialog* CreateJavaEditDialog(vcl::Window* pParent,
SwWrtShell* pWrtSh) override;
- virtual AbstractMailMergeDlg* CreateMailMergeDlg( int nResId,
+ virtual AbstractMailMergeDlg* CreateMailMergeDlg(
vcl::Window* pParent, SwWrtShell& rSh,
const OUString& rSourceName,
const OUString& rTableName,
@@ -468,7 +466,7 @@ public:
virtual AbstractMultiTOXTabDialog* CreateMultiTOXTabDialog(
vcl::Window* pParent, const SfxItemSet& rSet,
SwWrtShell &rShell,
- SwTOXBase* pCurTOX, sal_uInt16 nToxType,
+ SwTOXBase* pCurTOX,
bool bGlobal) override;
virtual AbstractEditRegionDlg* CreateEditRegionDlg(vcl::Window* pParent, SwWrtShell& rWrtSh) override;
virtual AbstractInsertSectionTabDialog* CreateInsertSectionTabDialog(
generated by cgit (git 2.34.1) at 2025-02-24 10:13:52 +0000