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 /sw/source/ui/index | |
parent | 00657aef09d854c74fb426a935a3e8b1fc390bb0 (diff) |
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 'sw/source/ui/index')
-rw-r--r-- | sw/source/ui/index/cntex.cxx | 1 | ||||
-rw-r--r-- | sw/source/ui/index/cnttab.cxx | 3 | ||||
-rw-r--r-- | sw/source/ui/index/multmrk.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/index/swuiidxmrk.cxx | 3 |
4 files changed, 2 insertions, 7 deletions
diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx index 8b0ed87d09c2..55bdceb8ea52 100644 --- a/sw/source/ui/index/cntex.cxx +++ b/sw/source/ui/index/cntex.cxx @@ -46,7 +46,6 @@ #include <cmdid.h> #include <strings.hrc> -#include <index.hrc> #include <globals.hrc> #include <SwStyleNameMapper.hxx> #include <swuicnttab.hxx> diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 19490c9551db..a1b3eed4545f 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -65,9 +65,8 @@ #include <modcfg.hxx> #include <cmdid.h> -#include <helpid.h> +#include <helpids.h> #include <strings.hrc> -#include <index.hrc> #include <globals.hrc> #include <cnttab.hrc> #include <SwStyleNameMapper.hxx> diff --git a/sw/source/ui/index/multmrk.cxx b/sw/source/ui/index/multmrk.cxx index 41c99bf7f95e..239a345c6deb 100644 --- a/sw/source/ui/index/multmrk.cxx +++ b/sw/source/ui/index/multmrk.cxx @@ -22,8 +22,6 @@ #include "multmrk.hxx" #include "toxmgr.hxx" -#include "index.hrc" - SwMultiTOXMarkDlg::SwMultiTOXMarkDlg(vcl::Window* pParent, SwTOXMgr& rTOXMgr) : SvxStandardDialog(pParent, "SelectIndexDialog", "modules/swriter/ui/selectindexdialog.ui") diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 7e133a3d0217..13bef9bbd156 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -19,7 +19,7 @@ #include "swuiidxmrk.hxx" #include <hintids.hxx> -#include <helpid.h> +#include <helpids.h> #include <comphelper/processfactory.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -47,7 +47,6 @@ #include <swundo.hxx> #include <cmdid.h> #include <app.hrc> -#include <index.hrc> #include <swmodule.hxx> #include <fldmgr.hxx> #include <fldbas.hxx> |