de-hrc various things

e.g.  helpid[s].hrc -> helpids.h
and insert include guards where missing

move "ordinary" defines into .hxx files

remove .hrc entries that are used as arguments to dialog factory
when a dedicated method can be added instead

Change-Id: I792fb8eb0adfaa63cf354e6e57401fc943e9196e

34 files changed, 11 insertions, 69 deletions

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"