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

8 files changed, 10 insertions, 12 deletions

diff --git a/editeng/inc/helpid.hrc b/editeng/inc/helpids.h
index 018a50f8e164..5105dbd46b0f 100644
--- a/editeng/inc/helpid.hrc
+++ b/editeng/inc/helpids.h
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_EDITENG_INC_HELPID_HRC
-#define INCLUDED_EDITENG_INC_HELPID_HRC
+#ifndef INCLUDED_EDITENG_INC_HELPIDS_H
+#define INCLUDED_EDITENG_INC_HELPIDS_H
 
 #define HID_EDITENG_SPELLER_WORDLANGUAGE                   "EDITENG_HID_EDITENG_SPELLER_WORDLANGUAGE"
 #define HID_EDITENG_SPELLER_PARALANGUAGE                   "EDITENG_HID_EDITENG_SPELLER_PARALANGUAGE"
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 11697dc95edd..1695d6b07780 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -49,7 +49,7 @@
 #include <eerdll2.hxx>
 #include <editeng/editrids.hrc>
 #include <editeng.hxx>
-#include <helpid.hrc>
+#include <helpids.h>
 #include <i18nlangtag/lang.h>
 #include <vcl/menu.hxx>
 #include <vcl/window.hxx>
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 0178499d1020..35e5937caca9 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -52,7 +52,7 @@
 #include <svtools/grfmgr.hxx>
 #include <tools/urlobj.hxx>
 #include <comphelper/types.hxx>
-#include <svl/memberid.hrc>
+#include <svl/memberid.h>
 #include <svtools/borderhelper.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -79,7 +79,7 @@
 #include <editeng/itemtype.hxx>
 #include <editeng/eerdll.hxx>
 #include <editeng/unoprnms.hxx>
-#include <editeng/memberids.hrc>
+#include <editeng/memberids.h>
 #include <editeng/editerr.hxx>
 #include <libxml/xmlwriter.h>
 #include <o3tl/enumrange.hxx>
diff --git a/editeng/source/items/justifyitem.cxx b/editeng/source/items/justifyitem.cxx
index 9d073ebda5c7..fc9f48e3a6a8 100644
--- a/editeng/source/items/justifyitem.cxx
+++ b/editeng/source/items/justifyitem.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "editeng/justifyitem.hxx"
-#include "editeng/memberids.hrc"
+#include "editeng/memberids.h"
 #include "editeng/editrids.hrc"
 #include "editeng/eerdll.hxx"
 
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index eab2588de236..166c8ff359da 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -27,7 +27,6 @@
 #include <comphelper/types.hxx>
 #include <tools/mapunit.hxx>
 #include <svl/itempool.hxx>
-#include <svl/memberid.hrc>
 #include <editeng/editrids.hrc>
 #include <editeng/lspcitem.hxx>
 #include <editeng/adjustitem.hxx>
@@ -43,7 +42,7 @@
 #include <editeng/paravertalignitem.hxx>
 #include <editeng/pgrditem.hxx>
 #include <rtl/ustring.hxx>
-#include <editeng/memberids.hrc>
+#include <editeng/memberids.h>
 #include <editeng/editids.hrc>
 #include <editeng/itemtype.hxx>
 #include <editeng/eerdll.hxx>
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 5821900f3902..37af9cfa6a76 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -31,7 +31,6 @@
 #include <editeng/eeitem.hxx>
 #include <svtools/unitconv.hxx>
 
-#include <svl/memberid.hrc>
 #include <editeng/editids.hrc>
 #include <editeng/editrids.hrc>
 #include <vcl/vclenum.hxx>
@@ -62,7 +61,7 @@
 #include <com/sun/star/text/FontEmphasis.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <editeng/rsiditem.hxx>
-#include <editeng/memberids.hrc>
+#include <editeng/memberids.h>
 #include <editeng/flstitem.hxx>
 #include <editeng/fontitem.hxx>
 #include <editeng/postitem.hxx>
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 3c832486a04e..7a96b9741532 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -55,7 +55,7 @@
 #include <editeng/svxacorr.hxx>
 #include <editeng/unolingu.hxx>
 #include <vcl/window.hxx>
-#include <helpid.hrc>
+#include <helpids.h>
 #include <com/sun/star/xml/sax/InputSource.hpp>
 #include <com/sun/star/xml/sax/FastParser.hpp>
 #include <com/sun/star/xml/sax/FastToken.hpp>
diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx
index c7f9b0760c4b..f97253d1f785 100644
--- a/editeng/source/uno/unofdesc.cxx
+++ b/editeng/source/uno/unofdesc.cxx
@@ -28,7 +28,7 @@
 #include <editeng/wghtitem.hxx>
 #include <editeng/crossedoutitem.hxx>
 #include <editeng/wrlmitem.hxx>
-#include <editeng/memberids.hrc>
+#include <editeng/memberids.h>
 #include <svl/itempool.hxx>
 #include <vcl/unohelp.hxx>