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, 2 insertions, 109 deletions

diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 3de2fc529302..6046e44b8c37 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -20,9 +20,8 @@
 
 #include <memory>
 #include <svtools/addresstemplate.hxx>
-#include "addresstemplate.hrc"
 #include <svtools/strings.hrc>
-#include <svtools/helpid.hrc>
+#include <svtools/helpids.h>
 #include <svtools/svtresid.hxx>
 #include <tools/debug.hxx>
 #include <comphelper/interaction.hxx>
diff --git a/svtools/source/dialogs/addresstemplate.hrc b/svtools/source/dialogs/addresstemplate.hrc
deleted file mode 100644
index 4fa3059c998d..000000000000
--- a/svtools/source/dialogs/addresstemplate.hrc
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   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_SVTOOLS_SOURCE_DIALOGS_ADDRESSTEMPLATE_HRC
-#define INCLUDED_SVTOOLS_SOURCE_DIALOGS_ADDRESSTEMPLATE_HRC
-
-#define FIELD_PAIRS_VISIBLE         5
-#define FIELD_CONTROLS_VISIBLE      2 * FIELD_PAIRS_VISIBLE
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx
index 3317f5d81651..57ad496aab1f 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <svtools/wizardmachine.hxx>
-#include <svtools/helpid.hrc>
+#include <svtools/helpids.h>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/msgbox.hxx>
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index 31c80e9c50f2..d84c96a742b8 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -38,7 +38,6 @@
 #include <svtools/strings.hrc>
 #include <svtools/svtresid.hxx>
 #include <vcl/lazydelete.hxx>
-#include "imagemgr.hrc"
 #include "bitmaps.hlst"
 #include "strings.hxx"
 
diff --git a/svtools/source/misc/imagemgr.hrc b/svtools/source/misc/imagemgr.hrc
deleted file mode 100644
index 7862d3a03c83..000000000000
--- a/svtools/source/misc/imagemgr.hrc
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   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_SVTOOLS_IMAGEMGR_HRC
-#define INCLUDED_SVTOOLS_IMAGEMGR_HRC
-
-#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)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */