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

5 files changed, 3 insertions, 8 deletions

diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index b191713a9f79..bbe606badee7 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -22,8 +22,7 @@
 
 #include <svl/solar.hrc>
 #include <sfx2/sfxsids.hrc>
-#include <editeng/memberids.hrc>
-#include "helpids.h"
+#include <editeng/memberids.h>
 
 #define SID_NEXTERR                 (SID_SMA_START + 1)
 #define SID_PREVERR                 (SID_SMA_START + 2)
@@ -72,8 +71,6 @@
 #define SID_ELEMENTSDOCKINGWINDOW   (SID_SMA_START + 126)
 #define SID_AUTO_CLOSE_BRACKETS     (SID_SMA_START + 127)
 
-#define RID_STATUSBAR               (RID_APP_START + 816)
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 16d237dcb4b2..031f57c31f2c 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -37,7 +37,6 @@
 #include <vcl/wall.hxx>
 #include <vcl/fontcharmap.hxx>
 #include <sfx2/dispatch.hxx>
-#include <sfx2/sfx.hrc>
 #include <osl/diagnose.h>
 #include <svx/ucsubset.hxx>
 
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index b335e6ee81dc..e010383f0bad 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -70,7 +70,6 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/settings.hxx>
 
-#include <sfx2/sfx.hrc>
 #include <document.hxx>
 #include <action.hxx>
 #include <dialog.hxx>
diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx
index 0e821d5b9d01..5081050b291a 100644
--- a/starmath/source/smmod.cxx
+++ b/starmath/source/smmod.cxx
@@ -22,7 +22,6 @@
 #include <o3tl/make_unique.hxx>
 #include <sfx2/objface.hxx>
 #include <svl/whiter.hxx>
-#include <sfx2/sfx.hrc>
 #include <sfx2/viewsh.hxx>
 #include <svx/svxids.hrc>
 #include <tools/resmgr.hxx>
@@ -126,7 +125,7 @@ SFX_IMPL_INTERFACE(SmModule, SfxModule)
 
 void SmModule::InitInterface_Impl()
 {
-    GetStaticInterface()->RegisterStatusBar(RID_STATUSBAR);
+    GetStaticInterface()->RegisterStatusBar(StatusBarId::MathStatusBar);
 }
 
 SmModule::SmModule(SfxObjectFactory* pObjFact)
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 56e79c66d330..bf387cb2d494 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -75,6 +75,7 @@
 #include "cursor.hxx"
 #include "accessibility.hxx"
 #include "ElementsDockingWindow.hxx"
+#include "helpids.h"
 #include <cassert>
 #include <memory>