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, 4 insertions, 9 deletions

diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index ac67301c11eb..54f212ee58f8 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -32,7 +32,6 @@
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/configurationhelper.hxx>
 
-#include <sfx2/sfx.hrc>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/docfac.hxx>
 #include <sfx2/viewfac.hxx>
diff --git a/sfx2/source/doc/objembed.cxx b/sfx2/source/doc/objembed.cxx
index 422e3ea62842..2d59de087943 100644
--- a/sfx2/source/doc/objembed.cxx
+++ b/sfx2/source/doc/objembed.cxx
@@ -27,7 +27,6 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/app.hxx>
 #include "objshimp.hxx"
-#include <sfx2/sfx.hrc>
 #include <sfx2/event.hxx>
 
 #include <comphelper/seqstream.hxx>
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 581ab76a44ec..febf5fbfe728 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -93,7 +93,6 @@
 #include <sfx2/objsh.hxx>
 #include "objshimp.hxx"
 #include <sfx2/event.hxx>
-#include <sfx2/sfx.hrc>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/viewsh.hxx>
@@ -104,7 +103,7 @@
 #include "helper.hxx"
 #include "sfx2/strings.hrc"
 #include "workwin.hxx"
-#include "helpid.hrc"
+#include "helpids.h"
 #include "sfx2/strings.hrc"
 #include <sfx2/sfxdlg.hxx>
 #include "appbaslib.hxx"
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 929008cd1136..2924a4f43598 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -95,7 +95,7 @@
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
 
-#include "helpid.hrc"
+#include "helpids.h"
 
 #include "guisaveas.hxx"
 #include <sfx2/saveastemplatedlg.hxx>
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 6e3617421b07..8b25c10f7fe1 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -91,7 +91,7 @@
 #include <basic/basmgr.hxx>
 #include <svtools/strings.hrc>
 #include <sfx2/QuerySaveDocument.hxx>
-#include "helpid.hrc"
+#include "helpids.h"
 #include <sfx2/msg.hxx>
 #include "appbaslib.hxx"
 #include <sfx2/sfxbasemodel.hxx>
diff --git a/sfx2/source/doc/querytemplate.cxx b/sfx2/source/doc/querytemplate.cxx
index 7315e98f9344..c21b73ba7f71 100644
--- a/sfx2/source/doc/querytemplate.cxx
+++ b/sfx2/source/doc/querytemplate.cxx
@@ -21,7 +21,7 @@
 #include "querytemplate.hxx"
 #include <sfx2/sfxresid.hxx>
 #include "sfx2/strings.hrc"
-#include "helpid.hrc"
+#include "helpids.h"
 #include <vcl/svapp.hxx>
 
 namespace sfx2
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index eb07fd640874..5df92d9175d4 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -105,7 +105,6 @@
 #include <eventsupplier.hxx>
 #include <sfx2/evntconf.hxx>
 #include <sfx2/strings.hrc>
-#include <sfx2/sfx.hrc>
 #include <sfx2/app.hxx>
 #include "appdata.hxx"
 #include <sfx2/docfac.hxx>
diff --git a/sfx2/source/doc/zoomitem.cxx b/sfx2/source/doc/zoomitem.cxx
index c71405547eb1..117d1a7c4635 100644
--- a/sfx2/source/doc/zoomitem.cxx
+++ b/sfx2/source/doc/zoomitem.cxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <osl/diagnose.h>
-#include <sfx2/sfx.hrc>
 
 
 SfxPoolItem* SvxZoomItem::CreateDefault() { return new SvxZoomItem; }