diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-07-16 15:05:04 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-07-21 08:20:51 +0100 |
commit | 182a74d937088f0f08850014a7b918719e106b7d (patch) | |
tree | 0a286f4a6a5adcd32fd32a26b61b247d247c93d2 /sc/source/ui/app | |
parent | migrate to boost::gettext (diff) | |
download | core-182a74d937088f0f08850014a7b918719e106b7d.tar.gz core-182a74d937088f0f08850014a7b918719e106b7d.zip |
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
Diffstat (limited to 'sc/source/ui/app')
-rw-r--r-- | sc/source/ui/app/inputwin.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/app/scdll.cxx | 1 | ||||
-rw-r--r-- | sc/source/ui/app/scmod.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/app/typemap.cxx | 4 |
4 files changed, 4 insertions, 6 deletions
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> |