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

10 files changed, 11 insertions, 11 deletions

diff --git a/basctl/inc/helpid.hrc b/basctl/inc/helpids.h
index 3bafa9769a10..1753df0a9ab5 100644
--- a/basctl/inc/helpid.hrc
+++ b/basctl/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_BASCTL_INC_HELPID_HRC
-#define INCLUDED_BASCTL_INC_HELPID_HRC
+#ifndef INCLUDED_BASCTL_INC_HELPIDS_H
+#define INCLUDED_BASCTL_INC_HELPIDS_H
 
 #define HID_BASICIDE_OBJECTCAT                            "BASCTL_HID_BASICIDE_OBJECTCAT"
 
diff --git a/basctl/sdi/basslots.hrc b/basctl/sdi/basslots.hrc
index 4d3b2341c6cc..3056ec844a14 100644
--- a/basctl/sdi/basslots.hrc
+++ b/basctl/sdi/basslots.hrc
@@ -18,6 +18,6 @@
  */
 
 #include <svx/svxids.hrc>
-#include <editeng/memberids.hrc>
+#include <editeng/memberids.h>
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx
index 7d9f76f9305a..54560793133d 100644
--- a/basctl/source/basicide/basdoc.cxx
+++ b/basctl/source/basicide/basdoc.cxx
@@ -44,7 +44,7 @@ SFX_IMPL_SUPERCLASS_INTERFACE(basctl_DocShell, SfxObjectShell)
 
 void basctl_DocShell::InitInterface_Impl()
 {
-    GetStaticInterface()->RegisterStatusBar(SID_BASICIDE_STATUSBAR);
+    GetStaticInterface()->RegisterStatusBar(StatusBarId::BasicIdeStatusBar);
 }
 
 DocShell::DocShell()
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index b8bfd80a0970..b3b3c44e23e2 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -25,7 +25,7 @@
 #include "docsignature.hxx"
 #include "officecfg/Office/BasicIDE.hxx"
 
-#include "helpid.hrc"
+#include "helpids.h"
 #include <strings.hrc>
 
 #include <basic/basmgr.hxx>
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 330feefdfd8c..631ab8a576e8 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -21,7 +21,7 @@
 
 #include <cassert>
 
-#include "helpid.hrc"
+#include "helpids.h"
 #include <strings.hrc>
 #include "bitmaps.hlst"
 
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 4fe135056e02..29b47d78739b 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "strings.hrc"
-#include "helpid.hrc"
+#include "helpids.h"
 
 #include "accessibledialogwindow.hxx"
 #include "baside3.hxx"
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 000a43cdeecc..d1083a607380 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -19,7 +19,7 @@
 
 #include <memory>
 #include "strings.hrc"
-#include "helpid.hrc"
+#include "helpids.h"
 
 #include "baside2.hxx"
 #include "baside3.hxx"
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 27f852cd7b46..4873d8663b34 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "strings.hrc"
-#include "helpid.hrc"
+#include "helpids.h"
 
 #include "baside2.hxx"
 #include "baside3.hxx"
diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx
index 292ff3bf000c..45c6353678d2 100644
--- a/basctl/source/basicide/objdlg.cxx
+++ b/basctl/source/basicide/objdlg.cxx
@@ -20,7 +20,7 @@
 #include "strings.hrc"
 
 #include "objdlg.hxx"
-#include "helpid.hrc"
+#include "helpids.h"
 
 #include <svl/itemset.hxx>
 #include <vcl/taskpanelist.hxx>
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index ba6912605404..b603bf41781c 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -24,7 +24,7 @@
 #include "localizationmgr.hxx"
 #include "managelang.hxx"
 
-#include "helpid.hrc"
+#include "helpids.h"
 #include "strings.hrc"
 
 #include <com/sun/star/i18n/Boundary.hpp>