diff options
Diffstat (limited to 'sw')
196 files changed, 275 insertions, 1063 deletions
diff --git a/sw/inc/app.hrc b/sw/inc/app.hrc index 4761dd345406..fdb9f6f11f98 100644 --- a/sw/inc/app.hrc +++ b/sw/inc/app.hrc @@ -23,7 +23,6 @@ #define NC_(Context, String) (Context "\004" u8##String) #include <svl/style.hxx> -#include <sfx2/sfx.hrc> #include "swstyle.h" const std::pair<const char*, int> RID_PARAGRAPHSTYLEFAMILY[] = diff --git a/sw/inc/chrdlg.hrc b/sw/inc/chrdlg.hrc deleted file mode 100644 index 2fb70a70e673..000000000000 --- a/sw/inc/chrdlg.hrc +++ /dev/null @@ -1,29 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_SW_INC_CHRDLG_HRC -#define INCLUDED_SW_INC_CHRDLG_HRC - -#include "rcid.hrc" - -#define DLG_SWDROPCAPS (RC_CHRDLG_BEGIN + 11) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index 2e84ed3197f9..29ca700b6f59 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_SW_INC_CMDID_H #define INCLUDED_SW_INC_CMDID_H -#include <sfx2/sfx.hrc> +#include <sfx2/sfxsids.hrc> #include <unomid.h> #define FN_FILE SID_SW_START diff --git a/sw/inc/comcore.hrc b/sw/inc/comcore.hxx index 9459388d0e02..4ef35ae44bf9 100644 --- a/sw/inc/comcore.hrc +++ b/sw/inc/comcore.hxx @@ -16,10 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SW_INC_COMCORE_HRC -#define INCLUDED_SW_INC_COMCORE_HRC - -#include "rcid.hrc" +#ifndef INCLUDED_SW_INC_COMCORE_HXX +#define INCLUDED_SW_INC_COMCORE_HXX // defines for the Autoformat Redline Comments #define STR_AUTOFMTREDL_DEL_EMPTY_PARA 0 diff --git a/sw/inc/dialog.hrc b/sw/inc/dialog.hrc deleted file mode 100644 index eec75b2886de..000000000000 --- a/sw/inc/dialog.hrc +++ /dev/null @@ -1,31 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_SW_INC_DIALOG_HRC -#define INCLUDED_SW_INC_DIALOG_HRC - -#include "rcid.hrc" - -#define RC_DLG_ADDR (RC_DIALOG_BEGIN + 90) -#define RC_SWDLG_BACKGROUND (RC_DIALOG_BEGIN + 91) -#define RC_DLG_SWNUMFMTDLG (RC_DIALOG_BEGIN + 92) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/fldui.hrc b/sw/inc/fldui.hrc deleted file mode 100644 index 6489fafd4fe0..000000000000 --- a/sw/inc/fldui.hrc +++ /dev/null @@ -1,107 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_SW_INC_FLDUI_HRC -#define INCLUDED_SW_INC_FLDUI_HRC - -#include "rcid.hrc" - -/*-------------------------------------------------------------------- - TypeId, see SwFieldTypesEnum - --------------------------------------------------------------------*/ - -#define STR_TYPE_BEGIN RC_FLDDLG_BEGIN -#define STR_TYPE_END (STR_TYPE_BEGIN + 44) - -/*-------------------------------------------------------------------- - SubTypes - --------------------------------------------------------------------*/ - -#define FLD_DATE_BEGIN STR_TYPE_END -#define FLD_DATE_END (FLD_DATE_BEGIN + 2) - -#define FLD_TIME_BEGIN FLD_DATE_END -#define FLD_TIME_END (FLD_TIME_BEGIN + 2) - -#define FLD_STAT_BEGIN FLD_TIME_END -#define FLD_STAT_END (FLD_STAT_BEGIN + 7) - -#define FLD_INPUT_BEGIN FLD_STAT_END -#define FLD_INPUT_END (FLD_INPUT_BEGIN + 1) - -#define FLD_EU_BEGIN FLD_INPUT_END -#define FLD_EU_END (FLD_EU_BEGIN + 15) - -#define FLD_PAGEREF_BEGIN FLD_EU_END -#define FLD_PAGEREF_END (FLD_PAGEREF_BEGIN+2) - -/*---------------------------------------------------------- - Format-Id's - ----------------------------------------------------------*/ - -// Numbers -#define FMT_NUM_BEGIN (FLD_PAGEREF_END + 1) -#define FMT_NUM_END (FMT_NUM_BEGIN + 9) - -// AuthorFormat -#define FMT_AUTHOR_BEGIN FMT_NUM_END -#define FMT_AUTHOR_END (FMT_AUTHOR_BEGIN + 2) - -// Set variable -#define FMT_SETVAR_BEGIN FMT_AUTHOR_END -#define FMT_SETVAR_END (FMT_SETVAR_BEGIN + 2) - -// Get variable -#define FMT_GETVAR_BEGIN FMT_SETVAR_END -#define FMT_GETVAR_END (FMT_GETVAR_BEGIN + 2) - -// Userfield -#define FMT_USERVAR_BEGIN FMT_GETVAR_END -#define FMT_USERVAR_END (FMT_USERVAR_BEGIN + 2) - -// Database field -#define FMT_DBFLD_BEGIN FMT_USERVAR_END -#define FMT_DBFLD_END (FMT_DBFLD_BEGIN + 2) - -//FileNameFormat -// Attention, the last 4 formats do not exist in RTF (loss!) -#define FMT_FF_BEGIN FMT_DBFLD_END -#define FMT_FF_END (FMT_FF_BEGIN + 6) - -// Registry-Format -#define FMT_REG_BEGIN FMT_FF_END -#define FMT_REG_END (FMT_REG_BEGIN + 3) - -// Chapter -#define FMT_CHAPTER_BEGIN FMT_REG_END -#define FMT_CHAPTER_END (FMT_CHAPTER_BEGIN + 4) - -// DDE-Formats -#define FMT_DDE_BEGIN FMT_CHAPTER_END -#define FMT_DDE_END (FMT_DDE_BEGIN + 2) - -#define FMT_REF_BEGIN FMT_DDE_END -#define FMT_REF_END (FMT_REF_BEGIN + 11) - -// Placeholder -#define FMT_MARK_BEGIN FMT_REF_END -#define FMT_MARK_END (FMT_MARK_BEGIN + 5) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc index 7eafcd6a042c..473ec1f5fbff 100644 --- a/sw/inc/globals.hrc +++ b/sw/inc/globals.hrc @@ -48,14 +48,9 @@ #define FN_PAGEUP_SEL (RC_GLOBALS_BEGIN + 29) #define FN_PAGEDOWN_SEL (RC_GLOBALS_BEGIN + 30) -// TABPAGES ----------------------------------------------------------- - -#define TP_DOC_STAT (RC_GLOBALS_BEGIN + 15) - // Sw-pages #define TP_OPTPRINT_PAGE (RC_GLOBALS_BEGIN + 26) -#define DLG_SVXTEST_NUM_BULLET (RC_GLOBALS_BEGIN + 79) //maximum: RC_GLOBALS_BEGIN + 120 #define SID_PREVIEWFLAG_TYPE (RC_GLOBALS_BEGIN + 114) diff --git a/sw/inc/helpid.h b/sw/inc/helpids.h index b603262a130e..cd7028624ea7 100644 --- a/sw/inc/helpid.h +++ b/sw/inc/helpids.h @@ -16,6 +16,10 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ + +#ifndef INCLUDED_SW_INC_HELPIDS_H +#define INCLUDED_SW_INC_HELPIDS_H + #include "swcommands.h" #include <svx/svxcommands.h> @@ -187,5 +191,6 @@ #define HID_TBX_FORMULA_CANCEL "SW_HID_TBX_FORMULA_CANCEL" #define HID_TBX_FORMULA_APPLY "SW_HID_TBX_FORMULA_APPLY" +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/index.hrc b/sw/inc/index.hrc deleted file mode 100644 index 4d008b9c2108..000000000000 --- a/sw/inc/index.hrc +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -/* For DesignEditor -#define RC_INDEX_BEGIN 256 -*/ - -#ifndef INCLUDED_SW_INC_INDEX_HRC -#define INCLUDED_SW_INC_INDEX_HRC - -#include "rcid.hrc" - -#define DLG_EDIT_AUTHMARK (RC_INDEX_BEGIN + 12) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index 300402064265..27eb99b158c0 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -30,7 +30,7 @@ #include <deque> #include <float.h> #include <functional> -#include <helpid.h> +#include <helpids.h> #include <limits.h> #include <list> #include <map> diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx index 2fbefd48baf8..d0326823fa6d 100644 --- a/sw/inc/pch/precompiled_swui.hxx +++ b/sw/inc/pch/precompiled_swui.hxx @@ -35,7 +35,7 @@ #include <exception> #include <float.h> #include <functional> -#include <helpid.h> +#include <helpids.h> #include <iomanip> #include <iostream> #include <limits.h> diff --git a/sw/inc/rcid.hrc b/sw/inc/rcid.hrc index ab9d1491473d..e362a8c38354 100644 --- a/sw/inc/rcid.hrc +++ b/sw/inc/rcid.hrc @@ -19,247 +19,20 @@ #ifndef INCLUDED_SW_INC_RCID_HRC #define INCLUDED_SW_INC_RCID_HRC -#include <sfx2/sfxsids.hrc> +#include <svl/solar.hrc> // Areas for the UI-Directories -#define RC_BASE RID_SW_START // From solar.hrc - -#define RC_APP RC_BASE -#define RC_DIALOG (RC_BASE + 200) -#define RC_DOCVW (RC_BASE + 300) -#define RC_WEB (RC_BASE + 400) -#define RC_GLOBDOC (RC_BASE + 500) -#define RC_VIEW (RC_BASE + 600) -#define RC_CHRDLG (RC_BASE + 700) -#define RC_RIBBAR (RC_BASE + 720) -#define RC_GLOBALS (RC_BASE + 800) -#define RC_FMTUI (RC_BASE + 920) -#define RC_FRMDLG (RC_BASE + 1000) -#define RC_FLDDLG (RC_BASE + 1100) -#define RC_UTLUI (RC_BASE + 1250) -#define RC_TABLE (RC_BASE + 1450) -#define RC_CONFIG (RC_BASE + 1550) -#define RC_MISC (RC_BASE + 1650) -#define RC_WRTSH (RC_BASE + 1750) -#define RC_INDEX (RC_BASE + 1950) -#define RC_DBUI (RC_BASE + 2050) -#define RC_DOCHDL (RC_BASE + 2150) -#define RC_POOLCHRFMT (RC_BASE + 2250) -#define RC_POOLHTMLCHRFMT (RC_BASE + 2290) -#define RC_POOLFRMFMT (RC_BASE + 2330) -#define RC_POOLTXTCOLL (RC_BASE + 2360) -#define RC_POOLPAGEDESC (RC_BASE + 2550) -#define RC_POOLNUMRULE (RC_BASE + 2650) -#define RC_ENVELP (RC_BASE + 2750) -#define RC_STATLIN_STR (RC_BASE + 2850) -#define RC_COMMON_CORE (RC_BASE + 2950) -#define RC_POPUPS (RC_BASE + 3150) -#define RC_SHELLS (RC_BASE + 3250) -#define RC_CFGITEMS (RC_BASE + 3350) -#define RC_LINGU (RC_BASE + 3450) -#define RC_ACCESS (RC_BASE + 3550) -#define STR_POOLPARSTYLE (RC_BASE + 3650) -#define RC_UNDO (RC_BASE + 3750) -#define RC_SMARTTAG (RC_BASE + 3950) -#define RC_UNOCORE (RC_BASE + 4050) -#define RC_PROPERTYPANEL (RC_BASE + 4070) -#define RC_ANNOTATION (RC_BASE + 4150) -#define RC_PAGEFRM (RC_BASE + 4250) -#define RC_IDXTXT (RC_BASE + 4350) -#define RC_SIDEBAR (RC_BASE + 4450) -#define RC_ATTR (RC_BASE + 4550) -#define RC_POOLTABSTYLE (RC_BASE + 4650) +#define RC_GLOBALS (RID_SW_START + 800) /*-------------------------------------------------------------------- Description: areas unharness --------------------------------------------------------------------*/ -// App-Directory -#define RC_APP_BEGIN RC_APP -#define RC_APP_END (RC_APP_BEGIN + 199) - -// Dialog-Directory -#define RC_DIALOG_BEGIN RC_DIALOG -#define RC_DIALOG_END (RC_DIALOG_BEGIN + 99) - -// Editwin & Co -#define RC_DOCVW_BEGIN RC_DOCVW -#define RC_DOCVW_END (RC_DOCVW_BEGIN + 99) - -// Annotation -#define RC_ANNOTATION_BEGIN RC_ANNOTATION -#define RC_ANNOTATION_END (RC_ANNOTATION_BEGIN + 99) - -// Page frame -#define RC_PAGEFRM_BEGIN RC_PAGEFRM -#define RC_PAGEFRM_END (RC_PAGEFRM + 99) - -// SW/Web -#define RC_WEB_BEGIN RC_WEB -#define RC_WEB_END (RC_WEB_BEGIN + 199) - -//Globaldocument -#define RC_GLOBDOC_BEGIN RC_GLOBDOC -#define RC_GLOBDOC_END (RC_GLOBDOC_BEGIN + 99) - -// UI-View -#define RC_VIEW_BEGIN RC_VIEW -#define RC_VIEW_END (RC_VIEW_BEGIN + 99) - -// Character Paragraph Tab-Dialog -#define RC_CHRDLG_BEGIN RC_CHRDLG -#define RC_CHRDLG_END (RC_CHRDLG_BEGIN + 19) - -// Our Shell -#define RC_WRTSH_BEGIN RC_WRTSH -#define RC_WRTSH_END (RC_WRTSH_BEGIN + 49) - -// Directories -#define RC_INDEX_BEGIN RC_INDEX -// RC_INDEX_END (RC_INDEX + 99) - -#define RC_RIBBAR_BEGIN RC_RIBBAR -#define RC_RIBBAR_END (RC_RIBBAR_BEGIN + 99) - // Global Resources #define RC_GLOBALS_BEGIN RC_GLOBALS #define RC_GLOBALS_END (RC_GLOBALS_BEGIN + 120) -// Format-Templates -#define RC_FMTUI_BEGIN RC_FMTUI -// RC_FMTUI_END (RC_FMTUI_BEGIN + 69) - -// Graphic Dialogues -#define RC_GRFDLG_BEGIN RC_GRFDLG -// RC_GRFDLG_END (RC_GRFDLG_BEGIN + 99) - -// ???? -#define RC_FSTDLG_BEGIN RC_FSTDLG -// RC_FSTDLG_END (RC_FSTDLG_BEGIN + 99) - -// Frame Dialogue -#define RC_FRMDLG_BEGIN RC_FRMDLG -#define RC_FRMDLG_END (RC_FRMDLG_BEGIN + 99) - -// Field Dialogue -#define RC_FLDDLG_BEGIN RC_FLDDLG -// RC_FLDDLG_END (RC_FLDDLG_BEGIN + 149) - -// Utilities UI -#define RC_UTLUI_BEGIN RC_UTLUI -#define RC_UTLUI_END (RC_UTLUI + 199) - -// Tables -#define RC_TABLE_BEGIN RC_TABLE -#define RC_TABLE_END (RC_TABLE + 99) - -// Configuration -#define RC_CONFIG_BEGIN RC_CONFIG -#define RC_CONFIG_END (RC_CONFIG + 99) - -// Miscellaneous -#define RC_MISC_BEGIN RC_MISC -#define RC_MISC_END (RC_MISC + 99) - -// DBManager -#define RC_DBUI_BEGIN RC_DBUI -// RC_DBUI_END (RC_DBUI + 99) - -// The rest of the Imp-Classes -#define RC_DOCHDL_BEGIN RC_DOCHDL -#define RC_DOCHDL_END (RC_DOCHDL + 99) - -// Drawing Templates -#define RC_POOLCHRFMT_BEGIN RC_POOLCHRFMT -// RC_POOLCHRFMT_END (RC_POOLCHRFMT + 29) -#define RC_POOLCHRFMT_HTML_BEGIN RC_POOLHTMLCHRFMT -// RC_POOLCHRFMT_HTML_END (RC_POOLHTMLCHRFMT+ 30) - -// Frame-Templates -#define RC_POOLFRMFMT_BEGIN RC_POOLFRMFMT -// RC_POOLFRMFMT_END (RC_POOLFRMFMT + 20) - -// Collections - -#define RC_POOLCOLL_TEXT_BEGIN RC_POOLTXTCOLL -// RC_POOLCOLL_TEXT_END (RC_POOLTXTCOLL + 19) -#define RC_POOLCOLL_LISTS_BEGIN (RC_POOLTXTCOLL + 20) -// RC_POOLCOLL_LISTS_END (RC_POOLTXTCOLL + 69) -#define RC_POOLCOLL_EXTRA_BEGIN (RC_POOLTXTCOLL + 70) -// RC_POOLCOLL_EXTRA_END (RC_POOLTXTCOLL + 89) -#define RC_POOLCOLL_REGISTER_BEGIN (RC_POOLTXTCOLL + 90) -// RC_POOLCOLL_REGISTER_END (RC_POOLTXTCOLL + 119) -#define RC_POOLCOLL_DOC_BEGIN (RC_POOLTXTCOLL + 130) -// RC_POOLCOLL_DOC_END (RC_POOLTXTCOLL + 139) -#define RC_POOLCOLL_HTML_BEGIN (RC_POOLTXTCOLL + 140) -// RC_POOLCOLL_HTML_END (RC_POOLTXTCOLL + 169) - -// Pooltemplates Page -#define RC_POOLPAGEDESC_BEGIN RC_POOLPAGEDESC -// RC_POOLPAGEDESC_END (RC_POOLPAGEDESC + 10) - -// Pooltemplates Numbering -#define RC_POOLNUMRULE_BEGIN RC_POOLNUMRULE -// RC_POOLNUMRULE_END (RC_POOLNUMRULE + 10) - -// free: STR_POOLPARSTYLE to (STR_POOLPARSTYLE + 9) - -// Envelp-Directory -#define RC_ENVELP_BEGIN (RC_ENVELP ) -// RC_ENVELP_END (RC_ENVELP + 99) - -// free: RC_STATLIN_STR_BEGIN to (RC_STATLIN_STR + 49) - -// Common Core-Strings -#define RC_COMCORE_BEGIN (RC_COMMON_CORE) -// RC_COMCORE_END (RC_COMMON_CORE + 59) - -// Shell-Directory -#define RC_SHELLS_BEGIN RC_SHELLS -#define RC_SHELLS_END (RC_SHELLS + 99) - -// PopUpMenu's -#define RC_POPUPS_BEGIN RC_POPUPS -#define RC_POPUPS_END (RC_POPUPS + 99) - -// free: RC_CFGITEMS_BEGIN to (RC_CFGITEMS + 99) - -// Lingu -#define RC_LINGU_BEGIN RC_LINGU -// RC_LINGU_END (RC_LINGU + 99) - -// Accessibility -#define RC_ACCESS_BEGIN RC_ACCESS -#define RC_ACCESS_END (RC_ACCESS + 99) - -// free: RC_UNDO to (RC_UNDO + 199) -// free: RC_SMARTTAG to (RC_SMARTTAG + 99) - -// unocore -#define RC_UNOCORE_BEGIN RC_UNOCORE -#define RC_UNOCORE_END (RC_UNOCORE + 10) - -//idxexample -#define RC_IDXTXT_BEGIN RC_IDXTXT -#define RC_IDXTXT_END (RC_IDXTXT + 10) - -// property panel -#define RC_PROPERTYPANEL_BEGIN RC_PROPERTYPANEL -// RC_PROPERTYPANEL_END (RC_PROPERTYPANEL + 10) - -// sidebar (mostly the Page one) -#define RC_SIDEBAR_BEGIN RC_SIDEBAR -#define RC_SIDEBAR_END (RC_SIDEBAR + 99) - -// Utilities UI-Attributes -#define RC_ATTR_BEGIN RC_ATTR -#define RC_ATTR_END (RC_ATTR + 99) - -// Table styles -#define RC_POOLTABSTYLE_BEGIN RC_POOLTABSTYLE -#define RC_POOLTABSTYLE_END (RC_POOLTABSTYLE + 99) - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index 2e0daa9819a0..cd6759dfe8b6 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -376,15 +376,16 @@ class SwAbstractDialogFactory public: static SwAbstractDialogFactory* Create(); - virtual VclPtr<SfxAbstractDialog> CreateSfxDialog( vcl::Window* pParent, - const SfxItemSet& rAttr, - const css::uno::Reference< css::frame::XFrame >& _rxFrame, - sal_uInt32 nResId - ) = 0; + virtual VclPtr<SfxAbstractDialog> CreateNumFormatDialog( vcl::Window* pParent, + const SfxItemSet& rAttr) = 0; + virtual VclPtr<SfxAbstractDialog> CreateSwDropCapsDialog(vcl::Window* pParent, const SfxItemSet& rSet) = 0; + virtual VclPtr<SfxAbstractDialog> CreateSwBackgroundDialog(vcl::Window* pParent, const SfxItemSet& rSet) = 0; + virtual VclPtr<AbstractSwWordCountFloatDlg> CreateSwWordCountDialog(SfxBindings* pBindings, SfxChildWindow* pChild, vcl::Window *pParent, SfxChildWinInfo* pInfo) = 0; virtual VclPtr<AbstractSwInsertAbstractDlg> CreateSwInsertAbstractDlg() = 0; + virtual VclPtr<SfxAbstractDialog> CreateSwAddressAbstractDlg(vcl::Window* pParent, const SfxItemSet& rSet) = 0; virtual VclPtr<AbstractSwAsciiFilterDlg> CreateSwAsciiFilterDlg ( SwDocShell& rDocSh, SvStream* pStream ) = 0; virtual VclPtr<VclAbstractDialog> CreateSwInsertBookmarkDlg( vcl::Window *pParent, SwWrtShell &rSh, SfxRequest& rReq ) = 0; @@ -417,9 +418,13 @@ public: bool bDraw, const OString& sDefPage = OString() ) = 0; + virtual VclPtr<VclAbstractDialog> CreateSwAutoMarkDialog(vcl::Window *pParent, SwWrtShell &rSh) = 0; + virtual VclPtr<AbstractSwSelGlossaryDlg> CreateSwSelGlossaryDlg(const OUString &rShortName) = 0; - virtual VclPtr<VclAbstractDialog> CreateVclAbstractDialog ( vcl::Window * pParent, SwWrtShell &rSh, int nResId ) = 0; + virtual VclPtr<VclAbstractDialog> CreateSwSortingDialog(vcl::Window * pParent, SwWrtShell &rSh) = 0; + virtual VclPtr<VclAbstractDialog> CreateSwTableHeightDialog(vcl::Window *pParent, SwWrtShell &rSh) = 0; + virtual VclPtr<VclAbstractDialog> CreateSwColumnDialog(vcl::Window *pParent, SwWrtShell &rSh) = 0; virtual VclPtr<AbstractSplitTableDialog> CreateSplitTableDialog ( vcl::Window * pParent, SwWrtShell &rSh ) = 0; virtual VclPtr<AbstractSwAutoFormatDlg> CreateSwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pShell, @@ -474,9 +479,11 @@ public: const css::uno::Reference< css::sdbc::XConnection>& xConnection ) = 0; virtual VclPtr<AbstractMailMergeCreateFromDlg> CreateMailMergeCreateFromDlg(vcl::Window* pParent) = 0; virtual VclPtr<AbstractMailMergeFieldConnectionsDlg> CreateMailMergeFieldConnectionsDlg(vcl::Window* pParent) = 0; - virtual VclPtr<VclAbstractDialog> CreateMultiTOXMarkDlg(vcl::Window* pParent, SwTOXMgr &rTOXMgr) = 0; - virtual VclPtr<SfxAbstractTabDialog> CreateSwTabDialog( int nResId, - vcl::Window* pParent, + virtual VclPtr<VclAbstractDialog> CreateMultiTOXMarkDlg(vcl::Window* pParent, SwTOXMgr &rTOXMgr) = 0; + virtual VclPtr<SfxAbstractTabDialog> CreateOutlineTabDialog(vcl::Window* pParent, + const SfxItemSet* pSwItemSet, + SwWrtShell &) = 0; + virtual VclPtr<SfxAbstractTabDialog> CreateSvxNumBulletTabDialog(vcl::Window* pParent, const SfxItemSet* pSwItemSet, SwWrtShell &) = 0; virtual VclPtr<AbstractMultiTOXTabDialog> CreateMultiTOXTabDialog( diff --git a/sw/inc/swevent.hxx b/sw/inc/swevent.hxx index 8cb2e2b55c5e..8ef0e908fd19 100644 --- a/sw/inc/swevent.hxx +++ b/sw/inc/swevent.hxx @@ -20,8 +20,8 @@ #ifndef INCLUDED_SW_INC_SWEVENT_HXX #define INCLUDED_SW_INC_SWEVENT_HXX +#include <sfx2/event.hxx> #include <tools/solar.h> -#include <sfx2/sfx.hrc> #include <calbck.hxx> #include <frmfmt.hxx> diff --git a/sw/sdi/swslots.hrc b/sw/sdi/swslots.hrc index f8bba2c501d2..e4a3b9193d12 100644 --- a/sw/sdi/swslots.hrc +++ b/sw/sdi/swslots.hrc @@ -16,7 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <editeng/memberids.hrc> +#include <editeng/memberids.h> #include <editeng/editids.hrc> #include <svx/svxids.hrc> #include "globals.hrc" diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index e687bca7a6f3..320ace28ff50 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -91,7 +91,6 @@ #include <reffld.hxx> #include <expfld.hxx> #include <flddat.hxx> -#include <fldui.hrc> #include "../../uibase/inc/fldmgr.hxx" #include "fldbas.hxx" // SwField diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx index 8b73457738dd..d94d336d44a1 100644 --- a/sw/source/core/doc/DocumentStylePoolManager.cxx +++ b/sw/source/core/doc/DocumentStylePoolManager.cxx @@ -58,7 +58,6 @@ #include <editeng/frmdiritem.hxx> #include <editeng/emphasismarkitem.hxx> #include <editeng/scriptspaceitem.hxx> -#include <rcid.hrc> #include <strings.hrc> #include <com/sun/star/table/BorderLineStyle.hpp> #include <com/sun/star/text/VertOrientation.hpp> diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx b/sw/source/core/doc/SwStyleNameMapper.cxx index b430460b2c8e..53ee718715d0 100644 --- a/sw/source/core/doc/SwStyleNameMapper.cxx +++ b/sw/source/core/doc/SwStyleNameMapper.cxx @@ -22,7 +22,6 @@ #include <SwStyleNameMapper.hxx> #include <poolfmt.hxx> -#include <rcid.hrc> #ifdef _NEED_TO_DEBUG_MAPPING #include <stdlib.h> diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx index 39ac1fff78f1..713518fef3b1 100644 --- a/sw/source/core/doc/textboxhelper.cxx +++ b/sw/source/core/doc/textboxhelper.cxx @@ -32,7 +32,7 @@ #include <editeng/unoprnms.hxx> #include <editeng/charrotateitem.hxx> -#include <editeng/memberids.hrc> +#include <editeng/memberids.h> #include <svx/svdoashp.hxx> #include <svx/svdpage.hxx> #include <svl/itemiter.hxx> diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index 54d8a5265d31..9466da7e0bbd 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -63,7 +63,7 @@ #include <charatr.hxx> #include <mdiexp.hxx> #include <strings.hrc> -#include <comcore.hrc> +#include <comcore.hxx> #include <numrule.hxx> #include <memory> diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx index 14dc0db77dd7..f72f77a2f953 100644 --- a/sw/source/core/undo/docundo.cxx +++ b/sw/source/core/undo/docundo.cxx @@ -32,7 +32,6 @@ #include <swundo.hxx> #include <UndoCore.hxx> #include <rolbck.hxx> -#include <undo.hrc> #include <editsh.hxx> #include <unobaseclass.hxx> #include <limits> diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx index 8a905217738c..0693c708af13 100644 --- a/sw/source/core/undo/rolbck.cxx +++ b/sw/source/core/undo/rolbck.cxx @@ -53,7 +53,6 @@ #include <IMark.hxx> #include <charfmt.hxx> #include <strings.hrc> -#include <undo.hrc> #include <bookmrk.hxx> #include <memory> diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx index fefa7469c949..6787c6a3125b 100644 --- a/sw/source/core/undo/undel.cxx +++ b/sw/source/core/undo/undel.cxx @@ -42,7 +42,6 @@ #include <fldbas.hxx> #include <fmtfld.hxx> #include <strings.hrc> -#include <undo.hrc> #include <vector> // DELETE diff --git a/sw/source/core/undo/undo.hrc b/sw/source/core/undo/undo.hrc deleted file mode 100644 index bad7c896ce53..000000000000 --- a/sw/source/core/undo/undo.hrc +++ /dev/null @@ -1,24 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <rcid.hrc> -// Undo -#define UNDO_BASE (RC_WRTSH_BEGIN + 8) - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx index cae440a08055..26463a387ddf 100644 --- a/sw/source/core/undo/undobj.cxx +++ b/sw/source/core/undo/undobj.cxx @@ -37,7 +37,6 @@ #include <mvsave.hxx> #include <redline.hxx> #include <crossrefbookmark.hxx> -#include <undo.hrc> #include <strings.hrc> #include <docsh.hxx> #include <view.hxx> diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx index bee8eafb76ed..458b99a7f86a 100644 --- a/sw/source/core/undo/unins.cxx +++ b/sw/source/core/undo/unins.cxx @@ -55,7 +55,6 @@ #include <dcontact.hxx> #include <strings.hrc> -#include <undo.hrc> using namespace ::com::sun::star; diff --git a/sw/source/core/undo/unovwr.cxx b/sw/source/core/undo/unovwr.cxx index d9db5e57d456..1d11753ac4f7 100644 --- a/sw/source/core/undo/unovwr.cxx +++ b/sw/source/core/undo/unovwr.cxx @@ -33,7 +33,6 @@ #include <acorrect.hxx> #include <docary.hxx> #include <strings.hrc> -#include <undo.hrc> using namespace ::com::sun::star; using namespace ::com::sun::star::i18n; diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx index ba8242fc3d08..502b4915eb0d 100644 --- a/sw/source/core/unocore/swunohelper.cxx +++ b/sw/source/core/unocore/swunohelper.cxx @@ -38,7 +38,7 @@ #include <ucbhelper/content.hxx> #include <swunohelper.hxx> #include <svx/xfillit0.hxx> -#include <editeng/memberids.hrc> +#include <editeng/memberids.h> #include <svl/itemset.hxx> using namespace com::sun::star; diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index cb4205c97883..52ce1d245a1e 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -80,6 +80,7 @@ #include <basic/basmgr.hxx> #include <comphelper/processfactory.hxx> #include <cppuhelper/implbase.hxx> +#include <sfx2/event.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::document; diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 2448200ba661..9b33f94a1387 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -37,7 +37,7 @@ #include <svx/sdtaitm.hxx> #include <svx/xflclit.hxx> #include <tools/globname.hxx> -#include <editeng/memberids.hrc> +#include <editeng/memberids.h> #include <swtypes.hxx> #include <cmdid.h> #include <memory> diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx index aa98dbbf7ab9..abb7cc87753f 100644 --- a/sw/source/core/unocore/unomap.cxx +++ b/sw/source/core/unocore/unomap.cxx @@ -84,7 +84,7 @@ #include <unomid.h> #include <cmdid.h> #include <unofldmid.h> -#include <editeng/memberids.hrc> +#include <editeng/memberids.h> #include <editeng/unoipset.hxx> #include <editeng/unoprnms.hxx> #include <svx/xdef.hxx> diff --git a/sw/source/core/unocore/unomap1.cxx b/sw/source/core/unocore/unomap1.cxx index 9ed3faa7d1bc..4e8e4f00ffff 100644 --- a/sw/source/core/unocore/unomap1.cxx +++ b/sw/source/core/unocore/unomap1.cxx @@ -83,7 +83,7 @@ #include <unomid.h> #include <cmdid.h> #include <unofldmid.h> -#include <editeng/memberids.hrc> +#include <editeng/memberids.h> #include <editeng/unoipset.hxx> #include <editeng/unoprnms.hxx> #include <svx/xdef.hxx> diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index f48471ced40b..1c3893e89f6a 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -18,7 +18,7 @@ */ #include <svx/svxids.hrc> -#include <editeng/memberids.hrc> +#include <editeng/memberids.h> #include <swtypes.hxx> #include <cmdid.h> #include <hintids.hxx> diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 9be31a4c80ea..09be26616923 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -81,7 +81,7 @@ // #include <svx/unobrushitemhelper.hxx> #include <editeng/unoipset.hxx> -#include <editeng/memberids.hrc> +#include <editeng/memberids.h> #include <svx/unoshape.hxx> #include <svx/xflbstit.hxx> #include <svx/xflbmtit.hxx> diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 63e59d4996db..13375f32bef3 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -27,7 +27,7 @@ #include <o3tl/any.hxx> #include <svx/svxids.hrc> -#include <editeng/memberids.hrc> +#include <editeng/memberids.h> #include <float.h> #include <swtypes.hxx> #include <cmdid.h> diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index b576b62dcd6e..0763ba4212a4 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -22,11 +22,11 @@ #include <comphelper/string.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> -#include <sfx2/sfx.hrc> #include <svtools/htmlout.hxx> #include <svtools/htmlkywd.hxx> #include <svtools/htmltokn.h> #include <svl/whiter.hxx> +#include <sfx2/event.hxx> #include <sfx2/htmlmode.hxx> #include <editeng/escapementitem.hxx> #include <editeng/formatbreakitem.hxx> diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx index 0bcca0f9b98f..948dede6aaa8 100644 --- a/sw/source/filter/html/htmlbas.cxx +++ b/sw/source/filter/html/htmlbas.cxx @@ -22,7 +22,6 @@ #include <hintids.hxx> #include <comphelper/string.hxx> #include <rtl/strbuf.hxx> -#include <sfx2/sfx.hrc> #include <basic/sbx.hxx> #include <basic/basmgr.hxx> #include <basic/sbmod.hxx> diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx index 5c4746f18b8c..4b19eec0f16c 100644 --- a/sw/source/filter/html/htmlflywriter.cxx +++ b/sw/source/filter/html/htmlflywriter.cxx @@ -27,6 +27,7 @@ #include <svl/urihelper.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> +#include <sfx2/event.hxx> #include <svtools/htmlkywd.hxx> #include <svtools/htmlout.hxx> #include <svtools/htmltokn.h> diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 331db9f9c7dc..363c2b8a6c11 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -23,7 +23,6 @@ #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> #include <svx/svxids.hrc> -#include <sfx2/sfx.hrc> #include <i18nlangtag/languagetag.hxx> #include <svl/stritem.hxx> #include <svl/urihelper.hxx> @@ -37,6 +36,7 @@ #include <editeng/langitem.hxx> #include <editeng/scripttypeitem.hxx> #include <sfx2/docfile.hxx> +#include <sfx2/event.hxx> #include <svtools/imap.hxx> #include <svtools/htmltokn.h> #include <svtools/htmlkywd.hxx> diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 7d86e4234a60..48b99fb9b359 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/i18n/ScriptType.hpp> #include <comphelper/string.hxx> #include <rtl/ustrbuf.hxx> -#include <sfx2/sfx.hrc> #include <svx/svxids.hrc> #if OSL_DEBUG_LEVEL > 0 #include <stdlib.h> @@ -41,6 +40,7 @@ #include <unotools/pathoptions.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> +#include <sfx2/event.hxx> #include <sfx2/fcontnr.hxx> #include <sfx2/docfile.hxx> diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx index 26d7fd1ad8cd..f5bdd520c1f3 100644 --- a/sw/source/filter/xml/xmlbrsh.cxx +++ b/sw/source/filter/xml/xmlbrsh.cxx @@ -18,7 +18,7 @@ */ #include "hintids.hxx" -#include <editeng/memberids.hrc> +#include <editeng/memberids.h> #include <xmloff/nmspmap.hxx> #include <xmloff/xmlnmspe.hxx> diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx index 91b2a1456241..66770da5069d 100644 --- a/sw/source/filter/xml/xmlexpit.cxx +++ b/sw/source/filter/xml/xmlexpit.cxx @@ -34,7 +34,7 @@ #include <editeng/xmlcnitm.hxx> #include <xmloff/xmlexp.hxx> #include <xmloff/xmlprhdl.hxx> -#include <editeng/memberids.hrc> +#include <editeng/memberids.h> #include "hintids.hxx" #include "unomid.h" #include <svx/unomid.hxx> diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx index d7eeb7926372..60285aeaa31f 100644 --- a/sw/source/filter/xml/xmlimpit.cxx +++ b/sw/source/filter/xml/xmlimpit.cxx @@ -29,7 +29,7 @@ #include <xmloff/nmspmap.hxx> #include <xmloff/xmlnmspe.hxx> #include <editeng/xmlcnitm.hxx> -#include <editeng/memberids.hrc> +#include <editeng/memberids.h> #include "hintids.hxx" #include "unomid.h" diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx index 5f7ede99c079..e377ed34b44b 100644 --- a/sw/source/filter/xml/xmliteme.cxx +++ b/sw/source/filter/xml/xmliteme.cxx @@ -39,7 +39,7 @@ #include "fmtfsize.hxx" #include "swrect.hxx" #include "xmlexp.hxx" -#include <editeng/memberids.hrc> +#include <editeng/memberids.h> #include <comphelper/processfactory.hxx> using namespace ::com::sun::star; diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx index 984d6177023a..07e693edd65b 100644 --- a/sw/source/filter/xml/xmlitemi.cxx +++ b/sw/source/filter/xml/xmlitemi.cxx @@ -34,7 +34,7 @@ #include <editeng/tstpitem.hxx> #include <editeng/brushitem.hxx> #include <editeng/langitem.hxx> -#include <editeng/memberids.hrc> +#include <editeng/memberids.h> #include <svx/unomid.hxx> #include <comphelper/processfactory.hxx> diff --git a/sw/source/filter/xml/xmlitemm.cxx b/sw/source/filter/xml/xmlitemm.cxx index 2cb294ac85d6..dbe624019ccb 100644 --- a/sw/source/filter/xml/xmlitemm.cxx +++ b/sw/source/filter/xml/xmlitemm.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <editeng/memberids.hrc> +#include <editeng/memberids.h> #include <hintids.hxx> #include <svx/unomid.hxx> #include <xmloff/xmlnmspe.hxx> 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> diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index 40982c913be0..114cd5467c79 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -111,7 +111,6 @@ using namespace ::com::sun::star; #define SwModule #include <sfx2/msg.hxx> #include "swslots.hxx" -#include <cfgid.h> #include <strings.hrc> @@ -119,7 +118,7 @@ SFX_IMPL_INTERFACE(SwModule, SfxModule) void SwModule::InitInterface_Impl() { - GetStaticInterface()->RegisterStatusBar(CFG_STATUSBAR); + GetStaticInterface()->RegisterStatusBar(StatusBarId::WriterStatusBar); GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_APPLICATION, SfxVisibilityFlags::Standard | SfxVisibilityFlags::Client | SfxVisibilityFlags::Viewer, diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx index 1c4baa115dd9..1261362f7fc6 100644 --- a/sw/source/uibase/app/applab.cxx +++ b/sw/source/uibase/app/applab.cxx @@ -68,7 +68,6 @@ #include <app.hrc> #include <strings.hrc> #include "swabstdlg.hxx" -#include <misc.hrc> #include <IDocumentDeviceAccess.hxx> diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 9a5304e6cf48..894e32d39a70 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -96,13 +96,12 @@ #include <fldbas.hxx> #include <docary.hxx> #include <swerror.h> -#include <helpid.h> +#include <helpids.h> #include <cmdid.h> #include <globals.hrc> #include <strings.hrc> #include <app.hrc> -#include <cfgid.h> #include <unotools/fltrcfg.hxx> #include <svtools/htmlcfg.hxx> #include <sfx2/fcontnr.hxx> diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index 0f33a225b974..d793e2c43886 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -37,7 +37,7 @@ #include <svl/zformat.hxx> #include <unotools/pathoptions.hxx> #include <svtools/transfer.hxx> -#include <sfx2/dialogs.hrc> +#include <sfx2/sfxsids.hrc> #include <sfx2/dinfdlg.hxx> #include <sfx2/request.hxx> #include <sfx2/dispatch.hxx> @@ -49,6 +49,7 @@ #include <svtools/sfxecode.hxx> #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> +#include <svx/dialogs.hrc> #include <svx/svxids.hrc> #include <svx/drawitem.hxx> #include <editeng/svxacorr.hxx> @@ -103,7 +104,7 @@ #include <cmdid.h> #include <globals.h> -#include <helpid.h> +#include <helpids.h> #include <app.hrc> #include <strings.hrc> #include <globals.hrc> @@ -122,7 +123,6 @@ #include <sfx2/fcontnr.hxx> -#include "dialog.hrc" #include "swabstdlg.hxx" #include "watermarkdialog.hxx" @@ -152,7 +152,7 @@ VclPtr<SfxDocumentInfoDialog> SwDocShell::CreateDocumentInfoDialog(const SfxItem SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); pDlg->AddFontTabPage(); - pDlg->AddTabPage(TP_DOC_STAT, SwResId(STR_DOC_STAT),pFact->GetTabPageCreatorFunc( TP_DOC_STAT ),nullptr); + pDlg->AddTabPage(RID_SW_TP_DOC_STAT, SwResId(STR_DOC_STAT), pFact->GetTabPageCreatorFunc(RID_SW_TP_DOC_STAT), nullptr); } } return pDlg; diff --git a/sw/source/uibase/app/swdll.cxx b/sw/source/uibase/app/swdll.cxx index 6017d3e17d90..201fa02d1384 100644 --- a/sw/source/uibase/app/swdll.cxx +++ b/sw/source/uibase/app/swdll.cxx @@ -32,7 +32,6 @@ #include <swtypes.hxx> #include <init.hxx> #include <dobjfac.hxx> -#include <cfgid.h> #include <com/sun/star/frame/Desktop.hpp> #include <unotools/configmgr.hxx> diff --git a/sw/source/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx index 2c6e0bc5d856..109a46198f57 100644 --- a/sw/source/uibase/app/swmodul1.cxx +++ b/sw/source/uibase/app/swmodul1.cxx @@ -59,7 +59,7 @@ #include <cmdid.h> #include <app.hrc> #include <strings.hrc> -#include "helpid.h" +#include "helpids.h" #include <IDocumentLayoutAccess.hxx> #include <unomid.h> diff --git a/sw/source/uibase/chrdlg/ccoll.cxx b/sw/source/uibase/chrdlg/ccoll.cxx index cad9eaf5e93c..d4b617b12d9b 100644 --- a/sw/source/uibase/chrdlg/ccoll.cxx +++ b/sw/source/uibase/chrdlg/ccoll.cxx @@ -22,7 +22,7 @@ #include "view.hxx" #include "wrtsh.hxx" #include "globals.hrc" -#include "helpid.h" +#include "helpids.h" #include <sfx2/styfitem.hxx> @@ -34,7 +34,6 @@ #include "docstyle.hxx" #include "hints.hxx" -#include "chrdlg.hrc" #include <vcl/svapp.hxx> #include <unomid.h> diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx index 2641bfb9bd03..eab3e01ed5d9 100644 --- a/sw/source/uibase/dbui/dbtree.cxx +++ b/sw/source/uibase/dbui/dbtree.cxx @@ -40,7 +40,7 @@ #include <vcl/svapp.hxx> #include <svtools/treelistentry.hxx> -#include <helpid.h> +#include <helpids.h> #include <strings.hrc> #include "bitmaps.hlst" diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx index df1c4368a893..c468050c323d 100644 --- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx +++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx @@ -49,7 +49,6 @@ #include <pam.hxx> #include <drawbase.hxx> #include <unotextrange.hxx> -#include <dialog.hrc> #include <strings.hrc> #include <cmdid.h> diff --git a/sw/source/uibase/dialog/regionsw.cxx b/sw/source/uibase/dialog/regionsw.cxx index fd6777ab77b5..856d54f95507 100644 --- a/sw/source/uibase/dialog/regionsw.cxx +++ b/sw/source/uibase/dialog/regionsw.cxx @@ -45,7 +45,7 @@ #include <column.hxx> #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/uibase/dialog/wordcountwrapper.cxx b/sw/source/uibase/dialog/wordcountwrapper.cxx index 031d034e26bb..9d353d223ca2 100644 --- a/sw/source/uibase/dialog/wordcountwrapper.cxx +++ b/sw/source/uibase/dialog/wordcountwrapper.cxx @@ -10,7 +10,6 @@ #include <swtypes.hxx> #include <wordcountdialog.hxx> #include <docstat.hxx> -#include <dialog.hrc> #include <cmdid.h> SFX_IMPL_CHILDWINDOW_WITHID(SwWordCountWrapper, FN_WORDCOUNT_DIALOG) diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx index c674f397b1c3..484cdb31b5f4 100644 --- a/sw/source/uibase/dochdl/gloshdl.cxx +++ b/sw/source/uibase/dochdl/gloshdl.cxx @@ -52,7 +52,6 @@ #include <editeng/acorrcfg.hxx> #include "swabstdlg.hxx" -#include <misc.hrc> #include <IDocumentFieldsAccess.hxx> diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 33a7ddeba68b..d33cb06d4918 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -123,7 +123,7 @@ #include <pagefrm.hxx> #include <HeaderFooterWin.hxx> -#include <helpid.h> +#include <helpids.h> #include <cmdid.h> #include <strings.hrc> #include <uitool.hxx> diff --git a/sw/source/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx index 591e655f6d7c..8681e20f33d2 100644 --- a/sw/source/uibase/docvw/romenu.cxx +++ b/sw/source/uibase/docvw/romenu.cxx @@ -44,7 +44,7 @@ #include <modcfg.hxx> #include <cmdid.h> -#include <helpid.h> +#include <helpids.h> #include <strings.hrc> using namespace ::com::sun::star::lang; diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index a321298f568d..88367f6d7db4 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -44,7 +44,7 @@ #include <swmodule.hxx> #include <docsh.hxx> #include <srcview.hxx> -#include <helpid.h> +#include <helpids.h> #include <deque> namespace diff --git a/sw/source/uibase/envelp/labimg.cxx b/sw/source/uibase/envelp/labimg.cxx index b95ff4100e23..b26ff267a1e6 100644 --- a/sw/source/uibase/envelp/labimg.cxx +++ b/sw/source/uibase/envelp/labimg.cxx @@ -22,6 +22,7 @@ #include <o3tl/any.hxx> #include <tools/stream.hxx> #include <com/sun/star/uno/Sequence.hxx> +#include <sfx2/sfxsids.hrc> #include <unotools/useroptions.hxx> #include <swmodule.hxx> #include "labimg.hxx" diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx index 729d3c9cbcf5..93c635d2c5b2 100644 --- a/sw/source/uibase/fldui/fldmgr.cxx +++ b/sw/source/uibase/fldui/fldmgr.cxx @@ -76,10 +76,8 @@ #include <flddat.hxx> #include <fldmgr.hxx> #include <flddropdown.hxx> -#include <fldui.hrc> #include <strings.hrc> #include <tox.hxx> -#include <misc.hrc> #include <cnttab.hxx> #include <unotools/useroptions.hxx> diff --git a/sw/source/uibase/fldui/fldwrap.cxx b/sw/source/uibase/fldui/fldwrap.cxx index 9bfd047be8a6..8248278ae7d9 100644 --- a/sw/source/uibase/fldui/fldwrap.cxx +++ b/sw/source/uibase/fldui/fldwrap.cxx @@ -30,8 +30,7 @@ #include <view.hxx> #include <swmodule.hxx> -#include <helpid.h> -#include <fldui.hrc> +#include <helpids.h> #include <globals.hrc> #include "swabstdlg.hxx" diff --git a/sw/source/uibase/globdoc/globdoc.cxx b/sw/source/uibase/globdoc/globdoc.cxx index 2eca08044016..bc45a9efc1e9 100644 --- a/sw/source/uibase/globdoc/globdoc.cxx +++ b/sw/source/uibase/globdoc/globdoc.cxx @@ -26,7 +26,6 @@ #include "shellio.hxx" #include "globdoc.hxx" #include "strings.hrc" -#include "cfgid.h" // Description: Register all filters diff --git a/sw/source/uibase/inc/cfgid.h b/sw/source/uibase/inc/cfgid.h deleted file mode 100644 index ed7c0a545999..000000000000 --- a/sw/source/uibase/inc/cfgid.h +++ /dev/null @@ -1,28 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CFGID_H -#define INCLUDED_SW_SOURCE_UIBASE_INC_CFGID_H - -#include <sfx2/sfx.hrc> - -#define CFG_STATUSBAR (SFX_ITEMTYPE_SW_BEGIN +13) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/inc/frmui.hrc b/sw/source/uibase/inc/frmui.hrc deleted file mode 100644 index 6d8fbf133db1..000000000000 --- a/sw/source/uibase/inc/frmui.hrc +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FRMUI_HRC -#define INCLUDED_SW_SOURCE_UIBASE_INC_FRMUI_HRC - -#include "rcid.hrc" -#include "globals.hrc" - -#define DLG_COLUMN (RC_FRMDLG_BEGIN + 4) - -#define MN_BACKGROUND (RC_FRMDLG_BEGIN + 27) - -#endif // FRMUI_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/inc/misc.hrc b/sw/source/uibase/inc/misc.hrc deleted file mode 100644 index c9189e5ac191..000000000000 --- a/sw/source/uibase/inc/misc.hrc +++ /dev/null @@ -1,31 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_MISC_HRC -#define INCLUDED_SW_SOURCE_UIBASE_INC_MISC_HRC - -#include "rcid.hrc" - -#define DLG_SORTING (RC_MISC_BEGIN + 19) - -#define DLG_TAB_OUTLINE (RC_MISC_BEGIN + 29) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/inc/olmenu.hxx b/sw/source/uibase/inc/olmenu.hxx index 45bfdf2d5eba..a407f618810f 100644 --- a/sw/source/uibase/inc/olmenu.hxx +++ b/sw/source/uibase/inc/olmenu.hxx @@ -32,6 +32,44 @@ #include <map> #include <vector> +//! Don't change these values. You may break context menu modifying extensions! +#define MN_IGNORE_SELECTION 201 +#define MN_SHORT_COMMENT 208 +#define MN_EXPLANATION_LINK 209 + +// id range for dictionaries sub menu +#define MN_DICTIONARIES_START 300 +#define MN_DICTIONARIES_END (MN_DICTIONARIES_START + 99) + +// id range for suggestions from spell and grammar checker +#define MN_SUGGESTION_START 500 +#define MN_SUGGESTION_END (MN_SUGGESTION_START + MN_MAX_NUM_LANG) + +// id range for auto correction sub menu entries +#define MN_AUTOCORR_START 700 +#define MN_AUTOCORR_END (MN_AUTOCORR_START + MN_MAX_NUM_LANG) + +// max number of language entries sub menus +#define MN_MAX_NUM_LANG 99 + +#define MN_NONE_OFFSET (MN_MAX_NUM_LANG + 1) +#define MN_RESET_OFFSET (MN_MAX_NUM_LANG + 2) +#define MN_MORE_OFFSET (MN_MAX_NUM_LANG + 3) + +// id range for 'set language for selection' sub menu entries +#define MN_SET_LANGUAGE_SELECTION_START 900 +#define MN_SET_LANGUAGE_SELECTION_END (MN_SET_LANGUAGE_SELECTION_START + MN_MAX_NUM_LANG) +#define MN_SET_SELECTION_NONE (MN_SET_LANGUAGE_SELECTION_START + MN_NONE_OFFSET) +#define MN_SET_SELECTION_RESET (MN_SET_LANGUAGE_SELECTION_START + MN_RESET_OFFSET) +#define MN_SET_SELECTION_MORE (MN_SET_LANGUAGE_SELECTION_START + MN_MORE_OFFSET) + +// id range for 'set language for paragraph' sub menu entries +#define MN_SET_LANGUAGE_PARAGRAPH_START 1100 +#define MN_SET_LANGUAGE_PARAGRAPH_END (MN_SET_LANGUAGE_PARAGRAPH_START + MN_MAX_NUM_LANG) +#define MN_SET_PARA_NONE (MN_SET_LANGUAGE_PARAGRAPH_START + MN_NONE_OFFSET) +#define MN_SET_PARA_RESET (MN_SET_LANGUAGE_PARAGRAPH_START + MN_RESET_OFFSET) +#define MN_SET_PARA_MORE (MN_SET_LANGUAGE_PARAGRAPH_START + MN_MORE_OFFSET) + class SwWrtShell; class SW_DLLPUBLIC SwSpellPopup diff --git a/sw/source/uibase/inc/table.hrc b/sw/source/uibase/inc/table.hrc deleted file mode 100644 index cdd17a4bd855..000000000000 --- a/sw/source/uibase/inc/table.hrc +++ /dev/null @@ -1,30 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "rcid.hrc" - -#define DLG_ROW_HEIGHT (RC_TABLE_BEGIN + 4) - -#define TABLE_ACT_END DLG_ROW_HEIGHT - -#if TABLE_ACT_END > RC_TABLE_END -#error Resource-Id Ueberlauf in #file, #line -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/index/idxmrk.cxx b/sw/source/uibase/index/idxmrk.cxx index da4506b7e53d..39df3651ef78 100644 --- a/sw/source/uibase/index/idxmrk.cxx +++ b/sw/source/uibase/index/idxmrk.cxx @@ -18,7 +18,7 @@ */ #include <hintids.hxx> -#include <helpid.h> +#include <helpids.h> #include <comphelper/processfactory.hxx> #include <svl/stritem.hxx> #include <vcl/msgbox.hxx> @@ -35,7 +35,6 @@ #include <multmrk.hxx> #include <swundo.hxx> #include <cmdid.h> -#include <index.hrc> #include <swmodule.hxx> #include <fldmgr.hxx> #include <fldbas.hxx> diff --git a/sw/source/uibase/lingu/hhcwrp.cxx b/sw/source/uibase/lingu/hhcwrp.cxx index 6cbbbe7b4e4c..98323e84b665 100644 --- a/sw/source/uibase/lingu/hhcwrp.cxx +++ b/sw/source/uibase/lingu/hhcwrp.cxx @@ -44,7 +44,7 @@ #include <fmtruby.hxx> #include <breakit.hxx> -#include <olmenu.hrc> +#include <olmenu.hxx> #include <unomid.h> diff --git a/sw/source/uibase/lingu/hyp.cxx b/sw/source/uibase/lingu/hyp.cxx index ea1b73e65a12..8947ec8a7c12 100644 --- a/sw/source/uibase/lingu/hyp.cxx +++ b/sw/source/uibase/lingu/hyp.cxx @@ -30,7 +30,7 @@ #include "hyp.hxx" #include "mdiexp.hxx" -#include "olmenu.hrc" +#include "olmenu.hxx" #include "strings.hrc" #include <unomid.h> diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx index 8c5afcad5918..a3bb75c1cdc2 100644 --- a/sw/source/uibase/lingu/olmenu.cxx +++ b/sw/source/uibase/lingu/olmenu.cxx @@ -18,17 +18,15 @@ */ #include "SwRewriter.hxx" -#include "chrdlg.hrc" #include "cmdid.h" #include "strings.hrc" #include "doc.hxx" #include "docsh.hxx" #include "edtwin.hxx" -#include "helpid.h" +#include "helpids.h" #include "hintids.hxx" #include "langhelper.hxx" #include "ndtxt.hxx" -#include "olmenu.hrc" #include "bitmaps.hlst" #include "olmenu.hxx" #include "swabstdlg.hxx" diff --git a/sw/source/uibase/lingu/olmenu.hrc b/sw/source/uibase/lingu/olmenu.hrc deleted file mode 100644 index 03581e402b72..000000000000 --- a/sw/source/uibase/lingu/olmenu.hrc +++ /dev/null @@ -1,65 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_SW_SOURCE_UIBASE_LINGU_OLMENU_HRC -#define INCLUDED_SW_SOURCE_UIBASE_LINGU_OLMENU_HRC - -#include "rcid.hrc" - -//! Don't change these values. You may break context menu modifying extensions! -#define MN_IGNORE_SELECTION 201 -#define MN_SHORT_COMMENT 208 -#define MN_EXPLANATION_LINK 209 - -// id range for dictionaries sub menu -#define MN_DICTIONARIES_START 300 -#define MN_DICTIONARIES_END (MN_DICTIONARIES_START + 99) - -// id range for suggestions from spell and grammar checker -#define MN_SUGGESTION_START 500 -#define MN_SUGGESTION_END (MN_SUGGESTION_START + MN_MAX_NUM_LANG) - -// id range for auto correction sub menu entries -#define MN_AUTOCORR_START 700 -#define MN_AUTOCORR_END (MN_AUTOCORR_START + MN_MAX_NUM_LANG) - -// max number of language entries sub menus -#define MN_MAX_NUM_LANG 99 - -#define MN_NONE_OFFSET (MN_MAX_NUM_LANG + 1) -#define MN_RESET_OFFSET (MN_MAX_NUM_LANG + 2) -#define MN_MORE_OFFSET (MN_MAX_NUM_LANG + 3) - -// id range for 'set language for selection' sub menu entries -#define MN_SET_LANGUAGE_SELECTION_START 900 -#define MN_SET_LANGUAGE_SELECTION_END (MN_SET_LANGUAGE_SELECTION_START + MN_MAX_NUM_LANG) -#define MN_SET_SELECTION_NONE (MN_SET_LANGUAGE_SELECTION_START + MN_NONE_OFFSET) -#define MN_SET_SELECTION_RESET (MN_SET_LANGUAGE_SELECTION_START + MN_RESET_OFFSET) -#define MN_SET_SELECTION_MORE (MN_SET_LANGUAGE_SELECTION_START + MN_MORE_OFFSET) - -// id range for 'set language for paragraph' sub menu entries -#define MN_SET_LANGUAGE_PARAGRAPH_START 1100 -#define MN_SET_LANGUAGE_PARAGRAPH_END (MN_SET_LANGUAGE_PARAGRAPH_START + MN_MAX_NUM_LANG) -#define MN_SET_PARA_NONE (MN_SET_LANGUAGE_PARAGRAPH_START + MN_NONE_OFFSET) -#define MN_SET_PARA_RESET (MN_SET_LANGUAGE_PARAGRAPH_START + MN_RESET_OFFSET) -#define MN_SET_PARA_MORE (MN_SET_LANGUAGE_PARAGRAPH_START + MN_MORE_OFFSET) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/misc/glshell.cxx b/sw/source/uibase/misc/glshell.cxx index 256afaa29a01..8e691ed9c25f 100644 --- a/sw/source/uibase/misc/glshell.cxx +++ b/sw/source/uibase/misc/glshell.cxx @@ -45,7 +45,6 @@ #include <initui.hxx> #include <cmdid.h> #include <swerror.h> -#include <misc.hrc> #include <strings.hrc> #define SwWebGlosDocShell diff --git a/sw/source/uibase/misc/numberingtypelistbox.cxx b/sw/source/uibase/misc/numberingtypelistbox.cxx index 58ada01cda4d..425fc75b3823 100644 --- a/sw/source/uibase/misc/numberingtypelistbox.cxx +++ b/sw/source/uibase/misc/numberingtypelistbox.cxx @@ -18,7 +18,6 @@ */ #include <numberingtypelistbox.hxx> -#include <misc.hrc> #include <cnttab.hxx> #include <com/sun/star/style/NumberingType.hpp> #include <com/sun/star/text/DefaultNumberingProvider.hpp> diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index 350b5f0e6ebf..5205e84ef715 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -33,9 +33,8 @@ #include <swwait.hxx> #include <uitool.hxx> -#include <helpid.h> +#include <helpids.h> #include <cmdid.h> -#include <misc.hrc> #include <strings.hrc> // -> #111827# diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx index 6f1f6f3190ec..c1c28dd50d9f 100644 --- a/sw/source/uibase/misc/swruler.cxx +++ b/sw/source/uibase/misc/swruler.cxx @@ -23,7 +23,6 @@ #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/settings.hxx> -#include "misc.hrc" #include "strings.hrc" #define CONTROL_BORDER_WIDTH 1 diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx index b7b89547aba9..345697ab8e4b 100644 --- a/sw/source/uibase/ribbar/inputwin.cxx +++ b/sw/source/uibase/ribbar/inputwin.cxx @@ -22,6 +22,7 @@ #include <comphelper/string.hxx> #include <officecfg/Office/Common.hxx> #include <tools/gen.hxx> +#include <sfx2/objface.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> #include <svx/ruler.hxx> @@ -41,7 +42,7 @@ #include "frmfmt.hxx" #include "cellatr.hxx" #include "edtwin.hxx" -#include "helpid.h" +#include "helpids.h" #include "strings.hrc" #include "bitmaps.hlst" diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index d6c7d3c8643d..c6d1b3250e99 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -36,14 +36,13 @@ #include <workctrl.hxx> #include <strings.hrc> #include <cmdid.h> -#include <helpid.h> +#include <helpids.h> #include <wrtsh.hxx> #include <svl/imageitm.hxx> #include <vcl/lstbox.hxx> #include <vcl/settings.hxx> #include <rtl/ustring.hxx> #include "swabstdlg.hxx" -#include <misc.hrc> #include <sfx2/zoomitem.hxx> #include <vcl/svapp.hxx> #include <svx/dialmgr.hxx> diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index bd55da92d18d..3aa0f98d044a 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -113,8 +113,6 @@ #include <docsh.hxx> #include <svl/undo.hxx> #include "swabstdlg.hxx" -#include "chrdlg.hrc" -#include "misc.hrc" #include <app.hrc> #include <comphelper/string.hxx> diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index e5196985f47f..841c8b5189a9 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -96,9 +96,6 @@ #include <IDocumentSettingAccess.hxx> #include <IDocumentUndoRedo.hxx> #include "swabstdlg.hxx" -#include "dialog.hrc" -#include "fldui.hrc" -#include "table.hrc" #include <modcfg.hxx> #include <instable.hxx> #include <svx/fmshell.hxx> @@ -2511,7 +2508,7 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq) ScopedVclPtr<SfxAbstractDialog> pDlg; SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); + assert(pFact && "SwAbstractDialogFactory fail!"); // Table cell(s) selected? if ( rSh.IsTableMode() ) @@ -2519,10 +2516,8 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq) // Get background attributes of the table and put it in the set SvxBrushItem aBrush(RES_BACKGROUND); rSh.GetBoxBackground( aBrush ); - pDlg.disposeAndReset(pFact->CreateSfxDialog( pMDI, aSet, - rView.GetViewFrame()->GetFrame().GetFrameInterface(), - RC_SWDLG_BACKGROUND )); - OSL_ENSURE(pDlg, "Dialog creation failed!"); + pDlg.disposeAndReset(pFact->CreateSwBackgroundDialog(pMDI, aSet)); + assert(pDlg && "Dialog creation failed!"); aSet.Put( aBrush ); if ( pDlg->Execute() == RET_OK ) { @@ -2537,10 +2532,8 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq) rSh.GetFlyFrameAttr( aSet ); - pDlg.disposeAndReset(pFact->CreateSfxDialog( pMDI, aSet, - rView.GetViewFrame()->GetFrame().GetFrameInterface(), - RC_SWDLG_BACKGROUND )); - OSL_ENSURE(pDlg, "Dialog creation failed!"); + pDlg.disposeAndReset(pFact->CreateSwBackgroundDialog(pMDI, aSet)); + assert(pDlg && "Dialog creation failed!"); if ( pDlg->Execute() == RET_OK ) { rSh.SetFlyFrameAttr(const_cast<SfxItemSet &>(*pDlg->GetOutputItemSet()) ); @@ -2552,10 +2545,8 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq) // Set border attributes Umrandungsattribute with the shell quite normal. rSh.GetCurAttr( aSet ); - pDlg.disposeAndReset(pFact->CreateSfxDialog( pMDI, aSet, - rView.GetViewFrame()->GetFrame().GetFrameInterface(), - RC_SWDLG_BACKGROUND )); - OSL_ENSURE(pDlg, "Dialog creation failed!"); + pDlg.disposeAndReset(pFact->CreateSwBackgroundDialog(pMDI, aSet)); + assert(pDlg && "Dialog creation failed!"); if ( pDlg->Execute() == RET_OK ) { rSh.SetAttrSet( *pDlg->GetOutputItemSet() ); diff --git a/sw/source/uibase/shells/beziersh.cxx b/sw/source/uibase/shells/beziersh.cxx index a3ef6109fece..5cb353f6c91a 100644 --- a/sw/source/uibase/shells/beziersh.cxx +++ b/sw/source/uibase/shells/beziersh.cxx @@ -31,7 +31,7 @@ #include "wrtsh.hxx" #include "view.hxx" #include "edtwin.hxx" -#include "helpid.h" +#include "helpids.h" #include "globals.hrc" #include "drawbase.hxx" #include "beziersh.hxx" diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx index 41c3e0627c0d..9e705171b10e 100644 --- a/sw/source/uibase/shells/drawsh.cxx +++ b/sw/source/uibase/shells/drawsh.cxx @@ -54,7 +54,7 @@ #include "wrtsh.hxx" #include "cmdid.h" #include "globals.hrc" -#include "helpid.h" +#include "helpids.h" #include "strings.hrc" #include "drwbassh.hxx" #include "drawsh.hxx" @@ -63,7 +63,6 @@ #include <sfx2/msg.hxx> #include "swslots.hxx" #include "swabstdlg.hxx" -#include "misc.hrc" using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sw/source/uibase/shells/drformsh.cxx b/sw/source/uibase/shells/drformsh.cxx index f9eeee21e137..3ebfcb1063c7 100644 --- a/sw/source/uibase/shells/drformsh.cxx +++ b/sw/source/uibase/shells/drformsh.cxx @@ -39,7 +39,7 @@ #include "wrtsh.hxx" #include "cmdid.h" #include "globals.hrc" -#include "helpid.h" +#include "helpids.h" #include "strings.hrc" #include "drwbassh.hxx" #include "drformsh.hxx" diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx index b9a0b3bf3bdb..026b988aeed1 100644 --- a/sw/source/uibase/shells/drwbassh.cxx +++ b/sw/source/uibase/shells/drwbassh.cxx @@ -18,7 +18,7 @@ */ #include <hintids.hxx> -#include <helpid.h> +#include <helpids.h> #include <swtypes.hxx> #include <sfx2/objface.hxx> #include <sfx2/request.hxx> @@ -56,7 +56,6 @@ #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> #include "swabstdlg.hxx" -#include "dialog.hrc" #include <swundo.hxx> #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/VertOrientation.hpp> diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx index 6744d94b2494..99edb77400df 100644 --- a/sw/source/uibase/shells/drwtxtex.cxx +++ b/sw/source/uibase/shells/drwtxtex.cxx @@ -95,8 +95,6 @@ #include <wview.hxx> #include "swabstdlg.hxx" -#include "chrdlg.hrc" -#include "misc.hrc" #include <memory> using namespace ::com::sun::star; diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx index b7ae1f342e66..4169bac09886 100644 --- a/sw/source/uibase/shells/drwtxtsh.cxx +++ b/sw/source/uibase/shells/drwtxtsh.cxx @@ -54,7 +54,7 @@ #include <breakit.hxx> #include <cmdid.h> -#include <helpid.h> +#include <helpids.h> #include <globals.hrc> #include <strings.hrc> @@ -71,7 +71,6 @@ #include <cppuhelper/bootstrap.hxx> #include <comphelper/processfactory.hxx> #include "swabstdlg.hxx" -#include "misc.hrc" #include "IDocumentUndoRedo.hxx" #include <memory> diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx index 1e5bab8a6c78..04da98d8dd1f 100644 --- a/sw/source/uibase/shells/frmsh.cxx +++ b/sw/source/uibase/shells/frmsh.cxx @@ -69,13 +69,12 @@ #include <docstat.hxx> #include <IDocumentStatistics.hxx> -#include <helpid.h> +#include <helpids.h> #include <cmdid.h> #include <cfgitems.hxx> #include <globals.hrc> #include <strings.hrc> #include "swabstdlg.hxx" -#include "misc.hrc" #include <svx/dialogs.hrc> diff --git a/sw/source/uibase/shells/listsh.cxx b/sw/source/uibase/shells/listsh.cxx index 2e6127ba6522..cb17d42b9a14 100644 --- a/sw/source/uibase/shells/listsh.cxx +++ b/sw/source/uibase/shells/listsh.cxx @@ -36,7 +36,7 @@ #include "wrtsh.hxx" #include "swmodule.hxx" #include "frmatr.hxx" -#include "helpid.h" +#include "helpids.h" #include "globals.hrc" #include "strings.hrc" #include "uinums.hxx" diff --git a/sw/source/uibase/shells/navsh.cxx b/sw/source/uibase/shells/navsh.cxx index abba5d41c97b..0340b8432ba1 100644 --- a/sw/source/uibase/shells/navsh.cxx +++ b/sw/source/uibase/shells/navsh.cxx @@ -19,7 +19,7 @@ #include "wrtsh.hxx" #include "view.hxx" #include "edtwin.hxx" -#include "helpid.h" +#include "helpids.h" #include "globals.hrc" #include "navsh.hxx" #include "strings.hrc" diff --git a/sw/source/uibase/shells/olesh.cxx b/sw/source/uibase/shells/olesh.cxx index 5fec60d3f947..9ddde13a2cde 100644 --- a/sw/source/uibase/shells/olesh.cxx +++ b/sw/source/uibase/shells/olesh.cxx @@ -24,7 +24,7 @@ #include <vcl/EnumContext.hxx> #include <wrtsh.hxx> #include <view.hxx> -#include <helpid.h> +#include <helpids.h> #include <globals.hrc> #include <frmsh.hxx> #include <olesh.hxx> diff --git a/sw/source/uibase/shells/slotadd.cxx b/sw/source/uibase/shells/slotadd.cxx index bd0e90e963d4..173bf0f41b6e 100644 --- a/sw/source/uibase/shells/slotadd.cxx +++ b/sw/source/uibase/shells/slotadd.cxx @@ -24,7 +24,7 @@ #include "cmdid.h" #include <svl/globalnameitem.hxx> -#include <editeng/memberids.hrc> +#include <editeng/memberids.h> #include <svl/imageitm.hxx> #include <svl/aeitem.hxx> #include <svl/rectitem.hxx> diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx index 4c7046985101..f4abe109509e 100644 --- a/sw/source/uibase/shells/tabsh.cxx +++ b/sw/source/uibase/shells/tabsh.cxx @@ -72,11 +72,10 @@ #include <tblsel.hxx> #include <app.hrc> -#include <dialog.hrc> #include <strings.hrc> #include <cmdid.h> #include <globals.hrc> -#include <helpid.h> +#include <helpids.h> #include <unobaseclass.hxx> #define SwTableShell @@ -84,7 +83,6 @@ #include <swslots.hxx> #include "swabstdlg.hxx" -#include <table.hrc> #include <memory> @@ -668,12 +666,9 @@ void SwTableShell::Execute(SfxRequest &rReq) sCurText, SID_ATTR_NUMBERFORMAT_INFO )); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); - - ScopedVclPtr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( GetView().GetWindow(),aCoreSet, - pView->GetViewFrame()->GetFrame().GetFrameInterface(), - RC_DLG_SWNUMFMTDLG )); - OSL_ENSURE(pDlg, "Dialog creation failed!"); + assert(pFact && "SwAbstractDialogFactory fail!"); + ScopedVclPtr<SfxAbstractDialog> pDlg(pFact->CreateNumFormatDialog(GetView().GetWindow(), aCoreSet)); + assert(pDlg && "Dialog creation failed!"); if (RET_OK == pDlg->Execute()) { @@ -828,10 +823,9 @@ void SwTableShell::Execute(SfxRequest &rReq) case FN_TABLE_SET_ROW_HEIGHT: { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); - - ScopedVclPtr<VclAbstractDialog> pDlg(pFact->CreateVclAbstractDialog( GetView().GetWindow(), rSh, DLG_ROW_HEIGHT )); - OSL_ENSURE(pDlg, "Dialog creation failed!"); + assert(pFact && "SwAbstractDialogFactory fail!"); + ScopedVclPtr<VclAbstractDialog> pDlg(pFact->CreateSwTableHeightDialog(GetView().GetWindow(), rSh)); + assert(pDlg && "Dialog creation failed!"); pDlg->Execute(); break; } diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx index 16408fe5e708..41fead859ada 100644 --- a/sw/source/uibase/shells/textfld.cxx +++ b/sw/source/uibase/shells/textfld.cxx @@ -63,8 +63,6 @@ #include <sfx2/app.hxx> #include <svx/dialogs.hrc> #include "swabstdlg.hxx" -#include "dialog.hrc" -#include <fldui.hrc> #include <doc.hxx> #include <app.hrc> #include <edtwin.hxx> diff --git a/sw/source/uibase/shells/textglos.cxx b/sw/source/uibase/shells/textglos.cxx index 855d6c803394..21ca0f6c5a97 100644 --- a/sw/source/uibase/shells/textglos.cxx +++ b/sw/source/uibase/shells/textglos.cxx @@ -29,7 +29,6 @@ #include "glosdoc.hxx" #include "gloslst.hxx" #include "swabstdlg.hxx" -#include <misc.hrc> void SwTextShell::ExecGlossary(SfxRequest &rReq) { diff --git a/sw/source/uibase/shells/textidx.cxx b/sw/source/uibase/shells/textidx.cxx index af51e9a8d84d..4450a049c148 100644 --- a/sw/source/uibase/shells/textidx.cxx +++ b/sw/source/uibase/shells/textidx.cxx @@ -37,7 +37,6 @@ #include "cnttab.hxx" #include "toxmgr.hxx" #include "swabstdlg.hxx" -#include <index.hrc> #include <globals.hrc> #include <memory> @@ -57,9 +56,9 @@ void SwTextShell::ExecIdx(SfxRequest &rReq) case FN_EDIT_AUTH_ENTRY_DLG : { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialog creation failed!"); - ScopedVclPtr<VclAbstractDialog> pDlg(pFact->CreateVclAbstractDialog( pMDI, GetShell(), DLG_EDIT_AUTHMARK)); - OSL_ENSURE(pDlg, "Dialog creation failed!"); + assert(pFact && "Dialog creation failed!"); + ScopedVclPtr<VclAbstractDialog> pDlg(pFact->CreateSwAutoMarkDialog(pMDI, GetShell())); + assert(pDlg && "Dialog creation failed!"); pDlg->Execute(); } break; diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx index cea962a2408e..2c2ba48106f2 100644 --- a/sw/source/uibase/shells/textsh.cxx +++ b/sw/source/uibase/shells/textsh.cxx @@ -105,9 +105,6 @@ using namespace ::com::sun::star; #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> #include "swabstdlg.hxx" -#include <misc.hrc> -#include <table.hrc> -#include <frmui.hrc> #include <unomid.h> #include <IDocumentDrawModelAccess.hxx> #include <drawdoc.hxx> @@ -527,9 +524,9 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) case FN_FORMAT_COLUMN : { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialog creation failed!"); - ScopedVclPtr<VclAbstractDialog> pColDlg(pFact->CreateVclAbstractDialog( GetView().GetWindow(), rSh, DLG_COLUMN)); - OSL_ENSURE(pColDlg, "Dialog creation failed!"); + assert(pFact && "Dialog creation failed!"); + ScopedVclPtr<VclAbstractDialog> pColDlg(pFact->CreateSwColumnDialog(GetView().GetWindow(), rSh)); + assert(pColDlg && "Dialog creation failed!"); pColDlg->Execute(); } break; diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx index 84f5aff3bb62..87701819a9b1 100644 --- a/sw/source/uibase/shells/textsh1.cxx +++ b/sw/source/uibase/shells/textsh1.cxx @@ -21,7 +21,7 @@ #include <hintids.hxx> #include <cmdid.h> -#include <helpid.h> +#include <helpids.h> #include <i18nutil/unicode.hxx> #include <i18nlangtag/languagetag.hxx> @@ -92,8 +92,6 @@ #include <SwSmartTagMgr.hxx> #include <editeng/acorrcfg.hxx> #include "swabstdlg.hxx" -#include "misc.hrc" -#include "chrdlg.hrc" #include <IDocumentStatistics.hxx> #include <sfx2/sfxdlg.hxx> #include <unotools/lingucfg.hxx> @@ -714,7 +712,7 @@ void SwTextShell::Execute(SfxRequest &rReq) case FN_SORTING_DLG: { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - ScopedVclPtr<VclAbstractDialog> pDlg(pFact->CreateVclAbstractDialog( GetView().GetWindow(), rWrtSh, DLG_SORTING )); + ScopedVclPtr<VclAbstractDialog> pDlg(pFact->CreateSwSortingDialog(GetView().GetWindow(), rWrtSh)); pDlg->Execute(); rReq.Done(); } diff --git a/sw/source/uibase/shells/txtattr.cxx b/sw/source/uibase/shells/txtattr.cxx index 9dd36e3a21e0..e183e2c99e6b 100644 --- a/sw/source/uibase/shells/txtattr.cxx +++ b/sw/source/uibase/shells/txtattr.cxx @@ -57,7 +57,6 @@ #include <SwStyleNameMapper.hxx> #include "swabstdlg.hxx" #include "outline.hxx" -#include "chrdlg.hrc" #include <memory> const sal_uInt32 nFontInc = 40; // 2pt @@ -483,11 +482,9 @@ void SwTextShell::ExecParaAttrArgs(SfxRequest &rReq) HINT_END, HINT_END>{}); rSh.GetCurAttr(aSet); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); - - ScopedVclPtr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( GetView().GetWindow(), aSet, - rSh.GetView().GetViewFrame()->GetFrame().GetFrameInterface(), DLG_SWDROPCAPS)); - OSL_ENSURE(pDlg, "Dialog creation failed!"); + assert(pFact && "SwAbstractDialogFactory fail!"); + ScopedVclPtr<SfxAbstractDialog> pDlg(pFact->CreateSwDropCapsDialog(GetView().GetWindow(), aSet)); + assert(pDlg && "Dialog creation failed!"); if (pDlg->Execute() == RET_OK) { rSh.StartAction(); diff --git a/sw/source/uibase/shells/txtnum.cxx b/sw/source/uibase/shells/txtnum.cxx index a435c410e7a4..718f538ba77c 100644 --- a/sw/source/uibase/shells/txtnum.cxx +++ b/sw/source/uibase/shells/txtnum.cxx @@ -183,10 +183,9 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) pDocSh->PutItem(SfxUInt16Item(SID_HTML_MODE, ::GetHtmlMode(pDocSh))); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialog creation failed!"); - ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateSwTabDialog( DLG_SVXTEST_NUM_BULLET, - GetView().GetWindow(), &aSet, GetShell())); - OSL_ENSURE(pDlg, "Dialog creation failed!"); + assert(pFact && "Dialog creation failed!"); + ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateSvxNumBulletTabDialog(GetView().GetWindow(), &aSet, GetShell())); + assert(pDlg && "Dialog creation failed!"); const SfxStringItem* pPageItem = rReq.GetArg<SfxStringItem>(FN_PARAM_1); if ( pPageItem ) pDlg->SetCurPageId( OUStringToOString( pPageItem->GetValue(), RTL_TEXTENCODING_UTF8 ) ); diff --git a/sw/source/uibase/table/swtablerep.cxx b/sw/source/uibase/table/swtablerep.cxx index 177be7c54dbc..60d5d539fea3 100644 --- a/sw/source/uibase/table/swtablerep.cxx +++ b/sw/source/uibase/table/swtablerep.cxx @@ -49,7 +49,6 @@ #include <SwStyleNameMapper.hxx> #include <cmdid.h> -#include <table.hrc> #include "swtablerep.hxx" #include <memory> diff --git a/sw/source/uibase/table/tablemgr.cxx b/sw/source/uibase/table/tablemgr.cxx index 0a91f7f91428..eacb935046e0 100644 --- a/sw/source/uibase/table/tablemgr.cxx +++ b/sw/source/uibase/table/tablemgr.cxx @@ -39,7 +39,6 @@ #include "frmfmt.hxx" #include "instable.hxx" #include "swerror.h" -#include "table.hrc" #include "swabstdlg.hxx" #include "swcli.hxx" #include "docsh.hxx" diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index 101ef4ab5606..e1e4d34220cc 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -64,7 +64,7 @@ #include <usrpref.hxx> #include <viewfunc.hxx> -#include <helpid.h> +#include <helpids.h> #include <cmdid.h> #include <globals.hrc> #include <strings.hrc> diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx index 531fa4a25640..15e4ceaadb23 100644 --- a/sw/source/uibase/uiview/srcview.cxx +++ b/sw/source/uibase/uiview/srcview.cxx @@ -71,7 +71,7 @@ #include <shellio.hxx> #include <cmdid.h> -#include <helpid.h> +#include <helpids.h> #include <globals.hrc> #include <strings.hrc> #include <strings.hrc> diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index 400a14d4d1ff..8ce210215b0a 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -31,11 +31,12 @@ #include <svl/eitem.hxx> #include <unotools/lingucfg.hxx> #include <unotools/useroptions.hxx> +#include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> -#include <sfx2/request.hxx> #include <sfx2/docfile.hxx> +#include <sfx2/objface.hxx> #include <sfx2/printer.hxx> -#include <sfx2/app.hxx> +#include <sfx2/request.hxx> #include <svx/ruler.hxx> #include <svx/srchdlg.hxx> #include <editeng/protitem.hxx> @@ -88,7 +89,6 @@ #include <swdtflvr.hxx> #include <strings.hrc> #include <strings.hrc> -#include <frmui.hrc> #include <cfgitems.hxx> #include <prtopt.hxx> #include <linguistic/lngprops.hxx> diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx index 4ee436e9e47f..97c362de95df 100644 --- a/sw/source/uibase/uiview/view0.cxx +++ b/sw/source/uibase/uiview/view0.cxx @@ -73,7 +73,6 @@ using namespace ::com::sun::star; #include <unomid.h> #include <memory> #include "swabstdlg.hxx" -#include "misc.hrc" SFX_IMPL_NAMED_VIEWFACTORY(SwView, "Default") { @@ -602,12 +601,10 @@ void SwView::ExecNumberingOutline(SfxItemPool & rPool) { SfxItemSet aTmp(rPool, svl::Items<FN_PARAM_1, FN_PARAM_1>{}); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialog creation failed!"); - ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateSwTabDialog( DLG_TAB_OUTLINE, - GetWindow(), &aTmp, GetWrtShell())); - OSL_ENSURE(pDlg, "Dialog creation failed!"); + assert(pFact && "Dialog creation failed!"); + ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateOutlineTabDialog(GetWindow(), &aTmp, GetWrtShell())); + assert(pDlg && "Dialog creation failed!"); pDlg->Execute(); - pDlg.disposeAndClear(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index b663f884c55a..b58c784e739d 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -116,7 +116,7 @@ #include <strings.hrc> #include <app.hrc> #include <fmtclds.hxx> -#include <helpid.h> +#include <helpids.h> #include <sfx2/templatedlg.hxx> #include <dbconfig.hxx> #include <dbmgr.hxx> diff --git a/sw/source/uibase/uiview/viewdlg2.cxx b/sw/source/uibase/uiview/viewdlg2.cxx index 77a528e20498..a219592a61c0 100644 --- a/sw/source/uibase/uiview/viewdlg2.cxx +++ b/sw/source/uibase/uiview/viewdlg2.cxx @@ -36,8 +36,6 @@ #include "initui.hxx" #include "swabstdlg.hxx" -#include "frmui.hrc" -#include "misc.hrc" #include "strings.hrc" diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx index a141815d6cc7..6825c037b3e6 100644 --- a/sw/source/uibase/uiview/viewmdi.cxx +++ b/sw/source/uibase/uiview/viewmdi.cxx @@ -47,7 +47,7 @@ #include <cmdid.h> #include <strings.hrc> #include <strings.hrc> -#include <helpid.h> +#include <helpids.h> #include <globals.hrc> #include <IDocumentSettingAccess.hxx> diff --git a/sw/source/uibase/uno/SwXFilterOptions.cxx b/sw/source/uibase/uno/SwXFilterOptions.cxx index 71f1b724a928..79bf9049917a 100644 --- a/sw/source/uibase/uno/SwXFilterOptions.cxx +++ b/sw/source/uibase/uno/SwXFilterOptions.cxx @@ -31,7 +31,6 @@ #include <unotxdoc.hxx> #include "swabstdlg.hxx" -#include "dialog.hrc" #include <memory> using namespace ::com::sun::star; diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 9d369a8eabe8..7420ad126eda 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -56,9 +56,8 @@ #include <unotools.hxx> #include <unotxvw.hxx> #include <cmdid.h> -#include <helpid.h> +#include <helpids.h> #include <strings.hrc> -#include <misc.hrc> #include <strings.hrc> #include <com/sun/star/text/XTextSectionsSupplier.hpp> #include <com/sun/star/text/XTextGraphicObjectsSupplier.hpp> diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index 0413ec2e0fb0..472bc963e756 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -52,7 +52,7 @@ #include <o3tl/make_unique.hxx> #include <cmdid.h> -#include <helpid.h> +#include <helpids.h> #include <strings.hrc> #include <strings.hrc> #include <globals.hrc> diff --git a/sw/source/uibase/utlui/initui.cxx b/sw/source/uibase/utlui/initui.cxx index 97be35568e0c..0c3cf1cfafca 100644 --- a/sw/source/uibase/utlui/initui.cxx +++ b/sw/source/uibase/utlui/initui.cxx @@ -27,7 +27,7 @@ #include <fldbas.hxx> #include <glosdoc.hxx> #include <gloslst.hxx> -#include <comcore.hrc> +#include <comcore.hxx> #include <strings.hrc> #include <utlui.hrc> #include <authfld.hxx> diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index 63ba6dd99860..e580cefb034f 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -48,7 +48,7 @@ #include <edtwin.hxx> #include <sfx2/app.hxx> #include <cmdid.h> -#include <helpid.h> +#include <helpids.h> #include "strings.hrc" #include "globals.hrc" diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx index 0d70c3498b4d..f1cc7b02c7f4 100644 --- a/sw/source/uibase/utlui/numfmtlb.cxx +++ b/sw/source/uibase/utlui/numfmtlb.cxx @@ -38,7 +38,6 @@ #include <numfmtlb.hxx> #include <strings.hrc> #include "swabstdlg.hxx" -#include "dialog.hrc" #include <unomid.h> #include <sfx2/viewfrm.hxx> #include <memory> @@ -394,12 +393,9 @@ IMPL_LINK( NumFormatListBox, SelectHdl, ListBox&, rBox, void ) aCoreSet.Put(SfxBoolItem(SID_ATTR_NUMBERFORMAT_ADD_AUTO, bUseAutomaticLanguage)); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); - - ScopedVclPtr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( this, aCoreSet, - GetView()->GetViewFrame()->GetFrame().GetFrameInterface(), - RC_DLG_SWNUMFMTDLG )); - OSL_ENSURE(pDlg, "Dialog creation failed!"); + assert(pFact && "SwAbstractDialogFactory fail!"); + ScopedVclPtr<SfxAbstractDialog> pDlg(pFact->CreateNumFormatDialog(this, aCoreSet)); + assert(pDlg && "Dialog creation failed!"); if (RET_OK == pDlg->Execute()) { diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx index 852211444930..6d2cd6f3f9b1 100644 --- a/sw/source/uibase/utlui/unotools.cxx +++ b/sw/source/uibase/utlui/unotools.cxx @@ -19,7 +19,6 @@ #include <swtypes.hxx> #include <globals.hrc> -#include <misc.hrc> #include <strings.hrc> #include <unotools.hxx> diff --git a/sw/source/uibase/web/wdocsh.cxx b/sw/source/uibase/web/wdocsh.cxx index c03fd4d6c22a..eadf20e735a5 100644 --- a/sw/source/uibase/web/wdocsh.cxx +++ b/sw/source/uibase/web/wdocsh.cxx @@ -25,7 +25,6 @@ #include <sfx2/objface.hxx> #include <sfx2/msg.hxx> -#include "cfgid.h" #include "cmdid.h" #include "swtypes.hxx" diff --git a/sw/source/uibase/web/wolesh.cxx b/sw/source/uibase/web/wolesh.cxx index 0382a898e6d6..d2df33079529 100644 --- a/sw/source/uibase/web/wolesh.cxx +++ b/sw/source/uibase/web/wolesh.cxx @@ -24,7 +24,7 @@ #include "wrtsh.hxx" #include "view.hxx" -#include "helpid.h" +#include "helpids.h" #include "globals.hrc" #include "strings.hrc" #include "strings.hrc" diff --git a/sw/source/uibase/web/wtabsh.cxx b/sw/source/uibase/web/wtabsh.cxx index 499fd907244a..132cd953e882 100644 --- a/sw/source/uibase/web/wtabsh.cxx +++ b/sw/source/uibase/web/wtabsh.cxx @@ -26,9 +26,8 @@ #include "cmdid.h" #include "globals.hrc" #include "uitool.hxx" -#include "helpid.h" +#include "helpids.h" #include "strings.hrc" -#include "table.hrc" #include "wrtsh.hxx" #include "wtabsh.hxx" diff --git a/sw/source/uibase/wrtsh/wrtsh.hrc b/sw/source/uibase/wrtsh/wrtsh.hrc deleted file mode 100644 index 05cdf6c20034..000000000000 --- a/sw/source/uibase/wrtsh/wrtsh.hrc +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_SW_SOURCE_UIBASE_WRTSH_WRTSH_HRC -#define INCLUDED_SW_SOURCE_UIBASE_WRTSH_WRTSH_HRC - -#include "rcid.hrc" - -#define WRTSH_ACT_END RC_WRTSH_BEGIN - -#if WRTSH_ACT_END > RC_WRTSH_END -#error Resource-Id Ueberlauf -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index 9be63a7ca364..d3575cbc1547 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -81,7 +81,6 @@ #include <swdtflvr.hxx> #include <doc.hxx> #include <IDocumentSettingAccess.hxx> -#include <wrtsh.hrc> #include <SwStyleNameMapper.hxx> #include <sfx2/request.hxx> #include <paratr.hxx> diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx b/sw/source/uibase/wrtsh/wrtsh2.cxx index 1ff5866f5dd2..f4ed6cc0afa0 100644 --- a/sw/source/uibase/wrtsh/wrtsh2.cxx +++ b/sw/source/uibase/wrtsh/wrtsh2.cxx @@ -54,9 +54,7 @@ #include <navipi.hxx> #include <txtinet.hxx> #include <cmdid.h> -#include <wrtsh.hrc> #include "swabstdlg.hxx" -#include "fldui.hrc" #include <SwRewriter.hxx> #include <com/sun/star/document/XDocumentProperties.hpp> diff --git a/sw/source/uibase/wrtsh/wrtsh3.cxx b/sw/source/uibase/wrtsh/wrtsh3.cxx index a169c246f710..db7de18d251b 100644 --- a/sw/source/uibase/wrtsh/wrtsh3.cxx +++ b/sw/source/uibase/wrtsh/wrtsh3.cxx @@ -33,7 +33,6 @@ #include "view.hxx" #include "IMark.hxx" #include "doc.hxx" -#include "wrtsh.hrc" #include <unomid.h> diff --git a/sw/source/uibase/wrtsh/wrtundo.cxx b/sw/source/uibase/wrtsh/wrtundo.cxx index dec13a188e5c..27c7f0e34ed6 100644 --- a/sw/source/uibase/wrtsh/wrtundo.cxx +++ b/sw/source/uibase/wrtsh/wrtundo.cxx @@ -25,8 +25,6 @@ #include <swdtflvr.hxx> #include <svtools/svtresid.hxx> #include <svtools/strings.hrc> -#include <wrtsh.hrc> -#include <sfx2/sfx.hrc> // Undo ends all modes. If a selection is emerged by the Undo, // this must be considered for further action. |