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 /desktop | |
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 'desktop')
-rw-r--r-- | desktop/source/app/app.cxx | 2 | ||||
-rw-r--r-- | desktop/source/deployment/gui/dp_gui_dialog2.cxx | 4 | ||||
-rw-r--r-- | desktop/source/inc/helpids.h (renamed from desktop/source/inc/helpid.hrc) | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 927912fcdc67..e19227314202 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -105,7 +105,7 @@ #include <vcl/help.hxx> #include <vcl/layout.hxx> #include <vcl/settings.hxx> -#include <sfx2/sfx.hrc> +#include <sfx2/sfxsids.hrc> #include <sfx2/app.hxx> #include <sfx2/safemode.hxx> #include <svl/itemset.hxx> diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 04bd0a2354f7..e80eb3c8ddcd 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -18,7 +18,7 @@ */ #include "strings.hrc" -#include "helpid.hrc" +#include "helpids.h" #include <svtools/controldims.hxx> #include <svtools/strings.hrc> @@ -34,7 +34,7 @@ #include "dp_identifier.hxx" #include "dp_descriptioninfoset.hxx" -#include "fpicker/fpicker.hrc" +#include "fpicker/strings.hrc" #include <vcl/ctrl.hxx> #include <vcl/menu.hxx> diff --git a/desktop/source/inc/helpid.hrc b/desktop/source/inc/helpids.h index 41c7893c6927..6f60038124b4 100644 --- a/desktop/source/inc/helpid.hrc +++ b/desktop/source/inc/helpids.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_HELPID_HRC -#define INCLUDED_DESKTOP_HELPID_HRC +#ifndef INCLUDED_DESKTOP_HELPIDS_H +#define INCLUDED_DESKTOP_HELPIDS_H #define HID_EXTENSION_MANAGER_LISTBOX_ENABLE "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_ENABLE" #define HID_EXTENSION_MANAGER_LISTBOX_DISABLE "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_DISABLE" |