diff options
Diffstat (limited to 'sw/source/ui')
70 files changed, 107 insertions, 184 deletions
diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx index 7ab97a220950..54170ad8b34e 100644 --- a/sw/source/ui/chrdlg/break.cxx +++ b/sw/source/ui/chrdlg/break.cxx @@ -33,7 +33,6 @@ #include <pagedesc.hxx> #include <poolfmt.hxx> -#include <chrdlg.hrc> #include <strings.hrc> #include <SwStyleNameMapper.hxx> diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index e2206072ed32..3e30516b678d 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -29,7 +29,7 @@ #include <svl/cjkoptions.hxx> #include <cmdid.h> -#include <helpid.h> +#include <helpids.h> #include <swtypes.hxx> #include <view.hxx> #include <wrtsh.hxx> @@ -42,7 +42,6 @@ #include <poolfmt.hxx> #include <globals.hrc> -#include <chrdlg.hrc> #include <strings.hrc> #include <chrdlgmodes.hxx> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 0359fea82d63..674519f8e747 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -51,8 +51,6 @@ #include "uitool.hxx" #include "charfmt.hxx" -#include "chrdlg.hrc" - using namespace css; using namespace css::uno; using namespace css::lang; diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index 14605445d377..a529b83a7cb4 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -22,7 +22,7 @@ #include "hintids.hxx" #include "globals.hrc" #include "strings.hrc" -#include "helpid.h" +#include "helpids.h" #include <sfx2/objsh.hxx> #include <sfx2/htmlmode.hxx> #include <svx/svxids.hrc> diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx index 33b14a55b291..e7d2cbefe1d7 100644 --- a/sw/source/ui/chrdlg/pardlg.cxx +++ b/sw/source/ui/chrdlg/pardlg.cxx @@ -35,7 +35,6 @@ #include "uitool.hxx" #include "viewopt.hxx" #include <numpara.hxx> -#include "chrdlg.hrc" #include "strings.hrc" #include <svx/svxids.hrc> #include <svl/eitem.hxx> diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index 6d835abcf2e3..23a1f231211d 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -23,7 +23,7 @@ #include "view.hxx" #include "wrtsh.hxx" #include "globals.hrc" -#include "helpid.h" +#include "helpids.h" #include <sfx2/styfitem.hxx> @@ -35,7 +35,6 @@ #include "docstyle.hxx" #include "hints.hxx" -#include "chrdlg.hrc" #include <vcl/svapp.hxx> #include "swuiccoll.hxx" diff --git a/sw/source/ui/chrdlg/tblnumfm.cxx b/sw/source/ui/chrdlg/tblnumfm.cxx index 5220ee5c53a3..967fc154afae 100644 --- a/sw/source/ui/chrdlg/tblnumfm.cxx +++ b/sw/source/ui/chrdlg/tblnumfm.cxx @@ -22,8 +22,6 @@ #include <swtypes.hxx> #include <tblnumfm.hxx> -#include <chrdlg.hrc> - #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> #include <svl/itemset.hxx> diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index 3652ca979edf..95b0654c953d 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -35,7 +35,7 @@ #include <globals.hrc> #include <dbui.hrc> #include "bitmaps.hlst" -#include <helpid.h> +#include <helpids.h> using namespace ::com::sun::star; using namespace ::com::sun::star::lang; diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index e22191afa640..4a283717c990 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -20,7 +20,7 @@ #include <officecfg/Office/Writer.hxx> #include <comphelper/string.hxx> #include <swtypes.hxx> -#include <helpid.h> +#include <helpids.h> #include <uiitems.hxx> #include <modcfg.hxx> #include "swmodule.hxx" diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index 617957d5c7a6..7c79409a8fee 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -58,7 +58,7 @@ #include <dbui.hrc> #include <view.hxx> -#include <helpid.h> +#include <helpids.h> #include <unomid.h> using namespace ::com::sun::star; diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index 0fc38dd56497..07bffc295a99 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -43,7 +43,7 @@ #include <tools/urlobj.hxx> #include <dbui.hrc> #include <strings.hrc> -#include <helpid.h> +#include <helpids.h> #include <unomid.h> using namespace ::com::sun::star; diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx index dbc8c9fc0280..1e2851cc4324 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx @@ -23,7 +23,7 @@ #include <vcl/scrbar.hxx> #include <vcl/msgbox.hxx> #include <dbui.hrc> -#include <helpid.h> +#include <helpids.h> SwCustomizeAddressListDialog::SwCustomizeAddressListDialog( vcl::Window* pParent, const SwCSVData& rOldData) diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index 1d2ce52cfe64..03ad470f1d48 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -80,14 +80,12 @@ #include <dbui.hrc> #include <cmdid.h> -#include <helpid.h> -#include <cfgid.h> +#include <helpids.h> #include <SwStyleNameMapper.hxx> #include <comphelper/uno3.hxx> #include "tabsh.hxx" #include "swabstdlg.hxx" #include "strings.hrc" -#include "table.hrc" #include <unomid.h> #include <IDocumentMarkAccess.hxx> diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx index 84820c20826f..5856271632b7 100644 --- a/sw/source/ui/dbui/mailmergewizard.cxx +++ b/sw/source/ui/dbui/mailmergewizard.cxx @@ -34,7 +34,7 @@ #include <vcl/msgbox.hxx> #include <svx/dataaccessdescriptor.hxx> -#include <helpid.h> +#include <helpids.h> using namespace svt; using namespace ::com::sun::star; diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index b704f9d8c49f..425bb4d85468 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -38,7 +38,7 @@ #include <strings.hrc> #include <dbui.hrc> #include "mmaddressblockpage.hrc" -#include <helpid.h> +#include <helpids.h> using namespace svt; using namespace ::com::sun::star; diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index c3f01412e81a..d7cd2fdf95e2 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -28,7 +28,7 @@ #include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <helpid.h> +#include <helpids.h> #include <swmodule.hxx> #include <view.hxx> diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index 6903eb6bfba0..f4b0cf499bce 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -31,7 +31,7 @@ #include <vcl/svapp.hxx> #include <vcl/idle.hxx> -#include <helpid.h> +#include <helpids.h> #include <cmdid.h> #include <swunohelper.hxx> #include <mmresultdialogs.hxx> diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx index ea064a57ef42..b31130733e9a 100644 --- a/sw/source/ui/dbui/mmresultdialogs.cxx +++ b/sw/source/ui/dbui/mmresultdialogs.cxx @@ -66,7 +66,7 @@ #include <swevent.hxx> #include <dbui.hxx> #include <dbui.hrc> -#include <helpid.h> +#include <helpids.h> #include <doc.hxx> #include <sfx2/app.hxx> #include <strings.hrc> diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx index f0e3f3a7c86e..362ce43259af 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.cxx +++ b/sw/source/ui/dbui/selectdbtabledialog.cxx @@ -33,7 +33,7 @@ #include <dbui.hrc> #include <strings.hrc> -#include <helpid.h> +#include <helpids.h> using namespace ::com::sun::star; using namespace ::com::sun::star::sdbcx; diff --git a/sw/source/ui/dialog/abstract.cxx b/sw/source/ui/dialog/abstract.cxx index a5de42b69a6c..841faeb1c555 100644 --- a/sw/source/ui/dialog/abstract.cxx +++ b/sw/source/ui/dialog/abstract.cxx @@ -20,7 +20,6 @@ #include "swtypes.hxx" #include "hintids.hxx" -#include "dialog.hrc" #include "abstract.hxx" SwInsertAbstractDlg::SwInsertAbstractDlg(vcl::Window* pParent) diff --git a/sw/source/ui/dialog/addrdlg.cxx b/sw/source/ui/dialog/addrdlg.cxx index a4d57570ba45..13455f323c24 100644 --- a/sw/source/ui/dialog/addrdlg.cxx +++ b/sw/source/ui/dialog/addrdlg.cxx @@ -19,7 +19,7 @@ #include "addrdlg.hxx" #include <svx/svxdlg.hxx> -#include <sfx2/sfx.hrc> +#include <sfx2/pageids.hxx> SwAddrDlg::SwAddrDlg(vcl::Window* pParent, const SfxItemSet& rSet) : SfxSingleTabDialog(pParent, rSet) diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index 5eb68e8da9f3..9df58439fc64 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -30,6 +30,7 @@ #include <fontcfg.hxx> #include <swmodule.hxx> #include <editeng/unolingu.hxx> +#include <sfx2/sfxsids.hrc> #include <sfx2/printer.hxx> #include <editeng/flstitem.hxx> #include <svx/dlgutil.hxx> @@ -43,8 +44,6 @@ #include <doc.hxx> #include <IDocumentDeviceAccess.hxx> -#include <dialog.hrc> - #include <vcl/metric.hxx> using namespace ::com::sun::star; diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 06572ad3df92..c3d64b266ed6 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -20,16 +20,9 @@ #include "swdlgfact.hxx" #include <svl/style.hxx> #include <svx/svxids.hrc> -#include "dialog.hrc" -#include "misc.hrc" -#include "chrdlg.hrc" -#include "table.hrc" -#include "frmui.hrc" #include "dbui.hrc" #include "globals.hrc" -#include "fldui.hrc" #include "strings.hrc" -#include <index.hrc> #include <wordcountdialog.hxx> #include "abstract.hxx" @@ -639,34 +632,32 @@ VclPtr<AbstractSwInsertAbstractDlg> SwAbstractDialogFactory_Impl::CreateSwInsert return VclPtr<AbstractSwInsertAbstractDlg_Impl>::Create(pDlg); } -VclPtr<SfxAbstractDialog> SwAbstractDialogFactory_Impl::CreateSfxDialog( vcl::Window* pParent, - const SfxItemSet& rSet, - const css::uno::Reference< css::frame::XFrame >&, - sal_uInt32 nResId - ) +VclPtr<SfxAbstractDialog> SwAbstractDialogFactory_Impl::CreateSwAddressAbstractDlg(vcl::Window* pParent, + const SfxItemSet& rSet) { - VclPtr<SfxModalDialog> pDlg; - switch ( nResId ) - { - case RC_DLG_ADDR : - pDlg = VclPtr<SwAddrDlg>::Create( pParent, rSet ); - break; - case DLG_SWDROPCAPS : - pDlg = VclPtr<SwDropCapsDlg>::Create( pParent, rSet ); - break; - case RC_SWDLG_BACKGROUND : - pDlg = VclPtr<SwBackgroundDlg>::Create( pParent, rSet ); - break; - case RC_DLG_SWNUMFMTDLG : - pDlg = VclPtr<SwNumFormatDlg>::Create( pParent, rSet ); - break; - default: - break; - } + VclPtr<SfxModalDialog> pDlg = VclPtr<SwAddrDlg>::Create( pParent, rSet ); + return VclPtr<SwAbstractSfxDialog_Impl>::Create(pDlg); +} - if ( pDlg ) - return VclPtr<SwAbstractSfxDialog_Impl>::Create( pDlg ); - return nullptr; +VclPtr<SfxAbstractDialog> SwAbstractDialogFactory_Impl::CreateSwDropCapsDialog( vcl::Window* pParent, + const SfxItemSet& rSet) +{ + VclPtr<SfxModalDialog> pDlg = VclPtr<SwDropCapsDlg>::Create(pParent, rSet); + return VclPtr<SwAbstractSfxDialog_Impl>::Create( pDlg ); +} + +VclPtr<SfxAbstractDialog> SwAbstractDialogFactory_Impl::CreateSwBackgroundDialog( vcl::Window* pParent, + const SfxItemSet& rSet) +{ + VclPtr<SfxModalDialog> pDlg = VclPtr<SwBackgroundDlg>::Create( pParent, rSet ); + return VclPtr<SwAbstractSfxDialog_Impl>::Create( pDlg ); +} + +VclPtr<SfxAbstractDialog> SwAbstractDialogFactory_Impl::CreateNumFormatDialog( vcl::Window* pParent, + const SfxItemSet& rSet) +{ + VclPtr<SfxModalDialog> pDlg = VclPtr<SwNumFormatDlg>::Create( pParent, rSet ); + return VclPtr<SwAbstractSfxDialog_Impl>::Create( pDlg ); } VclPtr<AbstractSwAsciiFilterDlg> SwAbstractDialogFactory_Impl::CreateSwAsciiFilterDlg( SwDocShell& rDocSh, @@ -767,30 +758,28 @@ VclPtr<SfxAbstractTabDialog> SwAbstractDialogFactory_Impl::CreateSwParaDlg ( vcl return VclPtr<AbstractTabDialog_Impl>::Create( pDlg ); } -VclPtr<VclAbstractDialog> SwAbstractDialogFactory_Impl::CreateVclAbstractDialog ( vcl::Window *pParent, SwWrtShell &rSh, int nResId ) +VclPtr<VclAbstractDialog> SwAbstractDialogFactory_Impl::CreateSwAutoMarkDialog(vcl::Window *pParent, SwWrtShell &rSh) { - VclPtr<Dialog> pDlg; - switch ( nResId ) - { - case DLG_ROW_HEIGHT : - pDlg = VclPtr<SwTableHeightDlg>::Create( pParent, rSh); - break; - case DLG_SORTING : - pDlg = VclPtr<SwSortDlg>::Create( pParent, rSh); - break; - case DLG_COLUMN : - pDlg = VclPtr<SwColumnDlg>::Create( pParent, rSh ); - break; - case DLG_EDIT_AUTHMARK : - pDlg = VclPtr<SwAuthMarkModalDlg>::Create( pParent, rSh ); - break; - default: - break; - } + VclPtr<Dialog> pDlg = VclPtr<SwAuthMarkModalDlg>::Create( pParent, rSh ); + return VclPtr<VclAbstractDialog_Impl>::Create( pDlg ); +} + +VclPtr<VclAbstractDialog> SwAbstractDialogFactory_Impl::CreateSwColumnDialog(vcl::Window *pParent, SwWrtShell &rSh) +{ + VclPtr<Dialog> pDlg = VclPtr<SwColumnDlg>::Create( pParent, rSh ); + return VclPtr<VclAbstractDialog_Impl>::Create( pDlg ); +} - if ( pDlg.get() ) - return VclPtr<VclAbstractDialog_Impl>::Create( pDlg ); - return nullptr; +VclPtr<VclAbstractDialog> SwAbstractDialogFactory_Impl::CreateSwTableHeightDialog(vcl::Window *pParent, SwWrtShell &rSh) +{ + VclPtr<Dialog> pDlg = VclPtr<SwTableHeightDlg>::Create( pParent, rSh); + return VclPtr<VclAbstractDialog_Impl>::Create( pDlg ); +} + +VclPtr<VclAbstractDialog> SwAbstractDialogFactory_Impl::CreateSwSortingDialog(vcl::Window *pParent, SwWrtShell &rSh) +{ + VclPtr<Dialog> pDlg = VclPtr<SwSortDlg>::Create( pParent, rSh); + return VclPtr<VclAbstractDialog_Impl>::Create( pDlg ); } VclPtr<AbstractSplitTableDialog> SwAbstractDialogFactory_Impl::CreateSplitTableDialog ( vcl::Window *pParent, SwWrtShell &rSh ) @@ -966,27 +955,20 @@ VclPtr<VclAbstractDialog> SwAbstractDialogFactory_Impl::CreateMultiTOXMarkDlg(vc return VclPtr<VclAbstractDialog_Impl>::Create(pDlg); } -VclPtr<SfxAbstractTabDialog> SwAbstractDialogFactory_Impl::CreateSwTabDialog( int nResId, - vcl::Window* pParent, +VclPtr<SfxAbstractTabDialog> SwAbstractDialogFactory_Impl::CreateSvxNumBulletTabDialog(vcl::Window* pParent, const SfxItemSet* pSwItemSet, - SwWrtShell & rWrtSh ) + SwWrtShell & rWrtSh) { - VclPtr<SfxTabDialog> pDlg; - switch ( nResId ) - { - case DLG_SVXTEST_NUM_BULLET : - pDlg = VclPtr<SwSvxNumBulletTabDialog>::Create( pParent, pSwItemSet, rWrtSh ); - break; - case DLG_TAB_OUTLINE : - pDlg = VclPtr<SwOutlineTabDialog>::Create( pParent, pSwItemSet, rWrtSh ); - break; + VclPtr<SfxTabDialog> pDlg = VclPtr<SwSvxNumBulletTabDialog>::Create(pParent, pSwItemSet, rWrtSh); + return VclPtr<AbstractTabDialog_Impl>::Create( pDlg ); +} - default: - break; - } - if ( pDlg.get() ) - return VclPtr<AbstractTabDialog_Impl>::Create( pDlg ); - return nullptr; +VclPtr<SfxAbstractTabDialog> SwAbstractDialogFactory_Impl::CreateOutlineTabDialog(vcl::Window* pParent, + const SfxItemSet* pSwItemSet, + SwWrtShell & rWrtSh ) +{ + VclPtr<SfxTabDialog> pDlg = VclPtr<SwOutlineTabDialog>::Create(pParent, pSwItemSet, rWrtSh); + return VclPtr<AbstractTabDialog_Impl>::Create( pDlg ); } VclPtr<AbstractMultiTOXTabDialog> SwAbstractDialogFactory_Impl::CreateMultiTOXTabDialog( @@ -1109,7 +1091,7 @@ CreateTabPage SwAbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nI case RID_SW_TP_OPTTABLE_PAGE: pRet = SwTableOptionsTabPage::Create; break; - case TP_DOC_STAT : + case RID_SW_TP_DOC_STAT : pRet = SwDocStatPage::Create; break; case RID_SW_TP_MAILCONFIG: diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index 75a690b730f0..93598fd0392e 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -369,14 +369,13 @@ class SwAbstractDialogFactory_Impl : public SwAbstractDialogFactory public: virtual ~SwAbstractDialogFactory_Impl() {} - virtual VclPtr<SfxAbstractDialog> CreateSfxDialog( vcl::Window* pParent, - const SfxItemSet& rAttr, - const css::uno::Reference< css::frame::XFrame >& _rxFrame, - sal_uInt32 nResId - ) override; + virtual VclPtr<SfxAbstractDialog> CreateNumFormatDialog(vcl::Window* pParent, const SfxItemSet& rAttr) override; + virtual VclPtr<SfxAbstractDialog> CreateSwDropCapsDialog(vcl::Window* pParent, const SfxItemSet& rSet) override; + virtual VclPtr<SfxAbstractDialog> CreateSwBackgroundDialog(vcl::Window* pParent, const SfxItemSet& rSet) override; virtual VclPtr<AbstractSwWordCountFloatDlg> CreateSwWordCountDialog(SfxBindings* pBindings, SfxChildWindow* pChild, vcl::Window *pParent, SfxChildWinInfo* pInfo) override; virtual VclPtr<AbstractSwInsertAbstractDlg> CreateSwInsertAbstractDlg() override; + virtual VclPtr<SfxAbstractDialog> CreateSwAddressAbstractDlg(vcl::Window* pParent, const SfxItemSet& rSet) override; virtual VclPtr<AbstractSwAsciiFilterDlg> CreateSwAsciiFilterDlg ( SwDocShell& rDocSh, SvStream* pStream ) override; virtual VclPtr<VclAbstractDialog> CreateSwInsertBookmarkDlg( vcl::Window *pParent, SwWrtShell &rSh, SfxRequest& rReq ) override; @@ -406,8 +405,11 @@ public: bool bDraw, const OString& sDefPage = OString() ) override; + virtual VclPtr<VclAbstractDialog> CreateSwAutoMarkDialog(vcl::Window *pParent, SwWrtShell &rSh) override; virtual VclPtr<AbstractSwSelGlossaryDlg> CreateSwSelGlossaryDlg(const OUString &rShortName) override; - virtual VclPtr<VclAbstractDialog> CreateVclAbstractDialog ( vcl::Window * pParent, SwWrtShell &rSh, int nResId ) override; + virtual VclPtr<VclAbstractDialog> CreateSwSortingDialog(vcl::Window * pParent, SwWrtShell &rSh) override; + virtual VclPtr<VclAbstractDialog> CreateSwTableHeightDialog(vcl::Window *pParent, SwWrtShell &rSh) override; + virtual VclPtr<VclAbstractDialog> CreateSwColumnDialog(vcl::Window *pParent, SwWrtShell &rSh) override; virtual VclPtr<AbstractSplitTableDialog> CreateSplitTableDialog ( vcl::Window * pParent, SwWrtShell &rSh ) override; virtual VclPtr<AbstractSwAutoFormatDlg> CreateSwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pShell, @@ -460,11 +462,12 @@ public: virtual VclPtr<AbstractMailMergeCreateFromDlg> CreateMailMergeCreateFromDlg(vcl::Window* pParent) override; virtual VclPtr<AbstractMailMergeFieldConnectionsDlg> CreateMailMergeFieldConnectionsDlg(vcl::Window* pParent) override; virtual VclPtr<VclAbstractDialog> CreateMultiTOXMarkDlg(vcl::Window* pParent, SwTOXMgr &rTOXMgr) override; - virtual VclPtr<SfxAbstractTabDialog> CreateSwTabDialog( int nResId, - vcl::Window* pParent, + virtual VclPtr<SfxAbstractTabDialog> CreateOutlineTabDialog(vcl::Window* pParent, const SfxItemSet* pSwItemSet, + SwWrtShell &) override; + virtual VclPtr<SfxAbstractTabDialog> CreateSvxNumBulletTabDialog(vcl::Window* pParent, const SfxItemSet* pSwItemSet, SwWrtShell &) override; - virtual VclPtr<AbstractMultiTOXTabDialog> CreateMultiTOXTabDialog( + virtual VclPtr<AbstractMultiTOXTabDialog> CreateMultiTOXTabDialog( vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell &rShell, SwTOXBase* pCurTOX, diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 1aa953548264..cffa27ca408e 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -52,7 +52,7 @@ #include <fmtfsize.hxx> #include <shellio.hxx> -#include <helpid.h> +#include <helpids.h> #include <cmdid.h> #include <strings.hrc> #include <globals.hrc> diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx index e33535c3f208..777e194a37f3 100644 --- a/sw/source/ui/dialog/wordcountdialog.cxx +++ b/sw/source/ui/dialog/wordcountdialog.cxx @@ -21,7 +21,6 @@ #include <swtypes.hxx> #include <wordcountdialog.hxx> #include <docstat.hxx> -#include <dialog.hrc> #include <cmdid.h> #include <swmodule.hxx> #include <wview.hxx> diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index c71d33aef81d..87dfbd268b48 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -47,7 +47,6 @@ #include <memory> #include "swabstdlg.hxx" -#include "chrdlg.hrc" #include <swuiexp.hxx> namespace { diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index 9e6d710078df..abe2e68dcc3e 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -28,7 +28,7 @@ #include "wrtsh.hxx" #include "cmdid.h" -#include "helpid.h" +#include "helpids.h" #include "envfmt.hxx" #include "envlop.hxx" #include "envprt.hxx" diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 804292b1749c..77aa46bfdff7 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -20,6 +20,7 @@ #include <memory> #include <vcl/waitobj.hxx> #include <rtl/ustring.hxx> +#include <sfx2/sfxsids.hrc> #include <svtools/treelistentry.hxx> #include <com/sun/star/uno/Sequence.h> #include <swtypes.hxx> @@ -32,7 +33,7 @@ #include <dbmgr.hxx> #include "uitool.hxx" #include <cmdid.h> -#include <helpid.h> +#include <helpids.h> #include <globals.hrc> #include <strings.hrc> #include <envimg.hxx> diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 3d694efd76f5..9c8bc472f9da 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -26,7 +26,7 @@ #include <unotools/pathoptions.hxx> #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> -#include <helpid.h> +#include <helpids.h> #include <view.hxx> #include <docsh.hxx> #include <IDocumentDeviceAccess.hxx> diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx index 91b522028082..f0fa95c02e03 100644 --- a/sw/source/ui/fldui/DropDownFieldDialog.cxx +++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx @@ -23,7 +23,6 @@ #include <vcl/msgbox.hxx> #include <DropDownFieldDialog.hxx> #include <flddropdown.hxx> -#include <fldui.hrc> #include <memory> diff --git a/sw/source/ui/fldui/FldRefTreeListBox.cxx b/sw/source/ui/fldui/FldRefTreeListBox.cxx index e5ae1dc91923..693b06b5bde6 100644 --- a/sw/source/ui/fldui/FldRefTreeListBox.cxx +++ b/sw/source/ui/fldui/FldRefTreeListBox.cxx @@ -19,7 +19,7 @@ #include <FldRefTreeListBox.hxx> -#include <helpid.h> +#include <helpids.h> #include <vcl/builderfactory.hxx> #include <vcl/help.hxx> diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index 3f57f26562d5..9740084521ec 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -38,7 +38,6 @@ #include <dbfld.hxx> #include <changedb.hxx> -#include <fldui.hrc> #include <globals.hrc> #include <strings.hrc> #include "bitmaps.hlst" diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index f6d34dc72589..e05123a40092 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -25,7 +25,6 @@ #include <fldtdlg.hxx> #include <numrule.hxx> -#include <fldui.hrc> #include <flddb.hxx> #include <dbconfig.hxx> #include <dbmgr.hxx> diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 8e587a072ada..02e65cc75679 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -24,7 +24,7 @@ #include <svl/zformat.hxx> #include <svtools/treelistentry.hxx> -#include <helpid.h> +#include <helpids.h> #include <swtypes.hxx> #include <globals.hrc> #include <strings.hrc> @@ -32,8 +32,6 @@ #include <docufld.hxx> #include <wrtsh.hxx> -#include <fldui.hrc> - #include <flddinf.hxx> #include <swmodule.hxx> #include <view.hxx> diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index 282103b90e12..e4464f302241 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -23,15 +23,12 @@ #include <globals.hrc> #include <strings.hrc> #include <chpfld.hxx> -#include <fldui.hrc> #include <flddok.hxx> #include <swmodule.hxx> #include <view.hxx> #include <wrtsh.hxx> #include <svl/zformat.hxx> -#include <index.hrc> - #define USER_DATA_VERSION_1 "1" #define USER_DATA_VERSION USER_DATA_VERSION_1 diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index a08c6f7369e6..e07b6407053c 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -37,11 +37,9 @@ #include <fldedt.hxx> #include <cmdid.h> -#include <helpid.h> +#include <helpids.h> #include <globals.hrc> -#include <fldui.hrc> #include "swabstdlg.hxx" -#include "dialog.hrc" #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> @@ -328,11 +326,9 @@ IMPL_LINK_NOARG(SwFieldEditDlg, AddressHdl, Button*, void) SwAbstractDialogFactory* pFact = swui::GetFactory(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); - ScopedVclPtr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( this, aSet, - pSh->GetView().GetViewFrame()->GetFrame().GetFrameInterface(), - RC_DLG_ADDR )); - OSL_ENSURE(pDlg, "Dialog creation failed!"); - if(RET_OK == pDlg->Execute()) + ScopedVclPtr<SfxAbstractDialog> pDlg(pFact->CreateSwAddressAbstractDlg(this, aSet)); + assert(pDlg && "Dialog creation failed!"); + if (RET_OK == pDlg->Execute()) { pSh->UpdateFields( *pCurField ); } diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index 10843305d963..6bfac73c5276 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -31,7 +31,6 @@ #include <swmodule.hxx> #include <fldfunc.hxx> #include <flddropdown.hxx> -#include <fldui.hrc> #define USER_DATA_VERSION_1 "1" #define USER_DATA_VERSION USER_DATA_VERSION_1 diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 9813ad78930f..da6482c55f41 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -26,7 +26,6 @@ #include <reffld.hxx> #include <wrtsh.hxx> -#include <fldui.hrc> #include <globals.hrc> #include <strings.hrc> #include <SwNodeNum.hxx> diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index f0cf404b3bf1..938a8d6bfb67 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -39,8 +39,7 @@ #include <fldtdlg.hxx> #include <swmodule.hxx> -#include <helpid.h> -#include <fldui.hrc> +#include <helpids.h> #include <globals.hrc> #include <com/sun/star/document/XDocumentProperties.hpp> diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index f6fe754e0e65..dc5088625b35 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -35,7 +35,6 @@ #include <svl/zformat.hxx> #include <globals.hrc> #include <strings.hrc> -#include <fldui.hrc> #define USER_DATA_VERSION_1 "1" #define USER_DATA_VERSION USER_DATA_VERSION_1 diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx index 6e4b21a03037..751cba3d90ca 100644 --- a/sw/source/ui/fldui/inpdlg.cxx +++ b/sw/source/ui/fldui/inpdlg.cxx @@ -28,8 +28,6 @@ #include <inpdlg.hxx> #include <fldmgr.hxx> -#include <fldui.hrc> - // edit field-insert SwFieldInputDlg::SwFieldInputDlg( vcl::Window *pParent, SwWrtShell &rS, SwField* pField, bool bNextButton ) diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index c71cdbcb13a7..fc1c6a2b98e3 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -33,7 +33,6 @@ #include <uitool.hxx> #include <javaedit.hxx> -#include <fldui.hrc> #include <globals.hrc> #include <strings.hrc> diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index a81d0d0c72fb..f272c10db37c 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -53,7 +53,7 @@ #include <swabstdlg.hxx> #include <cmdid.h> -#include <helpid.h> +#include <helpids.h> #include <globals.hrc> #include <SwStyleNameMapper.hxx> #include <svx/svxids.hrc> diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 7d6c16e23b02..72fd9bec3aea 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -43,7 +43,7 @@ #include <swmodule.hxx> #include <sal/macros.h> -#include <helpid.h> +#include <helpids.h> #include "globals.hrc" #include "swtypes.hxx" #include "wrtsh.hxx" @@ -58,7 +58,6 @@ #include "colmgr.hxx" #include "prcntfld.hxx" #include "paratr.hxx" -#include "frmui.hrc" #include "strings.hrc" #include <section.hxx> #include <docary.hxx> diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index 4a80bfb85f5b..5fa77141b0b1 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -42,7 +42,6 @@ #include <com/sun/star/text/XTextFrame.hpp> #include <comphelper/string.hxx> #include "initui.hxx" -#include <frmui.hrc> #include <globals.hrc> #include <strings.hrc> #include <SwStyleNameMapper.hxx> diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx index 1a7906ce2b4b..8e81b3693311 100644 --- a/sw/source/ui/frmdlg/frmdlg.cxx +++ b/sw/source/ui/frmdlg/frmdlg.cxx @@ -33,7 +33,6 @@ #include <column.hxx> #include <macassgn.hxx> -#include <frmui.hrc> #include <globals.hrc> #include <strings.hrc> #include <svx/svxids.hrc> diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 4c914dd67a63..82882cbc45d2 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -21,7 +21,7 @@ #include <com/sun/star/embed/EmbedMisc.hpp> #include <cmdid.h> -#include <helpid.h> +#include <helpids.h> #include <hintids.hxx> #include <vcl/msgbox.hxx> #include <vcl/mnemonic.hxx> @@ -61,7 +61,6 @@ #include <svx/sdtaitm.hxx> #include <sal/macros.h> -#include <frmui.hrc> #include <strings.hrc> #include <sfx2/filedlghelper.hxx> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> diff --git a/sw/source/ui/frmdlg/pattern.cxx b/sw/source/ui/frmdlg/pattern.cxx index d7be56794271..a81dead1fcda 100644 --- a/sw/source/ui/frmdlg/pattern.cxx +++ b/sw/source/ui/frmdlg/pattern.cxx @@ -21,7 +21,6 @@ #include <svx/dialogs.hrc> #include "swtypes.hxx" #include "pattern.hxx" -#include "frmui.hrc" #include "strings.hrc" SwBackgroundDlg::SwBackgroundDlg(vcl::Window* pParent, const SfxItemSet& rSet) diff --git a/sw/source/ui/frmdlg/uiborder.cxx b/sw/source/ui/frmdlg/uiborder.cxx index 4e34b1b940ab..6f656e149cab 100644 --- a/sw/source/ui/frmdlg/uiborder.cxx +++ b/sw/source/ui/frmdlg/uiborder.cxx @@ -27,7 +27,6 @@ #include "swtypes.hxx" #include "uiborder.hxx" -#include "frmui.hrc" #include "strings.hrc" SwBorderDlg::SwBorderDlg(vcl::Window* pParent, SfxItemSet& rSet, SwBorderModes nType) : diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index 645166772349..fd4de58df11a 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -39,7 +39,6 @@ #include "frmatr.hxx" #include "frmmgr.hxx" #include "globals.hrc" -#include "frmui.hrc" #include "wrap.hxx" using namespace ::com::sun::star; diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx index 8b0ed87d09c2..55bdceb8ea52 100644 --- a/sw/source/ui/index/cntex.cxx +++ b/sw/source/ui/index/cntex.cxx @@ -46,7 +46,6 @@ #include <cmdid.h> #include <strings.hrc> -#include <index.hrc> #include <globals.hrc> #include <SwStyleNameMapper.hxx> #include <swuicnttab.hxx> diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 19490c9551db..a1b3eed4545f 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -65,9 +65,8 @@ #include <modcfg.hxx> #include <cmdid.h> -#include <helpid.h> +#include <helpids.h> #include <strings.hrc> -#include <index.hrc> #include <globals.hrc> #include <cnttab.hrc> #include <SwStyleNameMapper.hxx> diff --git a/sw/source/ui/index/multmrk.cxx b/sw/source/ui/index/multmrk.cxx index 41c99bf7f95e..239a345c6deb 100644 --- a/sw/source/ui/index/multmrk.cxx +++ b/sw/source/ui/index/multmrk.cxx @@ -22,8 +22,6 @@ #include "multmrk.hxx" #include "toxmgr.hxx" -#include "index.hrc" - SwMultiTOXMarkDlg::SwMultiTOXMarkDlg(vcl::Window* pParent, SwTOXMgr& rTOXMgr) : SvxStandardDialog(pParent, "SelectIndexDialog", "modules/swriter/ui/selectindexdialog.ui") diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 7e133a3d0217..13bef9bbd156 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -19,7 +19,7 @@ #include "swuiidxmrk.hxx" #include <hintids.hxx> -#include <helpid.h> +#include <helpids.h> #include <comphelper/processfactory.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -47,7 +47,6 @@ #include <swundo.hxx> #include <cmdid.h> #include <app.hrc> -#include <index.hrc> #include <swmodule.hxx> #include <fldmgr.hxx> #include <fldbas.hxx> diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index 27fb6a2d1287..c7daf0657d32 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -32,9 +32,7 @@ #include <uitool.hxx> #include <poolfmt.hxx> #include <swstyle.h> -#include <helpid.h> -#include <misc.hrc> -#include <frmui.hrc> +#include <helpids.h> #include <SwStyleNameMapper.hxx> #include <memory> diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index 13a78ef7bc4b..2e23384246d2 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -35,7 +35,6 @@ #include <glosdoc.hxx> #include <swunohelper.hxx> -#include <misc.hrc> #include <strings.hrc> #define PATH_CASE_SENSITIVE 0x01 diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 9976982ea2e8..3756fdb894ed 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -62,10 +62,9 @@ #include <shellio.hxx> #include <cmdid.h> -#include <helpid.h> +#include <helpids.h> #include <swerror.h> #include <globals.hrc> -#include <misc.hrc> #include <swmodule.hxx> #include <sfx2/filedlghelper.hxx> diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx index e6c785e5051d..cc8f13e5273c 100644 --- a/sw/source/ui/misc/insfnote.cxx +++ b/sw/source/ui/misc/insfnote.cxx @@ -30,7 +30,6 @@ #include <view.hxx> #include <basesh.hxx> #include <insfnote.hxx> -#include <misc.hrc> #include <globals.hrc> #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index f8e699ab0f2a..c2349a5d660b 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -41,10 +41,8 @@ #include <viewopt.hxx> #include <frmmgr.hxx> -#include <misc.hrc> -#include <frmui.hrc> #include <globals.hrc> -#include <helpid.h> +#include <helpids.h> #include <SwStyleNameMapper.hxx> #include <svx/svxids.hrc> #include <svx/dialogs.hrc> diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 1599249cc243..9c806ba0a929 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -43,10 +43,9 @@ #include <docstyle.hxx> #include <viewopt.hxx> #include <svtools/ctrlbox.hxx> -#include <helpid.h> +#include <helpids.h> #include <globals.hrc> #include <strings.hrc> -#include <misc.hrc> #include <paratr.hxx> #include <unomid.h> diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index bd2742abbb8c..6cc57d017542 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -42,7 +42,6 @@ #include <globals.hrc> #include <strings.hrc> -#include <misc.hrc> #include <memory> using namespace ::com::sun::star; diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index 470972e06429..1a6e5dd0bb4e 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -36,7 +36,6 @@ #include <view.hxx> #include <cmdid.h> #include <wrtsh.hxx> -#include <misc.hrc> #include <app.hrc> #include <strings.hrc> #include <swtable.hxx> diff --git a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx index f1a017cc97ff..e98e86573177 100644 --- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx +++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx @@ -32,9 +32,8 @@ #include <swwait.hxx> #include <uitool.hxx> -#include <helpid.h> +#include <helpids.h> #include <cmdid.h> -#include <misc.hrc> #include <strings.hrc> #include <vector> diff --git a/sw/source/ui/table/colwd.cxx b/sw/source/ui/table/colwd.cxx index 4e2795ea3cf3..dbfe58a42214 100644 --- a/sw/source/ui/table/colwd.cxx +++ b/sw/source/ui/table/colwd.cxx @@ -29,7 +29,6 @@ #include <usrpref.hxx> #include <cmdid.h> -#include <table.hrc> IMPL_LINK_NOARG(SwTableWidthDlg, LoseFocusHdl, Edit&, void) { diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx index 75d53c645107..c02dc9e3f6ec 100644 --- a/sw/source/ui/table/convert.cxx +++ b/sw/source/ui/table/convert.cxx @@ -33,7 +33,6 @@ #include "app.hrc" #include "strings.hrc" -#include "table.hrc" #include "swabstdlg.hxx" #include <swuiexp.hxx> #include <memory> diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx index 6a9190a34823..7131bf2b5238 100644 --- a/sw/source/ui/table/instable.cxx +++ b/sw/source/ui/table/instable.cxx @@ -29,8 +29,6 @@ #include <sfx2/htmlmode.hxx> #include <viewopt.hxx> -#include "table.hrc" - #include "swabstdlg.hxx" #include <swuiexp.hxx> #include <memory> diff --git a/sw/source/ui/table/rowht.cxx b/sw/source/ui/table/rowht.cxx index fd8bebb74867..3dcf60ae7531 100644 --- a/sw/source/ui/table/rowht.cxx +++ b/sw/source/ui/table/rowht.cxx @@ -33,7 +33,6 @@ #include <usrpref.hxx> #include <cmdid.h> -#include <table.hrc> void SwTableHeightDlg::Apply() { diff --git a/sw/source/ui/table/splittbl.cxx b/sw/source/ui/table/splittbl.cxx index 0ce9b0a50ff4..63dd08223447 100644 --- a/sw/source/ui/table/splittbl.cxx +++ b/sw/source/ui/table/splittbl.cxx @@ -19,7 +19,6 @@ #include <wrtsh.hxx> #include <splittbl.hxx> -#include <table.hrc> #include <tblenum.hxx> SwSplitTableDlg::SwSplitTableDlg( vcl::Window *pParent, SwWrtShell &rSh ) diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index e4204208ce56..b2a7ac92e46e 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -55,7 +55,6 @@ #include <app.hrc> #include <cmdid.h> -#include <table.hrc> #include <svx/svxids.hrc> #include <svx/dialogs.hrc> #include <svx/flagsdef.hxx> |