diff options
Diffstat (limited to 'sw/source/uibase')
80 files changed, 118 insertions, 374 deletions
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. |