summaryrefslogtreecommitdiff
path: root/cui/source
diff options
context:
space:
mode:
Diffstat (limited to 'cui/source')
-rw-r--r--cui/source/customize/SvxMenuConfigPage.cxx3
-rw-r--r--cui/source/customize/acccfg.cxx1
-rw-r--r--cui/source/customize/cfg.cxx3
-rw-r--r--cui/source/customize/cfgutil.cxx3
-rw-r--r--cui/source/customize/eventdlg.cxx3
-rw-r--r--cui/source/customize/macropg.cxx3
-rw-r--r--cui/source/dialogs/SpellDialog.cxx1
-rw-r--r--cui/source/dialogs/cuicharmap.cxx2
-rw-r--r--cui/source/dialogs/cuifmsearch.cxx1
-rw-r--r--cui/source/dialogs/cuigaldlg.cxx2
-rw-r--r--cui/source/dialogs/cuigrfflt.cxx1
-rw-r--r--cui/source/dialogs/cuihyperdlg.cxx28
-rw-r--r--cui/source/dialogs/cuiimapwnd.cxx1
-rw-r--r--cui/source/dialogs/cuitbxform.cxx1
-rw-r--r--cui/source/dialogs/dlgname.cxx3
-rw-r--r--cui/source/dialogs/hangulhanjadlg.cxx3
-rw-r--r--cui/source/dialogs/hlmarkwn.cxx1
-rw-r--r--cui/source/dialogs/hltpbase.cxx2
-rw-r--r--cui/source/dialogs/hyphen.cxx1
-rw-r--r--cui/source/dialogs/iconcdlg.cxx3
-rw-r--r--cui/source/dialogs/insdlg.cxx1
-rw-r--r--cui/source/dialogs/insrc.cxx1
-rw-r--r--cui/source/dialogs/linkdlg.cxx2
-rw-r--r--cui/source/dialogs/multipat.cxx1
-rw-r--r--cui/source/dialogs/newtabledlg.cxx1
-rw-r--r--cui/source/dialogs/passwdomdlg.cxx1
-rw-r--r--cui/source/dialogs/postdlg.cxx3
-rw-r--r--cui/source/dialogs/screenshotannotationdlg.cxx1
-rw-r--r--cui/source/dialogs/scriptdlg.cxx1
-rw-r--r--cui/source/dialogs/sdrcelldlg.cxx1
-rw-r--r--cui/source/dialogs/splitcelldlg.cxx1
-rw-r--r--cui/source/dialogs/srchxtra.cxx1
-rw-r--r--cui/source/dialogs/thesdlg.cxx1
-rw-r--r--cui/source/dialogs/zoom.cxx3
-rw-r--r--cui/source/factory/dlgfact.cxx6
-rw-r--r--cui/source/inc/cuihyperdlg.hxx9
-rw-r--r--cui/source/inc/cuires.hrc70
-rw-r--r--cui/source/inc/helpids.h (renamed from cui/source/inc/helpid.hrc)0
-rw-r--r--cui/source/inc/hltpbase.hxx3
-rw-r--r--cui/source/inc/numpages.hxx2
-rw-r--r--cui/source/options/certpath.cxx1
-rw-r--r--cui/source/options/cfgchart.cxx1
-rw-r--r--cui/source/options/connpooloptions.cxx3
-rw-r--r--cui/source/options/cuisrchdlg.cxx2
-rw-r--r--cui/source/options/dbregister.cxx3
-rw-r--r--cui/source/options/doclinkdialog.cxx1
-rw-r--r--cui/source/options/fontsubs.cxx3
-rw-r--r--cui/source/options/optaccessibility.cxx1
-rw-r--r--cui/source/options/optasian.cxx1
-rw-r--r--cui/source/options/optbasic.cxx1
-rw-r--r--cui/source/options/optchart.cxx1
-rw-r--r--cui/source/options/optcolor.cxx3
-rw-r--r--cui/source/options/optctl.cxx1
-rw-r--r--cui/source/options/optdict.cxx1
-rw-r--r--cui/source/options/optfltr.cxx3
-rw-r--r--cui/source/options/optgdlg.cxx1
-rw-r--r--cui/source/options/optgenrl.cxx1
-rw-r--r--cui/source/options/opthtml.cxx3
-rw-r--r--cui/source/options/optinet2.cxx3
-rw-r--r--cui/source/options/optjava.cxx3
-rw-r--r--cui/source/options/optjsearch.cxx1
-rw-r--r--cui/source/options/optlingu.cxx3
-rw-r--r--cui/source/options/optmemory.cxx3
-rw-r--r--cui/source/options/optopencl.cxx1
-rw-r--r--cui/source/options/optpath.cxx3
-rw-r--r--cui/source/options/optsave.cxx5
-rw-r--r--cui/source/options/optsave.hrc35
-rw-r--r--cui/source/options/optsave.hxx9
-rw-r--r--cui/source/options/optupdt.cxx1
-rw-r--r--cui/source/options/personalization.cxx1
-rw-r--r--cui/source/options/securityoptions.cxx1
-rw-r--r--cui/source/options/treeopt.cxx3
-rw-r--r--cui/source/options/tsaurls.cxx1
-rw-r--r--cui/source/options/webconninfo.cxx1
-rw-r--r--cui/source/tabpages/align.cxx1
-rw-r--r--cui/source/tabpages/autocdlg.cxx3
-rw-r--r--cui/source/tabpages/backgrnd.cxx3
-rw-r--r--cui/source/tabpages/border.cxx3
-rw-r--r--cui/source/tabpages/chardlg.cxx1
-rw-r--r--cui/source/tabpages/connect.cxx1
-rw-r--r--cui/source/tabpages/dstribut.cxx1
-rw-r--r--cui/source/tabpages/grfpage.cxx1
-rw-r--r--cui/source/tabpages/labdlg.cxx1
-rw-r--r--cui/source/tabpages/macroass.cxx1
-rw-r--r--cui/source/tabpages/measure.cxx1
-rw-r--r--cui/source/tabpages/numfmt.cxx1
-rw-r--r--cui/source/tabpages/numpages.cxx4
-rw-r--r--cui/source/tabpages/numpages.hrc22
-rw-r--r--cui/source/tabpages/page.cxx3
-rw-r--r--cui/source/tabpages/paragrph.cxx1
-rw-r--r--cui/source/tabpages/swpossizetabpage.cxx1
-rw-r--r--cui/source/tabpages/tabarea.cxx1
-rw-r--r--cui/source/tabpages/tabline.cxx3
-rw-r--r--cui/source/tabpages/tabstpge.cxx1
-rw-r--r--cui/source/tabpages/textanim.cxx1
-rw-r--r--cui/source/tabpages/textattr.cxx1
-rw-r--r--cui/source/tabpages/tparea.cxx1
-rw-r--r--cui/source/tabpages/tpbitmap.cxx1
-rw-r--r--cui/source/tabpages/tpcolor.cxx3
-rw-r--r--cui/source/tabpages/tpgradnt.cxx3
-rw-r--r--cui/source/tabpages/tphatch.cxx3
-rw-r--r--cui/source/tabpages/tpline.cxx1
-rw-r--r--cui/source/tabpages/tplnedef.cxx3
-rw-r--r--cui/source/tabpages/tplneend.cxx3
-rw-r--r--cui/source/tabpages/tppattern.cxx3
-rw-r--r--cui/source/tabpages/tpshadow.cxx1
-rw-r--r--cui/source/tabpages/tptrans.cxx1
-rw-r--r--cui/source/tabpages/transfrm.cxx1
108 files changed, 74 insertions, 286 deletions
diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx
index b51b319b5ae7..26a16baee01c 100644
--- a/cui/source/customize/SvxMenuConfigPage.cxx
+++ b/cui/source/customize/SvxMenuConfigPage.cxx
@@ -53,9 +53,8 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <algorithm>
-#include <cuires.hrc>
#include <strings.hrc>
-#include "helpid.hrc"
+#include "helpids.h"
#include "acccfg.hxx"
#include "cfg.hxx"
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index bf83de09a634..b434ef282748 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -35,7 +35,6 @@
#include <sal/macros.h>
#include <vcl/builderfactory.hxx>
-#include "cuires.hrc"
#include "strings.hrc"
#include <sfx2/strings.hrc>
#include <svx/svxids.hrc>
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 41c9cf7b6687..b26e077347bf 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -53,8 +53,7 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <algorithm>
-#include <cuires.hrc>
-#include "helpid.hrc"
+#include "helpids.h"
#include "strings.hrc"
#include "acccfg.hxx"
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 1c630c16bee1..cd86a24b8cbd 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -36,7 +36,7 @@
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/ui/theUICategoryDescription.hpp>
-#include "helpid.hrc"
+#include "helpids.h"
#include <basic/sbx.hxx>
#include <basic/basicmanagerrepository.hxx>
#include <basic/sbstar.hxx>
@@ -44,7 +44,6 @@
#include <basic/sbmod.hxx>
#include <basic/basmgr.hxx>
#include <tools/urlobj.hxx>
-#include "cuires.hrc"
#include "strings.hrc"
#include "bitmaps.hlst"
#include <sfx2/app.hxx>
diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index 78bbdf3d95f3..a3ff1697629b 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -45,8 +45,7 @@
#include "macropg_impl.hxx"
#include <dialmgr.hxx>
-#include <cuires.hrc>
-#include "helpid.hrc"
+#include "helpids.h"
#include "cfgutil.hxx"
#include "cfg.hxx"
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 2b26eca0a0f1..a834f265978a 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -34,8 +34,7 @@
#include <dialmgr.hxx>
#include "cfgutil.hxx"
#include "cfg.hxx"
-#include "helpid.hrc"
-#include <cuires.hrc>
+#include "helpids.h"
#include "headertablistbox.hxx"
#include "macropg_impl.hxx"
#include <svx/dialogs.hrc>
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index d36cd93a4fed..3803c68731bd 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -44,7 +44,6 @@
#include <vcl/graph.hxx>
#include <vcl/builderfactory.hxx>
#include <osl/file.hxx>
-#include <cuires.hrc>
#include <editeng/optitems.hxx>
#include <editeng/svxenum.hxx>
#include <svx/SpellDialogChildWindow.hxx>
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 2a0e9053c819..500f0143e3ef 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -38,12 +38,12 @@
#include <comphelper/propertysequence.hxx>
#include <comphelper/dispatchcommand.hxx>
-#include <cuires.hrc>
#include <dialmgr.hxx>
#include "cuicharmap.hxx"
#include <sfx2/request.hxx>
#include <sfx2/sfxsids.hrc>
#include <sfx2/app.hxx>
+#include <editeng/editids.hrc>
#include <editeng/fontitem.hxx>
#include "strings.hrc"
#include "macroass.hxx"
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index b45300ef7bee..f8e6e46026e1 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -23,7 +23,6 @@
#include <dialmgr.hxx>
#include <sfx2/tabdlg.hxx>
#include <sfx2/app.hxx>
-#include <cuires.hrc>
#include <svx/fmsrccfg.hxx>
#include <svx/fmsrcimp.hxx>
#include "strings.hrc"
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index ebda6d05cdd8..fcd2937d10b4 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -33,7 +33,7 @@
#include <svx/gallery1.hxx>
#include <svx/galtheme.hxx>
#include "cuigaldlg.hxx"
-#include "helpid.hrc"
+#include "helpids.h"
#include "bitmaps.hlst"
#include <unotools/syslocale.hxx>
#include <com/sun/star/uno/Reference.hxx>
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 7f499c01a776..e7e86b987d47 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -25,7 +25,6 @@
#include <sfx2/request.hxx>
#include <dialmgr.hxx>
#include "cuigrfflt.hxx"
-#include <cuires.hrc>
#include <svx/dialogs.hrc>
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index 374c4b99643d..e1da23aef776 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -102,16 +102,16 @@ SvxHpLinkDlg::SvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings)
aImage = Image(aBitmap);
}
aStrTitle = CuiResId( RID_SVXSTR_HYPERDLG_HLINETTP );
- pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_INTERNET, aStrTitle, imgVector[0], SvxHyperlinkInternetTp::Create );
+ pEntry = AddTabPage ( HyperLinkPageType::INTERNET, aStrTitle, imgVector[0], SvxHyperlinkInternetTp::Create );
pEntry->SetQuickHelpText( CuiResId( RID_SVXSTR_HYPERDLG_HLINETTP_HELP ) );
aStrTitle = CuiResId( RID_SVXSTR_HYPERDLG_HLMAILTP );
- pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_MAIL, aStrTitle, imgVector[1], SvxHyperlinkMailTp::Create );
+ pEntry = AddTabPage ( HyperLinkPageType::MAIL, aStrTitle, imgVector[1], SvxHyperlinkMailTp::Create );
pEntry->SetQuickHelpText( CuiResId( RID_SVXSTR_HYPERDLG_HLMAILTP_HELP ) );
aStrTitle = CuiResId( RID_SVXSTR_HYPERDLG_HLDOCTP );
- pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_DOCUMENT, aStrTitle, imgVector[2], SvxHyperlinkDocTp::Create );
+ pEntry = AddTabPage ( HyperLinkPageType::DOCUMENT, aStrTitle, imgVector[2], SvxHyperlinkDocTp::Create );
pEntry->SetQuickHelpText( CuiResId( RID_SVXSTR_HYPERDLG_HLDOCTP_HELP ) );
aStrTitle = CuiResId( RID_SVXSTR_HYPERDLG_HLDOCNTP );
- pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT, aStrTitle, imgVector[3], SvxHyperlinkNewDocTp::Create );
+ pEntry = AddTabPage ( HyperLinkPageType::NEWDOCUMENT, aStrTitle, imgVector[3], SvxHyperlinkNewDocTp::Create );
pEntry->SetQuickHelpText( CuiResId( RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP ) );
// set OK/Cancel - button
@@ -127,25 +127,25 @@ SvxHpLinkDlg::SvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings)
SetInputSet (mpItemSet.get());
//loop through the pages and get their max bounds and lock that down
- ShowPage(RID_SVXPAGE_HYPERLINK_NEWDOCUMENT);
+ ShowPage(HyperLinkPageType::NEWDOCUMENT);
VclBox *pBox = get_content_area();
Size aMaxPrefSize(pBox->get_preferred_size());
- ShowPage(RID_SVXPAGE_HYPERLINK_DOCUMENT);
+ ShowPage(HyperLinkPageType::DOCUMENT);
Size aSize(pBox->get_preferred_size());
aMaxPrefSize.Width() = std::max(aMaxPrefSize.Width(), aSize.Width());
aMaxPrefSize.Height() = std::max(aMaxPrefSize.Height(), aSize.Height());
- ShowPage(RID_SVXPAGE_HYPERLINK_MAIL);
+ ShowPage(HyperLinkPageType::MAIL);
aSize = pBox->get_preferred_size();
aMaxPrefSize.Width() = std::max(aMaxPrefSize.Width(), aSize.Width());
aMaxPrefSize.Height() = std::max(aMaxPrefSize.Height(), aSize.Height());
- ShowPage(RID_SVXPAGE_HYPERLINK_INTERNET);
+ ShowPage(HyperLinkPageType::INTERNET);
aSize = pBox->get_preferred_size();
aMaxPrefSize.Width() = std::max(aMaxPrefSize.Width(), aSize.Width());
aMaxPrefSize.Height() = std::max(aMaxPrefSize.Height(), aSize.Height());
pBox->set_width_request(aMaxPrefSize.Width());
pBox->set_height_request(aMaxPrefSize.Height());
- SetCurPageId(RID_SVXPAGE_HYPERLINK_INTERNET);
+ SetCurPageId(HyperLinkPageType::INTERNET);
// Init Dialog
Start();
@@ -301,7 +301,7 @@ IMPL_LINK_NOARG(SvxHpLinkDlg, ClickCloseHdl_Impl, Button*, void)
void SvxHpLinkDlg::SetPage ( SvxHyperlinkItem* pItem )
{
- sal_uInt16 nPageId = RID_SVXPAGE_HYPERLINK_INTERNET;
+ sal_uInt16 nPageId = HyperLinkPageType::INTERNET;
OUString aStrURL(pItem->GetURL());
INetURLObject aURL(aStrURL);
@@ -311,17 +311,17 @@ void SvxHpLinkDlg::SetPage ( SvxHyperlinkItem* pItem )
{
case INetProtocol::Http :
case INetProtocol::Ftp :
- nPageId = RID_SVXPAGE_HYPERLINK_INTERNET;
+ nPageId = HyperLinkPageType::INTERNET;
break;
case INetProtocol::File :
- nPageId = RID_SVXPAGE_HYPERLINK_DOCUMENT;
+ nPageId = HyperLinkPageType::DOCUMENT;
break;
case INetProtocol::Mailto :
- nPageId = RID_SVXPAGE_HYPERLINK_MAIL;
+ nPageId = HyperLinkPageType::MAIL;
break;
default :
if (aStrURL.startsWith("#"))
- nPageId = RID_SVXPAGE_HYPERLINK_DOCUMENT;
+ nPageId = HyperLinkPageType::DOCUMENT;
else
{
// not valid
diff --git a/cui/source/dialogs/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx
index 99c71350124b..bb358632e5f1 100644
--- a/cui/source/dialogs/cuiimapwnd.cxx
+++ b/cui/source/dialogs/cuiimapwnd.cxx
@@ -28,7 +28,6 @@
#include <svl/urlbmk.hxx>
#include <svx/xoutbmp.hxx>
#include <dialmgr.hxx>
-#include <cuires.hrc>
#include <cuiimapwnd.hxx>
#include <svx/svdpage.hxx>
#include <svx/svdorect.hxx>
diff --git a/cui/source/dialogs/cuitbxform.cxx b/cui/source/dialogs/cuitbxform.cxx
index b54de7fe8e31..868e0e984ec4 100644
--- a/cui/source/dialogs/cuitbxform.cxx
+++ b/cui/source/dialogs/cuitbxform.cxx
@@ -25,7 +25,6 @@
#include <vcl/toolbox.hxx>
#include <vcl/fixed.hxx>
#include <dialmgr.hxx>
-#include <cuires.hrc>
#include "cuitbxform.hxx"
#include <sfx2/viewfrm.hxx>
#include <sfx2/viewsh.hxx>
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index cedbf7e14f6c..bfbe9fac7c40 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -18,9 +18,6 @@
*/
#include <vcl/msgbox.hxx>
-
-#include <cuires.hrc>
-
#include "dlgname.hxx"
#include "defdlgname.hxx"
#include <dialmgr.hxx>
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index d5a16bd468aa..c83fd7332e0a 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -20,8 +20,7 @@
#include "hangulhanjadlg.hxx"
#include <dialmgr.hxx>
-#include <cuires.hrc>
-#include "helpid.hrc"
+#include "helpids.h"
#include "strings.hrc"
#include <algorithm>
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 34c2d9a5fb73..7b97044d26f4 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -39,7 +39,6 @@
#include <toolkit/helper/vclunohelper.hxx>
#include "svtools/treelistentry.hxx"
-#include <cuires.hrc>
#include <strings.hrc>
#include "hlmarkwn.hxx"
#include "hltpbase.hxx"
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 07277d1fed98..520d0e017d2c 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -21,6 +21,7 @@
#include <sal/config.h>
#include <osl/file.hxx>
+#include <sfx2/event.hxx>
#include <sfx2/frame.hxx>
#include <sfx2/viewfrm.hxx>
#include <sot/formats.hxx>
@@ -31,7 +32,6 @@
#include "hltpbase.hxx"
#include "macroass.hxx"
#include <svx/svxdlg.hxx>
-#include <cuires.hrc>
#include <strings.hrc>
#include <bitmaps.hlst>
#include <vcl/builderfactory.hxx>
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index 63a0ad81bd95..c7f02a1f51d7 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -18,7 +18,6 @@
*/
#include "hyphen.hxx"
-#include "cuires.hrc"
#include "dialmgr.hxx"
#include <editeng/splwrap.hxx>
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 2b0214810e75..63a93180149d 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -23,8 +23,7 @@
#include "iconcdlg.hxx"
-#include "helpid.hrc"
-#include <cuires.hrc>
+#include "helpids.h"
#include <unotools/viewoptions.hxx>
#include <svtools/apearcfg.hxx>
#include <vcl/mnemonic.hxx>
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index bc68c29d278f..be4eef5cfa18 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -54,7 +54,6 @@
#include <svl/ownlist.hxx>
#include <comphelper/seqstream.hxx>
-#include "cuires.hrc"
#include "strings.hrc"
#include <osl/file.hxx>
diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx
index d0a36050babb..527070967e35 100644
--- a/cui/source/dialogs/insrc.cxx
+++ b/cui/source/dialogs/insrc.cxx
@@ -19,7 +19,6 @@
#include <dialmgr.hxx>
#include <svx/svxdlg.hxx>
-#include <cuires.hrc>
#include <strings.hrc>
#include "insrc.hxx"
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 961ff4f7ad18..e65aee2ed72c 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -19,7 +19,7 @@
#include <linkdlg.hxx>
#include <vcl/svapp.hxx>
-#include "helpid.hrc"
+#include "helpids.h"
#include <tools/urlobj.hxx>
#include <svtools/svmedit.hxx>
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index 7edc03f8b2db..7bc05a3cdc43 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -27,7 +27,6 @@
#include "multipat.hxx"
#include <dialmgr.hxx>
-#include <cuires.hrc>
#include <strings.hrc>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/cui/source/dialogs/newtabledlg.cxx b/cui/source/dialogs/newtabledlg.cxx
index 50e752789f95..d018d6161b2c 100644
--- a/cui/source/dialogs/newtabledlg.cxx
+++ b/cui/source/dialogs/newtabledlg.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "cuires.hrc"
#include "dialmgr.hxx"
#include "newtabledlg.hxx"
diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx
index 408613465d23..f002b32ef474 100644
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -19,7 +19,6 @@
#include "passwdomdlg.hxx"
-#include "cuires.hrc"
#include "strings.hrc"
#include "dialmgr.hxx"
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index 057198527390..871b6475eff7 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -29,12 +29,11 @@
#include <comphelper/processfactory.hxx>
#include <svx/svxids.hrc>
-#include <cuires.hrc>
#include <svx/postattr.hxx>
#include "postdlg.hxx"
#include <dialmgr.hxx>
-#include "helpid.hrc"
+#include "helpids.h"
// class SvxPostItDialog -------------------------------------------------
diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx
index 6060252b4152..4966b1fc2b1d 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -19,7 +19,6 @@
#include "screenshotannotationdlg.hxx"
-#include "cuires.hrc"
#include "strings.hrc"
#include "dialmgr.hxx"
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 6dcba4d31f36..999ffacfedee 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -26,7 +26,6 @@
#include <vcl/builderfactory.hxx>
#include <o3tl/make_unique.hxx>
-#include <cuires.hrc>
#include <strings.hrc>
#include <bitmaps.hlst>
#include "scriptdlg.hxx"
diff --git a/cui/source/dialogs/sdrcelldlg.cxx b/cui/source/dialogs/sdrcelldlg.cxx
index d6e9244cb738..e64f01f31a8d 100644
--- a/cui/source/dialogs/sdrcelldlg.cxx
+++ b/cui/source/dialogs/sdrcelldlg.cxx
@@ -19,7 +19,6 @@
#include <svl/cjkoptions.hxx>
#include <svx/flagsdef.hxx>
-#include "cuires.hrc"
#include "sdrcelldlg.hxx"
#include "dialmgr.hxx"
#include "cuitabarea.hxx"
diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx
index f786644b9ba6..8a4a4bc8d4ff 100644
--- a/cui/source/dialogs/splitcelldlg.cxx
+++ b/cui/source/dialogs/splitcelldlg.cxx
@@ -22,7 +22,6 @@
#include <svl/eitem.hxx>
#include "dialmgr.hxx"
#include "splitcelldlg.hxx"
-#include "cuires.hrc"
namespace {
class NoApplyDialog : public SvxStandardDialog
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index 5ccaa5dd1101..7af454f67fb3 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -22,7 +22,6 @@
#include <svl/cjkoptions.hxx>
#include <svl/whiter.hxx>
#include <sfx2/objsh.hxx>
-#include <cuires.hrc>
#include <svx/svxitems.hrc>
#include <svx/dialmgr.hxx>
#include <svx/strarray.hxx>
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 0bf69e5329ce..5299fbde0d44 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -19,7 +19,6 @@
#include "thesdlg.hxx"
#include "thesdlg_impl.hxx"
-#include "cuires.hrc"
#include "strings.hrc"
#include "dialmgr.hxx"
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index a93d18ff01f8..056b757b357e 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -22,9 +22,6 @@
#include <sfx2/objsh.hxx>
#include <vcl/layout.hxx>
#include <vcl/msgbox.hxx>
-
-#include <cuires.hrc>
-
#include "zoom.hxx"
#include <sfx2/zoomitem.hxx>
#include <svx/viewlayoutitem.hxx>
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index ed48d45f94ed..05c834392c11 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -20,10 +20,10 @@
#include "align.hxx"
#include "dlgfact.hxx"
-#include <sfx2/basedlgs.hxx>
#include <sfx2/app.hxx>
+#include <sfx2/basedlgs.hxx>
+#include <sfx2/pageids.hxx>
#include <sfx2/request.hxx>
-#include <cuires.hrc>
#include <svx/dialogs.hrc>
#include "numfmt.hxx"
#include "splitcelldlg.hxx"
@@ -808,7 +808,7 @@ VclPtr<VclAbstractDialog> AbstractDialogFactory_Impl::CreateVclDialog( vcl::Wind
VclPtr<Dialog> pDlg;
switch ( nResId )
{
- case RID_DEFAULTABOUT:
+ case SID_ABOUT:
{
pDlg = VclPtr<AboutDialog>::Create(pParent);
break;
diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx
index 03461d7d5f86..9d7b6954b284 100644
--- a/cui/source/inc/cuihyperdlg.hxx
+++ b/cui/source/inc/cuihyperdlg.hxx
@@ -32,6 +32,15 @@
#include "iconcdlg.hxx"
+// hyperlink dialog
+enum HyperLinkPageType
+{
+ INTERNET,
+ MAIL,
+ DOCUMENT,
+ NEWDOCUMENT
+};
+
/*************************************************************************
|*
|* Hyperlink-Dialog
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
deleted file mode 100644
index beec430dcd7a..000000000000
--- a/cui/source/inc/cuires.hrc
+++ /dev/null
@@ -1,70 +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_CUI_SOURCE_INC_CUIRES_HRC
-#define INCLUDED_CUI_SOURCE_INC_CUIRES_HRC
-
-#include <sfx2/sfx.hrc>
-#include <sfx2/dialogs.hrc>
-
-// Resource-Id's ------------------------------------------------------------
-
-// Gallery
-#define RID_CUI_GALLERY_START (RID_SVX_START + 360)
-// RID_CUI_GALLERY_END (RID_SVX_START + 410)
-
-// options
-#define RID_SVXPAGE_JSEARCH_OPTIONS (RID_SVX_START + 840)
-#define RID_SVX_FONT_SUBSTITUTION (RID_SVX_START + 18)
-
-// treeopt
-#define RID_SVXPAGE_COLOR (RID_SVX_START + 60)
-#define OFA_TP_LANGUAGES_FOR_SET_DOCUMENT_LANGUAGE ( RID_OFA_START + 256 )
-
-// options
-#define RID_SVXPAGE_ONLINEUPDATE (RID_SVX_START + 298)
-#define OFA_TP_MEMORY (RID_OFA_START + 250)
-#define RID_SVXPAGE_INET_SECURITY (RID_SVX_START + 200)
-#define RID_SVXPAGE_INET_PROXY (RID_SVX_START + 157)
-#define RID_SVXPAGE_INET_MAIL (RID_SVX_START + 155)
-#define RID_OFAPAGE_HTMLOPT (RID_OFA_START + 100)
-#define OFA_TP_LANGUAGES (RID_OFA_START + 205)
-#define OFA_TP_MISC (RID_OFA_START + 200)
-#define OFA_TP_VIEW (RID_OFA_START + 202)
-#define RID_OFAPAGE_MSFILTEROPT2 (RID_OFA_START + 121)
-#define RID_SVXPAGE_OPTIONS_CTL (RID_SVX_START + 252)
-#define RID_SVXPAGE_OPTIONS_JAVA (RID_SVX_START + 253)
-#define RID_SVXPAGE_ACCESSIBILITYCONFIG (RID_SVX_START + 250)
-#define RID_SVXPAGE_ASIAN_LAYOUT (RID_SVX_START + 246)
-#define RID_OPTPAGE_CHART_DEFCOLORS (RID_SVX_START + 299)
-#define RID_SVXPAGE_PERSONALIZATION (RID_SVX_START + 247)
-#define RID_SVXPAGE_COLORCONFIG (RID_SVX_START + 249)
-#define RID_SVXPAGE_BASICIDE_OPTIONS (RID_SVX_START + 209)
-
-// hyperlink dialog
-#define RID_SVXPAGE_HYPERLINK_INTERNET (RID_SVX_START + 228)
-#define RID_SVXPAGE_HYPERLINK_MAIL (RID_SVX_START + 229)
-#define RID_SVXPAGE_HYPERLINK_DOCUMENT (RID_SVX_START + 230)
-#define RID_SVXPAGE_HYPERLINK_NEWDOCUMENT (RID_SVX_START + 231)
-
-#define RID_SVXPAGE_OPENCL (RID_SVX_START + 254)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpids.h
index 6ac5734602ba..6ac5734602ba 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpids.h
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index 310942d6ddb4..ef2661a7187c 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -38,9 +38,8 @@
#include <dialmgr.hxx>
#include <sfx2/docfile.hxx>
-#include <cuires.hrc>
#include <com/sun/star/frame/XFrame.hpp>
-#include "helpid.hrc"
+#include "helpids.h"
#include <svx/hlnkitem.hxx>
#include "hlmarkwn.hxx"
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 09e5b109ffc3..025300b9964b 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -35,6 +35,8 @@
#include <svtools/ctrlbox.hxx>
#include <vcl/dialog.hxx>
+#define MN_GALLERY_ENTRY 100
+
class SvxColorListBox;
class SvxNumRule;
class SvxBmpNumValueSet;
diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index 9ea41a5161c7..202866e284f9 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -13,7 +13,6 @@
#include <osl/thread.h>
#include "svtools/treelistentry.hxx"
#include <unotools/securityoptions.hxx>
-#include <cuires.hrc>
#include "certpath.hxx"
#include "dialmgr.hxx"
diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx
index 4e8666cdac1a..d1ff39a6fb19 100644
--- a/cui/source/options/cfgchart.cxx
+++ b/cui/source/options/cfgchart.cxx
@@ -21,7 +21,6 @@
#include <tools/stream.hxx>
#include "cfgchart.hxx"
#include <dialmgr.hxx>
-#include <cuires.hrc>
#include <strings.hrc>
#define ROW_COLOR_COUNT 12
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index ae3a2538d386..e076e3ca2311 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -23,8 +23,7 @@
#include <vcl/builderfactory.hxx>
#include "connpoolsettings.hxx"
#include <svl/eitem.hxx>
-#include <cuires.hrc>
-#include "helpid.hrc"
+#include "helpids.h"
#include <strings.hrc>
#include <dialmgr.hxx>
diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx
index 0b3bf50120df..8ee9ac426723 100644
--- a/cui/source/options/cuisrchdlg.cxx
+++ b/cui/source/options/cuisrchdlg.cxx
@@ -33,8 +33,6 @@
#include "cuisrchdlg.hxx"
-#include <cuires.hrc>
-
#include <svl/srchitem.hxx>
#include <svx/pageitem.hxx>
#include <dialmgr.hxx>
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index df307e814396..a2590311aae3 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -21,10 +21,9 @@
#include "dbregistersettings.hxx"
#include "connpooloptions.hxx"
#include <svl/filenotation.hxx>
-#include "helpid.hrc"
+#include "helpids.h"
#include <svtools/editbrowsebox.hxx>
#include "svtools/treelistentry.hxx"
-#include <cuires.hrc>
#include <strings.hrc>
#include <bitmaps.hlst>
#include <vcl/field.hxx>
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index 6bb15f5b3aae..c7ab9a2983e9 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -21,7 +21,6 @@
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <comphelper/processfactory.hxx>
-#include <cuires.hrc>
#include <strings.hrc>
#include <svl/filenotation.hxx>
#include <vcl/layout.hxx>
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 103d03fc3ef4..d667c943dd8e 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -27,8 +27,7 @@
#include <svtools/fontsubstconfig.hxx>
#include "fontsubs.hxx"
#include <dialmgr.hxx>
-#include "helpid.hrc"
-#include <cuires.hrc>
+#include "helpids.h"
#include <o3tl/make_unique.hxx>
/*********************************************************************/
diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx
index fe0e37aae829..517fb17a683f 100644
--- a/cui/source/options/optaccessibility.cxx
+++ b/cui/source/options/optaccessibility.cxx
@@ -19,7 +19,6 @@
#include <optaccessibility.hxx>
#include <dialmgr.hxx>
-#include <cuires.hrc>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
#include <officecfg/Office/Common.hxx>
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index f814ad27e3b7..2c011898d484 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -24,7 +24,6 @@
#include <editeng/unolingu.hxx>
#include <o3tl/any.hxx>
#include <dialmgr.hxx>
-#include <cuires.hrc>
#include <i18nlangtag/mslangid.hxx>
#include <svl/asiancfg.hxx>
#include <com/sun/star/lang/Locale.hpp>
diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx
index 632ccb923404..9795c1d9dd4f 100644
--- a/cui/source/options/optbasic.cxx
+++ b/cui/source/options/optbasic.cxx
@@ -21,7 +21,6 @@
#include <basic/codecompletecache.hxx>
#include <iostream>
#include <officecfg/Office/BasicIDE.hxx>
-#include <cuires.hrc>
SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet )
: SfxTabPage(pParent, "OptBasicIDEPage", "cui/ui/optbasicidepage.ui", &rSet)
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 00ba47e4e0b9..975f1d64e3ec 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -18,7 +18,6 @@
*/
#include <unotools/pathoptions.hxx>
-#include <cuires.hrc>
#include "optchart.hxx"
#include <dialmgr.hxx>
#include <vcl/builderfactory.hxx>
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 1a64c728eddb..7d70a458dc79 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -35,10 +35,9 @@
#include <vcl/settings.hxx>
#include <vcl/builderfactory.hxx>
#include <svx/svxdlg.hxx>
-#include <helpid.hrc>
+#include <helpids.h>
#include <dialmgr.hxx>
#include "optcolor.hxx"
-#include <cuires.hrc>
#include <strings.hrc>
#include <svx/dlgutil.hxx>
diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index 4f258008d0cb..ca8e9137ae8b 100644
--- a/cui/source/options/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -19,7 +19,6 @@
#include "optctl.hxx"
#include <dialmgr.hxx>
-#include <cuires.hrc>
#include <svl/ctloptions.hxx>
// class SvxCTLOptionsPage -----------------------------------------------------
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 9f0f8bd434a4..9d1bfcf90825 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -33,7 +33,6 @@
#include <svx/dialogs.hrc>
#include <linguistic/misc.hxx>
-#include <cuires.hrc>
#include <strings.hrc>
#include "optdict.hxx"
#include <dialmgr.hxx>
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 6964977d3a39..cd39dcac4e54 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -21,8 +21,7 @@
#include <unotools/moduleoptions.hxx>
#include <unotools/fltrcfg.hxx>
#include "optfltr.hxx"
-#include <cuires.hrc>
-#include "helpid.hrc"
+#include "helpids.h"
#include "strings.hrc"
#include <dialmgr.hxx>
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 180f6f185bfa..84ecbb97fb83 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -54,7 +54,6 @@
#include <svx/xpool.hxx>
#include <svx/dlgutil.hxx>
#include "cuitabarea.hxx"
-#include <cuires.hrc>
#include <editeng/unolingu.hxx>
#include <editeng/langitem.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 991041917020..7f9e975007eb 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -26,7 +26,6 @@
#include <vcl/edit.hxx>
#include <vcl/settings.hxx>
-#include <cuires.hrc>
#include <unotools/useroptions.hxx>
#include "cuioptgenrl.hxx"
#include <dialmgr.hxx>
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index 2f449abbddd3..2b47d835870f 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -20,8 +20,7 @@
#include <svtools/langtab.hxx>
#include <svtools/htmlcfg.hxx>
#include "opthtml.hxx"
-#include <cuires.hrc>
-#include "helpid.hrc"
+#include "helpids.h"
#include <dialmgr.hxx>
#include <sal/macros.h>
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index db2ff453dbd4..434462ca04a7 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -49,8 +49,7 @@
#include <dialmgr.hxx>
#include "optinet2.hxx"
#include <svx/svxdlg.hxx>
-#include <cuires.hrc>
-#include "helpid.hrc"
+#include "helpids.h"
#include <svx/ofaitem.hxx>
#include <sfx2/htmlmode.hxx>
#include <svx/svxids.hrc>
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 8141a5b4ccc0..1fc450aa1217 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -31,8 +31,7 @@
#include <officecfg/Office/Common.hxx>
#include <svtools/miscopt.hxx>
-#include <cuires.hrc>
-#include "helpid.hrc"
+#include "helpids.h"
#include <strings.hrc>
#include <vcl/svapp.hxx>
#include <vcl/help.hxx>
diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx
index bbe587a61a67..0c709cc57aa8 100644
--- a/cui/source/options/optjsearch.cxx
+++ b/cui/source/options/optjsearch.cxx
@@ -19,7 +19,6 @@
#include <unotools/searchopt.hxx>
#include <i18nutil/transliteration.hxx>
-#include <cuires.hrc>
#include <dialmgr.hxx>
#include <optjsearch.hxx>
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 1c85f8469c07..0f4d942194a6 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -56,8 +56,7 @@
#include <editeng/optitems.hxx>
#include "optlingu.hxx"
#include <dialmgr.hxx>
-#include <cuires.hrc>
-#include "helpid.hrc"
+#include "helpids.h"
#include <strings.hrc>
#include <ucbhelper/content.hxx>
diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index 27cb5b48f383..be9d6606c881 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -54,8 +54,7 @@
#include "cuitabarea.hxx"
#include "optmemory.hxx"
#include <svx/ofaitem.hxx>
-#include <cuires.hrc>
-#include "helpid.hrc"
+#include "helpids.h"
#include <dialmgr.hxx>
#include <limits>
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index 0fb1e1a172ee..731f385976be 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -34,7 +34,6 @@
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
#include <com/sun/star/util/XChangesBatch.hpp>
-#include <cuires.hrc>
#include <strings.hrc>
#include <dialmgr.hxx>
#include "optopencl.hxx"
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 08b0243a6f02..683683cd8e74 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -34,8 +34,7 @@
#include "optpath.hxx"
#include <dialmgr.hxx>
-#include <cuires.hrc>
-#include "helpid.hrc"
+#include "helpids.h"
#include "strings.hrc"
#include <comphelper/configuration.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index fc9fb88fa9be..763d902cbd03 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -19,10 +19,6 @@
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
-
-#include "optsave.hrc"
-#include <cuires.hrc>
-
#include "optsave.hxx"
#include <dialmgr.hxx>
#include <comphelper/processfactory.hxx>
@@ -36,6 +32,7 @@
#include <com/sun/star/container/XEnumeration.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/util/XFlushable.hpp>
+#include <sfx2/sfxsids.hrc>
#include <sfx2/docfilt.hxx>
#include <vcl/fixed.hxx>
#include <unotools/configitem.hxx>
diff --git a/cui/source/options/optsave.hrc b/cui/source/options/optsave.hrc
deleted file mode 100644
index 485d35ed7765..000000000000
--- a/cui/source/options/optsave.hrc
+++ /dev/null
@@ -1,35 +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_CUI_SOURCE_OPTIONS_OPTSAVE_HRC
-#define INCLUDED_CUI_SOURCE_OPTIONS_OPTSAVE_HRC
-
-// defines ------------------------------------------------------------------
-
-#define APP_WRITER 0
-#define APP_WRITER_WEB 1
-#define APP_WRITER_GLOBAL 2
-#define APP_CALC 3
-#define APP_IMPRESS 4
-#define APP_DRAW 5
-#define APP_MATH 6
-#define APP_COUNT 7
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index b30d8c6f0c41..f6957eede0c9 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -26,6 +26,15 @@
#include <vcl/lstbox.hxx>
#include <sfx2/tabdlg.hxx>
+#define APP_WRITER 0
+#define APP_WRITER_WEB 1
+#define APP_WRITER_GLOBAL 2
+#define APP_CALC 3
+#define APP_IMPRESS 4
+#define APP_DRAW 5
+#define APP_MATH 6
+#define APP_COUNT 7
+
namespace com { namespace sun { namespace star {
namespace beans {
struct PropertyValue;
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index fef9e395d7f9..e5576efbcb4d 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -23,7 +23,6 @@
#include <svl/zforlist.hxx>
#include "optupdt.hxx"
#include <dialmgr.hxx>
-#include <cuires.hrc>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/configuration/theDefaultProvider.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index 9594e6c644c0..60228c8a9550 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -28,7 +28,6 @@
#include <vcl/graphicfilter.hxx>
#include <vcl/mnemonic.hxx>
#include <dialmgr.hxx>
-#include "cuires.hrc"
#include "strings.hrc"
#include "personalization.hrc"
diff --git a/cui/source/options/securityoptions.cxx b/cui/source/options/securityoptions.cxx
index d849d3e77056..0b9d6dd7c94e 100644
--- a/cui/source/options/securityoptions.cxx
+++ b/cui/source/options/securityoptions.cxx
@@ -19,7 +19,6 @@
#include <unotools/securityoptions.hxx>
#include <dialmgr.hxx>
-#include <cuires.hrc>
#include "securityoptions.hxx"
namespace
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 685d2a49e2a0..f3f75e8c60cb 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -22,10 +22,9 @@
#include <svx/dialogs.hrc>
-#include "cuires.hrc"
#include "strings.hrc"
#include "treeopt.hrc"
-#include "helpid.hrc"
+#include "helpids.h"
#include "cfgchart.hxx"
#include "connpoolconfig.hxx"
diff --git a/cui/source/options/tsaurls.cxx b/cui/source/options/tsaurls.cxx
index b1db289d4b13..ea206fb44fd8 100644
--- a/cui/source/options/tsaurls.cxx
+++ b/cui/source/options/tsaurls.cxx
@@ -9,7 +9,6 @@
#include <officecfg/Office/Common.hxx>
#include <svx/svxdlg.hxx>
-#include <cuires.hrc>
#include <comphelper/sequence.hxx>
#include "tsaurls.hxx"
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index b7717221c8af..f6b3aa614f80 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -19,7 +19,6 @@
#include "webconninfo.hxx"
#include <dialmgr.hxx>
-#include <cuires.hrc>
#include <sal/macros.h>
#include <com/sun/star/task/InteractionHandler.hpp>
#include <com/sun/star/task/PasswordContainer.hpp>
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index dfa4a531870d..34b33726acea 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -21,7 +21,6 @@
#include <editeng/svxenum.hxx>
#include <svx/dialogs.hrc>
-#include <cuires.hrc>
#include <strings.hrc>
#include <bitmaps.hlst>
#include <svx/rotmodit.hxx>
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index def8d3de5013..308fa651eb78 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -48,11 +48,10 @@
#include <o3tl/make_unique.hxx>
#include "autocdlg.hxx"
-#include "helpid.hrc"
+#include "helpids.h"
#include <editeng/acorrcfg.hxx>
#include <editeng/svxacorr.hxx>
#include "cuicharmap.hxx"
-#include "cuires.hrc"
#include "strings.hrc"
#include <editeng/unolingu.hxx>
#include <dialmgr.hxx>
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 343e4ff2722f..2ac62da42ad3 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -31,10 +31,9 @@
#include <svx/dialogs.hrc>
#include <svx/strings.hrc>
-#include <cuires.hrc>
#include <strings.hrc>
#include <svx/dialmgr.hxx>
-#include <editeng/memberids.hrc>
+#include <editeng/memberids.h>
#include <editeng/eerdll.hxx>
#include <editeng/brushitem.hxx>
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index dbcb814ced3e..5dde954380bb 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -24,10 +24,9 @@
#include <svx/dialmgr.hxx>
#include <svx/strings.hrc>
-#include <cuires.hrc>
#include <strings.hrc>
#include <bitmaps.hlst>
-#include "helpid.hrc"
+#include "helpids.h"
#include <svx/xtable.hxx>
#include <svx/drawitem.hxx>
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index ef454619a8ad..fa1054c2a9ca 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -68,7 +68,6 @@
#include <editeng/charrotateitem.hxx>
#include <officecfg/Office/Common.hxx>
#include <svx/svxdlg.hxx>
-#include <cuires.hrc>
#include <strings.hrc>
#include <svl/intitem.hxx>
#include <sfx2/request.hxx>
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index d5df97d4c037..2060dabdd87e 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <cuires.hrc>
#include <strings.hrc>
#include <dialmgr.hxx>
#include <sfx2/app.hxx>
diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx
index d50a60f72c00..fd58cda4fcd1 100644
--- a/cui/source/tabpages/dstribut.cxx
+++ b/cui/source/tabpages/dstribut.cxx
@@ -18,7 +18,6 @@
*/
#include <sfx2/basedlgs.hxx>
-#include <cuires.hrc>
#include "dstribut.hxx"
#include <svx/dialogs.hrc>
#include <svx/svddef.hxx>
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 85e2c98e8595..4d95cf2fabe8 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -30,7 +30,6 @@
#include <grfpage.hxx>
#include <svx/grfcrop.hxx>
#include <rtl/ustring.hxx>
-#include <cuires.hrc>
#include <tools/fract.hxx>
#include <svx/dialogs.hrc>
#include <strings.hrc>
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index c0ca4fde6538..3634ac82c565 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -18,7 +18,6 @@
*/
#include <comphelper/string.hxx>
-#include <cuires.hrc>
#include <dialmgr.hxx>
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index 6742eceb4c87..9c176a9ae989 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -30,7 +30,6 @@
#include <sfx2/app.hxx>
#include <sfx2/evntconf.hxx>
#include <sfx2/objsh.hxx>
-#include "cuires.hrc"
#include <vcl/fixed.hxx>
#include "headertablistbox.hxx"
#include "svtools/svlbitm.hxx"
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index c41bf6b52286..4ffd4d87629b 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <cuires.hrc>
#include <strings.hrc>
#include <dialmgr.hxx>
#include <sfx2/app.hxx>
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index a4981f5d84cf..e417c2548341 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -30,7 +30,6 @@
#include <svx/dialogs.hrc>
#include <svtools/colorcfg.hxx>
-#include <cuires.hrc>
#include <strings.hrc>
#include <svx/numinf.hxx>
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 30525c1045c6..03e39ec27b7b 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -22,11 +22,10 @@
#include <com/sun/star/text/RelOrientation.hpp>
#include <numpages.hxx>
-#include <numpages.hrc>
#include <dialmgr.hxx>
#include <tools/mapunit.hxx>
#include <i18nlangtag/mslangid.hxx>
-#include <helpid.hrc>
+#include <helpids.h>
#include <editeng/numitem.hxx>
#include <svl/eitem.hxx>
#include <vcl/layout.hxx>
@@ -69,7 +68,6 @@
#include <vector>
#include "sfx2/opengrf.hxx"
-#include <cuires.hrc>
#include <strings.hrc>
#include <sfx2/request.hxx>
#include <svl/aeitem.hxx>
diff --git a/cui/source/tabpages/numpages.hrc b/cui/source/tabpages/numpages.hrc
deleted file mode 100644
index d4f3150d4816..000000000000
--- a/cui/source/tabpages/numpages.hrc
+++ /dev/null
@@ -1,22 +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 .
- */
-
-#define MN_GALLERY_ENTRY 100
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 98f0d12ee183..b464bb387df7 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -30,9 +30,8 @@
#include <sfx2/htmlmode.hxx>
#include <sal/macros.h>
-#include <cuires.hrc>
#include <strings.hrc>
-#include "helpid.hrc"
+#include "helpids.h"
#include "page.hxx"
#include <svx/pageitem.hxx>
#include <editeng/brushitem.hxx>
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index a4f83510ae2c..3b5bf8930333 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -29,7 +29,6 @@
#include <svl/languageoptions.hxx>
#include <svl/cjkoptions.hxx>
#include <editeng/pgrditem.hxx>
-#include <cuires.hrc>
#include <strings.hrc>
#include "paragrph.hxx"
#include <editeng/frmdiritem.hxx>
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 9bcd7c1454e1..3dca342abc17 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -25,7 +25,6 @@
#include <svx/anchorid.hxx>
#include <svl/aeitem.hxx>
#include <svx/swframevalidation.hxx>
-#include <cuires.hrc>
#include <sfx2/htmlmode.hxx>
#include <svx/svdview.hxx>
#include <svx/svdpagv.hxx>
diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index 536db24bde8b..9676abbf774b 100644
--- a/cui/source/tabpages/tabarea.cxx
+++ b/cui/source/tabpages/tabarea.cxx
@@ -26,7 +26,6 @@
#include <svx/svdview.hxx>
#include <svx/dialogs.hrc>
-#include <cuires.hrc>
#include <svx/xtable.hxx>
#include "svx/globl3d.hxx"
#include <svx/svdmodel.hxx>
diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx
index 3a1269c1bc45..070c4b4de64e 100644
--- a/cui/source/tabpages/tabline.cxx
+++ b/cui/source/tabpages/tabline.cxx
@@ -22,9 +22,6 @@
#include <sfx2/app.hxx>
#include <sfx2/objsh.hxx>
#include <svx/dialogs.hrc>
-
-#include <cuires.hrc>
-
#include "cuitabarea.hxx"
#include "cuitabline.hxx"
#include "dlgname.hxx"
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 7be2085f9786..50a9b5c0914e 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -23,7 +23,6 @@
#include <vcl/settings.hxx>
#include <vcl/builderfactory.hxx>
-#include <cuires.hrc>
#include <editeng/lrspitem.hxx>
#include "tabstpge.hxx"
#include <dialmgr.hxx>
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index 31f3e4cb04bf..fbf8302b6a47 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -20,7 +20,6 @@
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
-#include <cuires.hrc>
#include <svx/dialogs.hrc>
#include "textanim.hxx"
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 6be1e322ea9a..b7cf03f7b81b 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -19,7 +19,6 @@
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
-#include <cuires.hrc>
#include <svx/svddef.hxx>
#include <svx/sdtditm.hxx>
#include <svx/sdtagitm.hxx>
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 5e682bf92075..ca4aaab5c65d 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -26,7 +26,6 @@
#include "svx/xattr.hxx"
#include <svx/xpool.hxx>
-#include <cuires.hrc>
#include <svx/xflbckit.hxx>
#include <svx/svdattr.hxx>
#include <svx/xtable.hxx>
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index bc87cf191c8c..c6667bf53a02 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -25,7 +25,6 @@
#include <svx/dialogs.hrc>
#include "svx/xattr.hxx"
#include <svx/xpool.hxx>
-#include <cuires.hrc>
#include <strings.hrc>
#include <svx/xflbckit.hxx>
#include <svx/svdattr.hxx>
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index fb2a1300696b..3518c9daea0d 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -32,9 +32,8 @@
#include <svx/ofaitem.hxx>
#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
-#include <cuires.hrc>
#include <strings.hrc>
-#include "helpid.hrc"
+#include "helpids.h"
#include "svx/xattr.hxx"
#include <svx/xpool.hxx>
#include <svx/xtable.hxx>
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 8de274563d88..e7dd9822abb5 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -27,9 +27,8 @@
#include <sfx2/filedlghelper.hxx>
#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
-#include <cuires.hrc>
#include <strings.hrc>
-#include "helpid.hrc"
+#include "helpids.h"
#include <svx/colorbox.hxx>
#include "svx/xattr.hxx"
#include <svx/xtable.hxx>
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 0e78ab78089e..951fcdfb2e85 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -28,9 +28,8 @@
#include <sfx2/module.hxx>
#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
-#include <cuires.hrc>
#include <strings.hrc>
-#include "helpid.hrc"
+#include "helpids.h"
#include <svx/colorbox.hxx>
#include "svx/xattr.hxx"
#include <svx/xpool.hxx>
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index de1526d4b7dc..8e1293bd3007 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -24,7 +24,6 @@
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
-#include <cuires.hrc>
#include <strings.hrc>
#include <svx/colorbox.hxx>
#include "svx/xattr.hxx"
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 1cd1b4f61a01..ab570642ef69 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -26,9 +26,8 @@
#include <sfx2/filedlghelper.hxx>
#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
-#include <cuires.hrc>
#include <strings.hrc>
-#include "helpid.hrc"
+#include "helpids.h"
#include "svx/xattr.hxx"
#include <svx/xpool.hxx>
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index a5a0579226b7..bb52e85621d7 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -25,9 +25,8 @@
#include <sfx2/filedlghelper.hxx>
#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
-#include <cuires.hrc>
#include <strings.hrc>
-#include "helpid.hrc"
+#include "helpids.h"
#include <svx/dialmgr.hxx>
#include <svx/svdobj.hxx>
#include <svx/svdopath.hxx>
diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx
index 9f57f7e5a0d5..26e1f2b9c7b1 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -35,9 +35,8 @@
#include <svx/dialogs.hrc>
#include <svx/strings.hrc>
-#include <cuires.hrc>
#include <strings.hrc>
-#include "helpid.hrc"
+#include "helpids.h"
#include "svx/xattr.hxx"
#include <svx/xpool.hxx>
#include <svx/xtable.hxx>
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index f4926f6d90e8..8fae2bb86f7a 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -24,7 +24,6 @@
#include "svx/xattr.hxx"
#include <svx/xpool.hxx>
-#include <cuires.hrc>
#include <svx/svdattr.hxx>
#include "svx/drawitem.hxx"
#include "cuitabarea.hxx"
diff --git a/cui/source/tabpages/tptrans.cxx b/cui/source/tabpages/tptrans.cxx
index 086d037e0fd0..fd1c5517ddfd 100644
--- a/cui/source/tabpages/tptrans.cxx
+++ b/cui/source/tabpages/tptrans.cxx
@@ -26,7 +26,6 @@
#include "svx/xattr.hxx"
#include <svx/xpool.hxx>
-#include <cuires.hrc>
#include <svx/xflbckit.hxx>
#include <svx/svdattr.hxx>
#include <svx/xtable.hxx>
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index af73a1010776..fd024e1295fc 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -27,7 +27,6 @@
#include <svx/sderitm.hxx>
#include <svx/dialogs.hrc>
#include <svx/transfrmhelper.hxx>
-#include <cuires.hrc>
#include <editeng/sizeitem.hxx>
#include "transfrm.hxx"