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, 57 insertions, 10 deletions

diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx
index f59cdf930baa..541e55c89805 100644
--- a/include/svtools/addresstemplate.hxx
+++ b/include/svtools/addresstemplate.hxx
@@ -36,6 +36,8 @@
 #include <com/sun/star/sdbc/XDataSource.hpp>
 #include <unotools/configitem.hxx>
 
+#define FIELD_PAIRS_VISIBLE         5
+#define FIELD_CONTROLS_VISIBLE      2 * FIELD_PAIRS_VISIBLE
 
 namespace svt
 {
diff --git a/include/svtools/ehdl.hxx b/include/svtools/ehdl.hxx
index 50426b37fb2d..b858f2b31d37 100644
--- a/include/svtools/ehdl.hxx
+++ b/include/svtools/ehdl.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_SVTOOLS_EHDL_HXX
 #define INCLUDED_SVTOOLS_EHDL_HXX
 
-#ifndef __RSC
-
 #include <memory>
 #include <svtools/svtdllapi.h>
 
@@ -74,6 +72,4 @@ private:
 
 #endif
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svtools/helpid.hrc b/include/svtools/helpids.h
index db1601f7de55..309a42260de3 100644
--- a/include/svtools/helpid.hrc
+++ b/include/svtools/helpids.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_HELPID_HRC
-#define INCLUDED_SVTOOLS_HELPID_HRC
+#ifndef INCLUDED_SVTOOLS_HELPIDS_H
+#define INCLUDED_SVTOOLS_HELPIDS_H
 
 #define HID_FILEDLG_LINK_CB                                    "SVT_HID_FILEDLG_LINK_CB"
 #define HID_FILEDLG_PREVIEW_CB                                 "SVT_HID_FILEDLG_PREVIEW_CB"
diff --git a/include/svtools/imagemgr.hxx b/include/svtools/imagemgr.hxx
index 27e4013f7d2c..a81cbbf70efe 100644
--- a/include/svtools/imagemgr.hxx
+++ b/include/svtools/imagemgr.hxx
@@ -23,6 +23,59 @@
 #include <svtools/svtdllapi.h>
 #include <sal/types.h>
 
+#define IMAGELIST_START                 3076  // must match to old Id's in SFX!
+
+#define IMG_IMPRESS                     (IMAGELIST_START + 47)
+#define IMG_BITMAP                      (IMAGELIST_START + 49)
+#define IMG_CALC                        (IMAGELIST_START + 50)
+#define IMG_CALCTEMPLATE                (IMAGELIST_START + 51)
+#define IMG_DATABASE                    (IMAGELIST_START + 53)
+#define IMG_IMPRESSTEMPLATE             (IMAGELIST_START + 54)
+#define IMG_GIF                         (IMAGELIST_START + 61)
+#define IMG_HTML                        (IMAGELIST_START + 63)
+#define IMG_JPG                         (IMAGELIST_START + 64)
+#define IMG_MATH                        (IMAGELIST_START + 68)
+#define IMG_MATHTEMPLATE                (IMAGELIST_START + 69)
+#define IMG_FILE                        (IMAGELIST_START + 74)
+#define IMG_PCD                         (IMAGELIST_START + 76)
+#define IMG_PCT                         (IMAGELIST_START + 77)
+#define IMG_PCX                         (IMAGELIST_START + 78)
+#define IMG_SIM                         (IMAGELIST_START + 79)
+#define IMG_TEXTFILE                    (IMAGELIST_START + 80)
+#define IMG_TIFF                        (IMAGELIST_START + 82)
+#define IMG_WMF                         (IMAGELIST_START + 84)
+#define IMG_WRITER                      (IMAGELIST_START + 86)
+#define IMG_WRITERTEMPLATE              (IMAGELIST_START + 87)
+#define IMG_FIXEDDEV                    (IMAGELIST_START + 88)
+#define IMG_REMOVABLEDEV                (IMAGELIST_START + 89)
+#define IMG_CDROMDEV                    (IMAGELIST_START + 90)
+#define IMG_NETWORKDEV                  (IMAGELIST_START + 91)
+#define IMG_TABLE                       (IMAGELIST_START + 112)
+#define IMG_FOLDER                      (IMAGELIST_START + 113)
+#define IMG_DXF                         (IMAGELIST_START + 141)
+#define IMG_MET                         (IMAGELIST_START + 142)
+#define IMG_PNG                         (IMAGELIST_START + 143)
+#define IMG_SGF                         (IMAGELIST_START + 144)
+#define IMG_SGV                         (IMAGELIST_START + 145)
+#define IMG_SVM                         (IMAGELIST_START + 146)
+#define IMG_GLOBAL_DOC                  (IMAGELIST_START + 150)
+#define IMG_DRAW                        (IMAGELIST_START + 151)
+#define IMG_DRAWTEMPLATE                (IMAGELIST_START + 152)
+#define IMG_TEMPLATE                    (IMAGELIST_START + 166)
+#define IMG_OO_DATABASE_DOC             (IMAGELIST_START + 169)
+#define IMG_OO_DRAW_DOC                 (IMAGELIST_START + 170)
+#define IMG_OO_MATH_DOC                 (IMAGELIST_START + 171)
+#define IMG_OO_GLOBAL_DOC               (IMAGELIST_START + 172)
+#define IMG_OO_IMPRESS_DOC              (IMAGELIST_START + 173)
+#define IMG_OO_CALC_DOC                 (IMAGELIST_START + 174)
+#define IMG_OO_WRITER_DOC               (IMAGELIST_START + 175)
+#define IMG_OO_DRAW_TEMPLATE            (IMAGELIST_START + 176)
+#define IMG_OO_IMPRESS_TEMPLATE         (IMAGELIST_START + 177)
+#define IMG_OO_CALC_TEMPLATE            (IMAGELIST_START + 178)
+#define IMG_OO_WRITER_TEMPLATE          (IMAGELIST_START + 179)
+#define IMG_EXTENSION                   (IMAGELIST_START + 180)
+
+
 class Image;
 namespace rtl {
   class OUString;
diff --git a/include/svtools/soerr.hxx b/include/svtools/soerr.hxx
index 380efe1d0a2b..11f18da3c979 100644
--- a/include/svtools/soerr.hxx
+++ b/include/svtools/soerr.hxx
@@ -20,10 +20,8 @@
 #define INCLUDED_SVTOOLS_SOERR_HXX
 
 #include <vcl/errcode.hxx>
-#ifndef __RSC
 #include <svtools/ehdl.hxx>
 #include <svtools/svtdllapi.h>
-#endif
 
 // error codes
 #define SO_ERR(x) ErrCode(ERRCODE_AREA_SO | ERRCODE_CLASS_SO | x)
@@ -39,10 +37,8 @@
 // error contexts
 #define ERRCTX_SO_DOVERB        1
 
-#ifndef __RSC
 SVT_DLLPUBLIC const ErrMsgCode* getRID_SO_ERROR_HANDLER();
 SVT_DLLPUBLIC const ErrMsgCode* getRID_SO_ERRCTX();
-#endif
 
 #endif