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

11 files changed, 7 insertions, 14 deletions

diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx
index d114c1d46728..ddad76bb09de 100644
--- a/sfx2/source/dialog/backingcomp.cxx
+++ b/sfx2/source/dialog/backingcomp.cxx
@@ -19,7 +19,7 @@
 
 #include "backingwindow.hxx"
 
-#include <helpid.hrc>
+#include <helpids.h>
 
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 9602469ad3fa..fb2a4831f326 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -65,7 +65,6 @@
 #include <comphelper/storagehelper.hxx>
 
 #include "documentfontsdialog.hxx"
-#include <sfx2/sfx.hrc>
 #include "dinfdlg.hrc"
 #include "sfx2/strings.hrc"
 #include "strings.hxx"
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 9c046d23ec4d..f4ebace14fbd 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -69,7 +69,7 @@
 #include <vcl/graphicfilter.hxx>
 #include <unotools/viewoptions.hxx>
 #include <unotools/moduleoptions.hxx>
-#include <svtools/helpid.hrc>
+#include <svtools/helpids.h>
 #include <comphelper/docpasswordrequest.hxx>
 #include <comphelper/docpasswordhelper.hxx>
 #include <ucbhelper/content.hxx>
@@ -88,7 +88,7 @@
 #include "filtergrouping.hxx"
 #include <sfx2/request.hxx>
 #include "filedlgimpl.hxx"
-#include <helpid.hrc>
+#include <helpids.h>
 #include <sfx2/strings.hrc>
 #include <rtl/strbuf.hxx>
 #include <comphelper/sequence.hxx>
diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx
index 7b81b834fb72..d55171a913bf 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -20,7 +20,6 @@
 #include "filtergrouping.hxx"
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/filedlghelper.hxx>
-#include <sfx2/sfx.hrc>
 #include <sfx2/strings.hrc>
 #include <sfx2/docfac.hxx>
 #include <sfx2/sfxresid.hxx>
diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx
index b093718f4e86..ec6814edce9c 100644
--- a/sfx2/source/dialog/infobar.cxx
+++ b/sfx2/source/dialog/infobar.cxx
@@ -16,8 +16,8 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/infobar.hxx>
+#include <sfx2/objface.hxx>
 #include <sfx2/objsh.hxx>
-#include <sfx2/sfx.hrc>
 #include <sfx2/viewsh.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index c463872fef36..af5f69ba2f20 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -37,7 +37,6 @@
 
 #include <sfx2/templdlg.hxx>
 #include "templdgi.hxx"
-#include <sfx2/sfx.hrc>
 #include "sfx2/strings.hrc"
 
 #include <svl/style.hxx>
diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx
index 3ebca4245826..c99aeb6c7c8a 100644
--- a/sfx2/source/dialog/navigat.cxx
+++ b/sfx2/source/dialog/navigat.cxx
@@ -21,11 +21,10 @@
 
 #include <sfx2/bindings.hxx>
 #include <sfx2/navigat.hxx>
-#include <sfx2/sfx.hrc>
 #include <sfx2/strings.hrc>
 #include <sfx2/app.hxx>
 #include <sfx2/sfxresid.hxx>
-#include "helpid.hrc"
+#include "helpids.h"
 
 SFX_IMPL_DOCKINGWINDOW( SfxNavigatorWrapper , SID_NAVIGATOR );
 
diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx
index 160c6d462c9c..cdac7d87d1ea 100644
--- a/sfx2/source/dialog/securitypage.cxx
+++ b/sfx2/source/dialog/securitypage.cxx
@@ -22,7 +22,6 @@
 
 #include <sfx2/sfxresid.hxx>
 
-#include <sfx2/sfx.hrc>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewsh.hxx>
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index f9de799edc6b..44f3118c6c6a 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -40,7 +40,7 @@
 #include "uitest/sfx_uiobject.hxx"
 
 #include "sfx2/strings.hrc"
-#include "helpid.hrc"
+#include "helpids.h"
 
 using namespace ::com::sun::star::uno;
 
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index ba9985aefa29..152bb1ab2843 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -50,14 +50,13 @@
 #include <sfx2/tplpitem.hxx>
 #include <sfx2/sfxresid.hxx>
 
-#include <sfx2/sfx.hrc>
 #include "sfx2/strings.hrc"
 #include "arrdecl.hxx"
 #include <sfx2/docfilt.hxx>
 #include <sfx2/docfac.hxx>
 #include <sfx2/doctempl.hxx>
 #include <sfx2/module.hxx>
-#include "helpid.hrc"
+#include "helpids.h"
 #include "bitmaps.hlst"
 #include "appdata.hxx"
 #include <sfx2/viewfrm.hxx>
diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx
index e016d111a18b..44fd583c81d9 100644
--- a/sfx2/source/dialog/tplcitem.cxx
+++ b/sfx2/source/dialog/tplcitem.cxx
@@ -26,7 +26,6 @@
 #include "tplcitem.hxx"
 #include "templdgi.hxx"
 
-#include <sfx2/sfx.hrc>
 #include "sfx2/strings.hrc"
 
 // Constructor