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 /reportdesign | |
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 'reportdesign')
21 files changed, 23 insertions, 23 deletions
diff --git a/reportdesign/inc/helpids.hrc b/reportdesign/inc/helpids.h index aaa488316fe4..9f481d4eb389 100644 --- a/reportdesign/inc/helpids.hrc +++ b/reportdesign/inc/helpids.h @@ -16,8 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef RTPUI_REPORTDESIGN_HELPID_HRC -#define RTPUI_REPORTDESIGN_HELPID_HRC +#ifndef RTPUI_REPORTDESIGN_HELPIDS_H +#define RTPUI_REPORTDESIGN_HELPIDS_H #define UID_RPT_PROP_FORMULA "REPORTDESIGN_UID_RPT_PROP_FORMULA" #define UID_RPT_RPT_PROP_DLG_FONT_TYPE "REPORTDESIGN_UID_RPT_RPT_PROP_DLG_FONT_TYPE" diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 2092c538a2ee..e08e89b8763b 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -34,7 +34,7 @@ #include <connectivity/dbtools.hxx> #include "core_resource.hxx" -#include "helpids.hrc" +#include "helpids.h" #include "strings.hrc" #include "strings.hxx" #include "ColumnInfo.hxx" diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx index 3ac4e1581c24..649bd076584d 100644 --- a/reportdesign/source/ui/dlg/CondFormat.cxx +++ b/reportdesign/source/ui/dlg/CondFormat.cxx @@ -23,7 +23,7 @@ #include "strings.hrc" #include "rptui_slotid.hrc" #include "core_resource.hxx" -#include "helpids.hrc" +#include "helpids.h" #include "UITools.hxx" #include "ReportController.hxx" #include "Condition.hxx" diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index fcec991d2348..8c9b93a2892c 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -24,7 +24,7 @@ #include "strings.hrc" #include "ReportController.hxx" #include "ColorChanger.hxx" -#include "helpids.hrc" +#include "helpids.h" #include "reportformula.hxx" #include <com/sun/star/util/URL.hpp> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index 7e5639e6cd34..f5e0d4c3aa5b 100644 --- a/reportdesign/source/ui/dlg/DateTime.cxx +++ b/reportdesign/source/ui/dlg/DateTime.cxx @@ -20,7 +20,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include "strings.hrc" #include "rptui_slotid.hrc" -#include "helpids.hrc" +#include "helpids.h" #include <vcl/msgbox.hxx> #include <connectivity/dbconversion.hxx> #include <unotools/syslocale.hxx> diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index 738d63f84b00..aa82762f1956 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -32,7 +32,7 @@ #include "Formula.hxx" #include "AddField.hxx" -#include "helpids.hrc" +#include "helpids.h" namespace rptui diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 5bd6b8b632a9..59c7de1376b8 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -29,7 +29,7 @@ #include "strings.hrc" #include "rptui_slotid.hrc" #include "core_resource.hxx" -#include "helpids.hrc" +#include "helpids.h" #include "GroupExchange.hxx" #include "UITools.hxx" #include "UndoActions.hxx" diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index cdefb2f4bd25..590f521dd16e 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -32,7 +32,7 @@ #include <com/sun/star/report/XFormattedField.hpp> #include <com/sun/star/report/XImageControl.hpp> #include <com/sun/star/report/XShape.hpp> -#include "helpids.hrc" +#include "helpids.h" #include "strings.hrc" #include "rptui_slotid.hrc" #include <comphelper/propmultiplex.hxx> diff --git a/reportdesign/source/ui/dlg/PageNumber.cxx b/reportdesign/source/ui/dlg/PageNumber.cxx index 184b8040e390..04cb43486cdf 100644 --- a/reportdesign/source/ui/dlg/PageNumber.cxx +++ b/reportdesign/source/ui/dlg/PageNumber.cxx @@ -21,7 +21,7 @@ #include "strings.hrc" #include "rptui_slotid.hrc" #include "RptDef.hxx" -#include "helpids.hrc" +#include "helpids.h" #include <vcl/msgbox.hxx> #include <vcl/settings.hxx> diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index b7eec893da1c..5a04e5e2b7dc 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -48,7 +48,7 @@ #include <vcl/svapp.hxx> #include <osl/mutex.hxx> #include "core_resource.hxx" -#include "helpids.hrc" +#include "helpids.h" #include "strings.hrc" #include "PropertyForward.hxx" diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx index b832c74bc759..97f300808af0 100644 --- a/reportdesign/source/ui/inspection/DefaultInspection.cxx +++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx @@ -21,7 +21,7 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <strings.hrc> #include "core_resource.hxx" -#include "helpids.hrc" +#include "helpids.h" #include <cppuhelper/supportsservice.hxx> #include <rtl/ustrbuf.hxx> #include <tools/debug.hxx> diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index 0b409b0a5767..bddbca41e963 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -102,7 +102,7 @@ #include <sfx2/docfilt.hxx> #include "dlgpage.hxx" -#include "helpids.hrc" +#include "helpids.h" #include <toolkit/helper/convert.hxx> #include <o3tl/functional.hxx> diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx index adae3e8f6505..adecc3298a23 100644 --- a/reportdesign/source/ui/inspection/metadata.cxx +++ b/reportdesign/source/ui/inspection/metadata.cxx @@ -20,7 +20,7 @@ #include <com/sun/star/inspection/XPropertyHandler.hpp> #include <comphelper/extract.hxx> #include "core_resource.hxx" -#include "helpids.hrc" +#include "helpids.h" #include "strings.hrc" #include "strings.hxx" diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index 83233bb7e67f..5308afb42fa7 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -28,7 +28,7 @@ #include "RptObject.hxx" #include "propbrw.hxx" #include <toolkit/helper/convert.hxx> -#include "helpids.hrc" +#include "helpids.h" #include "SectionView.hxx" #include "ReportSection.hxx" #include "rptui_slotid.hrc" diff --git a/reportdesign/source/ui/report/EndMarker.cxx b/reportdesign/source/ui/report/EndMarker.cxx index 63f23e09c0d9..99580472a49f 100644 --- a/reportdesign/source/ui/report/EndMarker.cxx +++ b/reportdesign/source/ui/report/EndMarker.cxx @@ -19,7 +19,7 @@ #include "EndMarker.hxx" #include "ColorChanger.hxx" #include "SectionWindow.hxx" -#include "helpids.hrc" +#include "helpids.h" #include <vcl/settings.hxx> #include <vcl/svapp.hxx> diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 2e0a68235562..d9d7b802bfb7 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -83,7 +83,7 @@ #include <svx/fmview.hxx> #include <editeng/paperinf.hxx> -#include <editeng/memberids.hrc> +#include <editeng/memberids.h> #include <svx/svxids.hrc> #include <svx/svdobj.hxx> #include <svx/dataaccessdescriptor.hxx> @@ -144,7 +144,7 @@ #include <cppuhelper/exc_hlp.hxx> #include <unotools/confignode.hxx> -#include <helpids.hrc> +#include <helpids.h> #include <ReportControllerObserver.hxx> diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 7363f3eaaf9d..229e2506ed98 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -49,7 +49,7 @@ #include <toolkit/helper/convert.hxx> #include "RptDef.hxx" #include "SectionWindow.hxx" -#include "helpids.hrc" +#include "helpids.h" #include "strings.hrc" #include "dlgedclip.hxx" #include "UndoActions.hxx" diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx index 6513c2cba02c..b7e5cb68c72c 100644 --- a/reportdesign/source/ui/report/ReportWindow.cxx +++ b/reportdesign/source/ui/report/ReportWindow.cxx @@ -39,7 +39,7 @@ #include "ColorChanger.hxx" #include "ScrollHelper.hxx" -#include "helpids.hrc" +#include "helpids.h" #include "dlgedfac.hxx" #include <toolkit/helper/vclunohelper.hxx> diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx index ebcc09695dbb..dcf30ca73fad 100644 --- a/reportdesign/source/ui/report/SectionWindow.cxx +++ b/reportdesign/source/ui/report/SectionWindow.cxx @@ -26,7 +26,7 @@ #include "DesignView.hxx" #include "strings.hxx" #include "core_resource.hxx" -#include "helpids.hrc" +#include "helpids.h" #include "strings.hrc" #include "StartMarker.hxx" #include "EndMarker.hxx" diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx index ac3c7b5a6221..ad1d946e5b9f 100644 --- a/reportdesign/source/ui/report/StartMarker.cxx +++ b/reportdesign/source/ui/report/StartMarker.cxx @@ -24,7 +24,7 @@ #include "ColorChanger.hxx" #include "ReportDefines.hxx" #include "SectionWindow.hxx" -#include "helpids.hrc" +#include "helpids.h" #include <vcl/help.hxx> #include <vcl/gradient.hxx> #include <vcl/lineinfo.hxx> diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index b97a72d1efa2..3c634affa6c2 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -40,7 +40,7 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include "core_resource.hxx" -#include "helpids.hrc" +#include "helpids.h" #include <svx/svdundo.hxx> #include <toolkit/helper/convert.hxx> #include <algorithm> |