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

23 files changed, 24 insertions, 59 deletions

diff --git a/sc/inc/cfgids.hxx b/sc/inc/cfgids.hxx
deleted file mode 100644
index 7f8db9f760db..000000000000
--- a/sc/inc/cfgids.hxx
+++ /dev/null
@@ -1,32 +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_SC_INC_CFGIDS_HXX
-#define INCLUDED_SC_INC_CFGIDS_HXX
-
-#define SCCFG_VIEW              (SFX_ITEMTYPE_SC_BEGIN + 1)
-#define SCCFG_APP               (SFX_ITEMTYPE_SC_BEGIN + 2)
-#define SCCFG_SPELLCHECK        (SFX_ITEMTYPE_SC_BEGIN + 3)
-#define SCCFG_PRINT             (SFX_ITEMTYPE_SC_BEGIN + 4)
-#define SCCFG_STATUSBAR         (SFX_ITEMTYPE_SC_BEGIN + 5)
-#define SCCFG_INPUT             (SFX_ITEMTYPE_SC_BEGIN + 8)
-#define SCCFG_NAVIPI            (SFX_ITEMTYPE_SC_BEGIN + 9)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 780470cc5f89..00190964cbe9 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#ifndef INCLUDED_SC_INC_HELPIDS_H
+#define INCLUDED_SC_INC_HELPIDS_H
+
 #include <svx/svxcommands.h>
 
 #define HID_INSWIN_POS                                          "SC_HID_INSWIN_POS"
@@ -585,4 +588,6 @@
 #define HID_FUNC_ROUNDSIG                                       "SC_HID_FUNC_ROUNDSIG"
 #define HID_FUNC_REPLACEB                                       "SC_HID_FUNC_REPLACEB"
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/mid.hrc b/sc/inc/mid.h
index a4c78e3442d0..441f004c7358 100644
--- a/sc/inc/mid.hrc
+++ b/sc/inc/mid.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SC_MID_HRC
-#define SC_MID_HRC
+#ifndef SC_MID_H
+#define SC_MID_H
 
 #define MID_1   1
 #define MID_2   2
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 9b5925b5e4ff..7cd95f8d0507 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -20,7 +20,7 @@
 #ifndef SC_SC_HRC
 #define SC_SC_HRC
 
-#include <sfx2/sfx.hrc>
+#include <sfx2/sfxsids.hrc>
 #include <svx/svxids.hrc>
 
 #include "svx/svxcommands.h"
diff --git a/sc/inc/scres.hrc b/sc/inc/scres.hrc
index dfc56306c8be..62aa3906b7d0 100644
--- a/sc/inc/scres.hrc
+++ b/sc/inc/scres.hrc
@@ -21,7 +21,7 @@
 #define SC_SCRES_HRC
 
 #include "sc.hrc"
-#include "formula/compiler.hrc"
+#include "formula/compiler.hxx"
 
 #define STR_START               (SC_RESOURCE_START+100)
 
diff --git a/sc/sdi/scslots.hrc b/sc/sdi/scslots.hrc
index 1dc2fc803cd0..4697d1d17d38 100644
--- a/sc/sdi/scslots.hrc
+++ b/sc/sdi/scslots.hrc
@@ -16,12 +16,11 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include <sfx2/sfx.hrc>
 #include <sfx2/sfxsids.hrc>
 #include <svx/svxids.hrc>
 #include <editeng/editids.hrc>
-#include <editeng/memberids.hrc>
+#include <editeng/memberids.h>
 #include <sc.hrc>
-#include <mid.hrc>
+#include <mid.h>
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
index cdee5adcadd5..f3018ef88262 100644
--- a/sc/source/core/data/attrib.cxx
+++ b/sc/source/core/data/attrib.cxx
@@ -36,7 +36,7 @@
 #include "global.hxx"
 #include "editutil.hxx"
 #include "sc.hrc"
-#include "mid.hrc"
+#include "mid.h"
 #include "globstr.hrc"
 #include "textuno.hxx"
 
diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx
index 68071edbafba..541d81491379 100644
--- a/sc/source/core/data/funcdesc.cxx
+++ b/sc/source/core/data/funcdesc.cxx
@@ -43,7 +43,7 @@
 struct ScFuncDescCore
 {
     /*
-     * An opcode from include/formula/compiler.hrc
+     * An opcode from include/formula/compiler.hxx
      */
     sal_uInt16 nOpCode;
     /*
diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx
index 1f726f5c1828..885415708afa 100644
--- a/sc/source/core/tool/appoptio.cxx
+++ b/sc/source/core/tool/appoptio.cxx
@@ -21,14 +21,13 @@
 
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include "cfgids.hxx"
 #include "appoptio.hxx"
 #include "rechead.hxx"
 #include "scresid.hxx"
 #include "global.hxx"
 #include "userlist.hxx"
 #include "sc.hrc"
-#include <formula/compiler.hrc>
+#include <formula/compiler.hxx>
 #include "miscuno.hxx"
 #include <memory>
 
diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx
index 08a03c514bec..659fb16f22ce 100644
--- a/sc/source/core/tool/docoptio.cxx
+++ b/sc/source/core/tool/docoptio.cxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
-#include "cfgids.hxx"
 #include "docoptio.hxx"
 #include "rechead.hxx"
 #include "scresid.hxx"
diff --git a/sc/source/core/tool/inputopt.cxx b/sc/source/core/tool/inputopt.cxx
index b2cdf34646b4..fe52c6270401 100644
--- a/sc/source/core/tool/inputopt.cxx
+++ b/sc/source/core/tool/inputopt.cxx
@@ -21,7 +21,6 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <osl/diagnose.h>
 
-#include "cfgids.hxx"
 #include "inputopt.hxx"
 #include "rechead.hxx"
 #include "scresid.hxx"
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 39ddeae9ac9e..07573bc8175e 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -33,7 +33,7 @@
 #include "compiler.hxx"
 #include "interpre.hxx"
 #include <formula/FormulaCompiler.hxx>
-#include <formula/compiler.hrc>
+#include <formula/compiler.hxx>
 #include <formula/grammar.hxx>
 #include <formula/opcode.hxx>
 #include <formulagroup.hxx>
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index 7da2ef077958..d9715ba8903a 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -24,7 +24,6 @@
 
 #include "global.hxx"
 #include "globstr.hrc"
-#include "cfgids.hxx"
 #include "viewopti.hxx"
 #include "rechead.hxx"
 #include "scresid.hxx"
diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx
index 07fa32091e78..24b852def5b0 100644
--- a/sc/source/filter/excel/xlchart.cxx
+++ b/sc/source/filter/excel/xlchart.cxx
@@ -45,7 +45,7 @@
 #include <svx/xbtmpit.hxx>
 #include <svx/unomid.hxx>
 #include <filter/msfilter/escherex.hxx>
-#include <editeng/memberids.hrc>
+#include <editeng/memberids.h>
 #include "global.hxx"
 #include "xlroot.hxx"
 #include "xlstyle.hxx"
diff --git a/sc/source/filter/xml/editattributemap.cxx b/sc/source/filter/xml/editattributemap.cxx
index 518a37b988e7..fa3e19eea4b3 100644
--- a/sc/source/filter/xml/editattributemap.cxx
+++ b/sc/source/filter/xml/editattributemap.cxx
@@ -10,7 +10,7 @@
 #include "editattributemap.hxx"
 
 #include <editeng/eeitem.hxx>
-#include <editeng/memberids.hrc>
+#include <editeng/memberids.h>
 #include <xmloff/xmlnmspe.hxx>
 
 ScXMLEditAttributeMap::Entry const aEntries[] = {
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 2d9646a21150..eade695e1c20 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -58,7 +58,7 @@
 #include "docsh.hxx"
 #include "appoptio.hxx"
 #include "rangenam.hxx"
-#include <formula/compiler.hrc>
+#include <formula/compiler.hxx>
 #include "dbdata.hxx"
 #include "rangeutl.hxx"
 #include "docfunc.hxx"
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 8dc2efb70498..747340e150bd 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -45,7 +45,6 @@
 #include "scmod.hxx"
 #include "scresid.hxx"
 #include "sc.hrc"
-#include "cfgids.hxx"
 
 #include "docsh.hxx"
 #include "tabvwsh.hxx"
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index f2b78808cc35..7b8a2cfd1f74 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -94,7 +94,6 @@
 #include "globstr.hrc"
 #include "strings.hrc"
 #include "bitmaps.hlst"
-#include "cfgids.hxx"
 #include "inputhdl.hxx"
 #include "inputwin.hxx"
 #include "msgpool.hxx"
@@ -135,7 +134,7 @@ void ScModule::InitInterface_Impl()
                                             SfxVisibilityFlags::Standard | SfxVisibilityFlags::Client | SfxVisibilityFlags::Viewer,
                                             ToolbarId::Objectbar_App);
 
-    GetStaticInterface()->RegisterStatusBar(SCCFG_STATUSBAR);
+    GetStaticInterface()->RegisterStatusBar(StatusBarId::CalcStatusBar);
 }
 
 ScModule::ScModule( SfxObjectFactory* pFact ) :
diff --git a/sc/source/ui/app/typemap.cxx b/sc/source/ui/app/typemap.cxx
index 9891495aea5f..280ac0517de6 100644
--- a/sc/source/ui/app/typemap.cxx
+++ b/sc/source/ui/app/typemap.cxx
@@ -21,9 +21,9 @@
 
 #include <svx/svxids.hrc>
 #include "sc.hrc"
-#include "mid.hrc"
+#include "mid.h"
 #include "scitems.hxx"
-#include <editeng/memberids.hrc>
+#include <editeng/memberids.h>
 
 #include <sfx2/msg.hxx>
 #include <svl/stritem.hxx>
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 3242b15b0a0d..2bc164829ec7 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -106,7 +106,6 @@
 #include "dbdata.hxx"
 #include "scextopt.hxx"
 #include "compiler.hxx"
-#include "cfgids.hxx"
 #include "warnpassword.hxx"
 #include "optsolver.hxx"
 #include "sheetdata.hxx"
diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx
index fe1e0d2553a1..01c78e5484fd 100644
--- a/sc/source/ui/unoobj/afmtuno.cxx
+++ b/sc/source/ui/unoobj/afmtuno.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "scitems.hxx"
-#include <editeng/memberids.hrc>
+#include <editeng/memberids.h>
 #include <svl/poolitem.hxx>
 #include <vcl/svapp.hxx>
 #include <svx/unomid.hxx>
diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx
index e245b9dd5c27..a976dd889384 100644
--- a/sc/source/ui/unoobj/defltuno.cxx
+++ b/sc/source/ui/unoobj/defltuno.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <editeng/memberids.hrc>
+#include <editeng/memberids.h>
 #include <svl/hint.hxx>
 #include <svl/itemprop.hxx>
 #include <svx/unomid.hxx>
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index 44cb888ff183..e0df47d8e92c 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "scitems.hxx"
-#include <editeng/memberids.hrc>
+#include <editeng/memberids.h>
 #include <svx/algitem.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/langitem.hxx>