diff options
724 files changed, 1990 insertions, 4396 deletions
diff --git a/avmedia/inc/helpids.hrc b/avmedia/inc/helpids.h index f7152de0621f..3d9a8c782369 100644 --- a/avmedia/inc/helpids.hrc +++ b/avmedia/inc/helpids.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_AVMEDIA_INC_HELPIDS_HRC -#define INCLUDED_AVMEDIA_INC_HELPIDS_HRC +#ifndef INCLUDED_AVMEDIA_INC_HELPIDS_H +#define INCLUDED_AVMEDIA_INC_HELPIDS_H #define HID_AVMEDIA_TOOLBOXITEM_PLAY "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PLAY" #define HID_AVMEDIA_TOOLBOXITEM_PAUSE "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PAUSE" diff --git a/avmedia/source/framework/MediaControlBase.cxx b/avmedia/source/framework/MediaControlBase.cxx index ba848c050915..09bd5bf146af 100644 --- a/avmedia/source/framework/MediaControlBase.cxx +++ b/avmedia/source/framework/MediaControlBase.cxx @@ -28,7 +28,7 @@ #include <vcl/lstbox.hxx> #include "bitmaps.hlst" #include "strings.hrc" -#include "helpids.hrc" +#include "helpids.h" #include "mediamisc.hxx" using ::rtl::OUString; diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index c5695c4f185a..614430a325ae 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -22,7 +22,7 @@ #include "mediamisc.hxx" #include <avmedia/mediawindow.hxx> #include <avmedia/mediaplayer.hxx> -#include "helpids.hrc" +#include "helpids.h" #include <tools/time.hxx> #include <svtools/miscopt.hxx> #include <vcl/svapp.hxx> diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx index 6cce70f2e026..a544d5103fc0 100644 --- a/avmedia/source/framework/mediaplayer.cxx +++ b/avmedia/source/framework/mediaplayer.cxx @@ -22,7 +22,7 @@ #include <avmedia/mediaitem.hxx> #include "mediamisc.hxx" #include "strings.hrc" -#include "helpids.hrc" +#include "helpids.h" #include <svl/stritem.hxx> #include <sfx2/app.hxx> diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 13eb6626774f..78f709850861 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -25,7 +25,7 @@ #include "mediamisc.hxx" #include "strings.hrc" #include "bitmaps.hlst" -#include "helpids.hrc" +#include "helpids.h" #include <algorithm> #include <cmath> diff --git a/basctl/inc/helpid.hrc b/basctl/inc/helpids.h index 3bafa9769a10..1753df0a9ab5 100644 --- a/basctl/inc/helpid.hrc +++ b/basctl/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 INCLUDED_BASCTL_INC_HELPID_HRC -#define INCLUDED_BASCTL_INC_HELPID_HRC +#ifndef INCLUDED_BASCTL_INC_HELPIDS_H +#define INCLUDED_BASCTL_INC_HELPIDS_H #define HID_BASICIDE_OBJECTCAT "BASCTL_HID_BASICIDE_OBJECTCAT" diff --git a/basctl/sdi/basslots.hrc b/basctl/sdi/basslots.hrc index 4d3b2341c6cc..3056ec844a14 100644 --- a/basctl/sdi/basslots.hrc +++ b/basctl/sdi/basslots.hrc @@ -18,6 +18,6 @@ */ #include <svx/svxids.hrc> -#include <editeng/memberids.hrc> +#include <editeng/memberids.h> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx index 7d9f76f9305a..54560793133d 100644 --- a/basctl/source/basicide/basdoc.cxx +++ b/basctl/source/basicide/basdoc.cxx @@ -44,7 +44,7 @@ SFX_IMPL_SUPERCLASS_INTERFACE(basctl_DocShell, SfxObjectShell) void basctl_DocShell::InitInterface_Impl() { - GetStaticInterface()->RegisterStatusBar(SID_BASICIDE_STATUSBAR); + GetStaticInterface()->RegisterStatusBar(StatusBarId::BasicIdeStatusBar); } DocShell::DocShell() diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index b8bfd80a0970..b3b3c44e23e2 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -25,7 +25,7 @@ #include "docsignature.hxx" #include "officecfg/Office/BasicIDE.hxx" -#include "helpid.hrc" +#include "helpids.h" #include <strings.hrc> #include <basic/basmgr.hxx> diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 330feefdfd8c..631ab8a576e8 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -21,7 +21,7 @@ #include <cassert> -#include "helpid.hrc" +#include "helpids.h" #include <strings.hrc> #include "bitmaps.hlst" diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index 4fe135056e02..29b47d78739b 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -18,7 +18,7 @@ */ #include "strings.hrc" -#include "helpid.hrc" +#include "helpids.h" #include "accessibledialogwindow.hxx" #include "baside3.hxx" diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index 000a43cdeecc..d1083a607380 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -19,7 +19,7 @@ #include <memory> #include "strings.hrc" -#include "helpid.hrc" +#include "helpids.h" #include "baside2.hxx" #include "baside3.hxx" diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index 27f852cd7b46..4873d8663b34 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -18,7 +18,7 @@ */ #include "strings.hrc" -#include "helpid.hrc" +#include "helpids.h" #include "baside2.hxx" #include "baside3.hxx" diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx index 292ff3bf000c..45c6353678d2 100644 --- a/basctl/source/basicide/objdlg.cxx +++ b/basctl/source/basicide/objdlg.cxx @@ -20,7 +20,7 @@ #include "strings.hrc" #include "objdlg.hxx" -#include "helpid.hrc" +#include "helpids.h" #include <svl/itemset.hxx> #include <vcl/taskpanelist.hxx> diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx index ba6912605404..b603bf41781c 100644 --- a/basctl/source/dlged/managelang.cxx +++ b/basctl/source/dlged/managelang.cxx @@ -24,7 +24,7 @@ #include "localizationmgr.hxx" #include "managelang.hxx" -#include "helpid.hrc" +#include "helpids.h" #include "strings.hrc" #include <com/sun/star/i18n/Boundary.hpp> diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index 9fa2399a1695..58b28cd88c81 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -19,7 +19,7 @@ #include "ChartTypeDialogController.hxx" #include "ResId.hxx" -#include "HelpIds.hrc" +#include "helpids.h" #include "strings.hrc" #include "bitmaps.hlst" #include "macros.hxx" diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index c371944f2a3f..bff4b4f2c6d6 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -32,7 +32,7 @@ #include "servicenames_charttypes.hxx" #include "ResId.hxx" #include "bitmaps.hlst" -#include "HelpIds.hrc" +#include "helpids.h" #include <vcl/fixed.hxx> #include <vcl/image.hxx> diff --git a/chart2/source/controller/dialogs/ResourceIds.hrc b/chart2/source/controller/dialogs/TabPageIds.h index dd027e2b025d..0058fd33e914 100644 --- a/chart2/source/controller/dialogs/ResourceIds.hrc +++ b/chart2/source/controller/dialogs/TabPageIds.h @@ -17,11 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_RESOURCEIDS_HRC -#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_RESOURCEIDS_HRC - -//for strings see Strings.hrc -//for Bitmaps see bitmaps.hlst +#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TABPAGEIDS_H +#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TABPAGEIDS_H //TabPage Ids: #define TP_LEGEND_POS 900 diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx index 95875642303a..a062e768fe5e 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx @@ -19,7 +19,7 @@ #include "dlg_ChartType.hxx" #include "ResId.hxx" -#include "ResourceIds.hrc" +#include "TabPageIds.h" #include "strings.hrc" #include "tp_ChartType.hxx" #include "macros.hxx" diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx index d2198e8653e9..180af39f4b56 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx @@ -21,7 +21,7 @@ #include "ResId.hxx" #include "macros.hxx" #include "strings.hrc" -#include "HelpIds.hrc" +#include "helpids.h" #include "tp_ChartType.hxx" #include "tp_RangeChooser.hxx" diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx index 28c5383915ec..d2b6c275e959 100644 --- a/chart2/source/controller/dialogs/dlg_DataSource.cxx +++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx @@ -23,7 +23,7 @@ #include "ChartTypeTemplateProvider.hxx" #include "DiagramHelper.hxx" #include "DialogModel.hxx" -#include "HelpIds.hrc" +#include "helpids.h" #include "tp_RangeChooser.hxx" #include "tp_DataSource.hxx" diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx index 4ef50442f07c..93c1a7abfa6f 100644 --- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx @@ -21,7 +21,7 @@ #include "ResId.hxx" #include "chartview/ChartSfxItemIds.hxx" -#include "HelpIds.hrc" +#include "helpids.h" #include "ObjectNameProvider.hxx" #include <svl/eitem.hxx> diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index ff2ca208628a..07d8e5564dde 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -19,7 +19,7 @@ #include <svl/zforlist.hxx> #include "dlg_ObjectProperties.hxx" -#include "ResourceIds.hrc" +#include "TabPageIds.h" #include "strings.hrc" #include "tp_AxisLabel.hxx" #include "tp_DataLabel.hxx" diff --git a/chart2/source/controller/dialogs/dlg_ShapeFont.cxx b/chart2/source/controller/dialogs/dlg_ShapeFont.cxx index c8a6086b28b0..5b0c8ef2fec5 100644 --- a/chart2/source/controller/dialogs/dlg_ShapeFont.cxx +++ b/chart2/source/controller/dialogs/dlg_ShapeFont.cxx @@ -20,7 +20,7 @@ #include "dlg_ShapeFont.hxx" #include "ViewElementListProvider.hxx" #include "ResId.hxx" -#include "ResourceIds.hrc" +#include "TabPageIds.h" #include <svl/intitem.hxx> #include <sfx2/objsh.hxx> diff --git a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx index a0f0987bf130..1cb58f49a779 100644 --- a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx +++ b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx @@ -19,7 +19,7 @@ #include "dlg_ShapeParagraph.hxx" #include "ResId.hxx" -#include "ResourceIds.hrc" +#include "TabPageIds.h" #include <svl/cjkoptions.hxx> #include <svl/intitem.hxx> diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx index a1988be2c8da..39f81f1bd5b5 100644 --- a/chart2/source/controller/dialogs/dlg_View3D.cxx +++ b/chart2/source/controller/dialogs/dlg_View3D.cxx @@ -19,7 +19,7 @@ #include "dlg_View3D.hxx" #include "strings.hrc" -#include "ResourceIds.hrc" +#include "TabPageIds.h" #include "ResId.hxx" #include "tp_3D_SceneGeometry.hxx" #include "tp_3D_SceneAppearance.hxx" diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx index 4e73d7c0ff9f..c3ddea101128 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar.cxx +++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx @@ -23,7 +23,7 @@ #include "RangeSelectionHelper.hxx" #include "TabPageNotifiable.hxx" #include "macros.hxx" -#include "HelpIds.hrc" +#include "helpids.h" #include <rtl/math.hxx> #include <vcl/dialog.hxx> diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx index 7b4c914ed99d..56b8f28c4d89 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx @@ -20,7 +20,7 @@ #include "tp_AxisLabel.hxx" #include "ResId.hxx" -#include "ResourceIds.hrc" +#include "TabPageIds.h" #include "chartview/ChartSfxItemIds.hxx" #include <svx/chrtitem.hxx> diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index 2ec01fff1e0c..6998113199cb 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -20,7 +20,7 @@ #include "tp_AxisPositions.hxx" #include "ResId.hxx" -#include "ResourceIds.hrc" +#include "TabPageIds.h" #include "strings.hrc" #include "chartview/ChartSfxItemIds.hxx" #include "AxisHelper.hxx" diff --git a/chart2/source/controller/dialogs/tp_DataLabel.cxx b/chart2/source/controller/dialogs/tp_DataLabel.cxx index 432290d78201..218caef5e66e 100644 --- a/chart2/source/controller/dialogs/tp_DataLabel.cxx +++ b/chart2/source/controller/dialogs/tp_DataLabel.cxx @@ -19,7 +19,7 @@ #include "tp_DataLabel.hxx" -#include "ResourceIds.hrc" +#include "TabPageIds.h" #include "ResId.hxx" namespace chart diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.cxx b/chart2/source/controller/dialogs/tp_ErrorBars.cxx index adac35ea9c87..24ae2b3fa1e2 100644 --- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx +++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx @@ -19,7 +19,7 @@ #include "tp_ErrorBars.hxx" #include "ResId.hxx" -#include "ResourceIds.hrc" +#include "TabPageIds.h" #include "TabPageNotifiable.hxx" #include <vcl/settings.hxx> diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx index c6967e8cc3f5..659ffcb645af 100644 --- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx @@ -19,7 +19,7 @@ #include "tp_LegendPosition.hxx" #include "ResId.hxx" -#include "ResourceIds.hrc" +#include "TabPageIds.h" #include "res_LegendPosition.hxx" #include "chartview/ChartSfxItemIds.hxx" #include <svx/chrtitem.hxx> diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx index a3925adbf5d9..34056ec9de3b 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx @@ -18,7 +18,7 @@ */ #include "tp_PointGeometry.hxx" -#include "ResourceIds.hrc" +#include "TabPageIds.h" #include "res_BarGeometry.hxx" #include "ResId.hxx" diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx index 535ea60a1827..9e966778871c 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx @@ -20,9 +20,9 @@ #include "tp_TitleRotation.hxx" #include "ResId.hxx" -#include "ResourceIds.hrc" +#include "TabPageIds.h" #include "chartview/ChartSfxItemIds.hxx" -#include "HelpIds.hrc" +#include "helpids.h" #include <editeng/eeitem.hxx> #include <editeng/frmdiritem.hxx> diff --git a/chart2/source/controller/dialogs/tp_Trendline.cxx b/chart2/source/controller/dialogs/tp_Trendline.cxx index 34939d4a0d15..acc4c0ac67f8 100644 --- a/chart2/source/controller/dialogs/tp_Trendline.cxx +++ b/chart2/source/controller/dialogs/tp_Trendline.cxx @@ -19,7 +19,7 @@ #include "tp_Trendline.hxx" #include "ResId.hxx" -#include "ResourceIds.hrc" +#include "TabPageIds.h" #include <vcl/settings.hxx> namespace chart diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx index beeedc457cd0..a0e1b70ce273 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx @@ -22,7 +22,7 @@ #include "res_Titles.hxx" #include "res_LegendPosition.hxx" #include "ResId.hxx" -#include "HelpIds.hrc" +#include "helpids.h" #include "macros.hxx" #include "ChartModelHelper.hxx" #include "AxisHelper.hxx" diff --git a/chart2/source/controller/inc/ShapeController.hrc b/chart2/source/controller/inc/ShapeController.h index fbd1f6384380..392c28d2fe4c 100644 --- a/chart2/source/controller/inc/ShapeController.hrc +++ b/chart2/source/controller/inc/ShapeController.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 CHART_SHAPECONTROLLER_HRC -#define CHART_SHAPECONTROLLER_HRC +#ifndef CHART_SHAPECONTROLLER_H +#define CHART_SHAPECONTROLLER_H //Command Ids: #define COMMAND_ID_FORMAT_LINE 1 diff --git a/chart2/source/controller/inc/HelpIds.hrc b/chart2/source/controller/inc/helpids.h index 48616bb29210..2867867d6323 100644 --- a/chart2/source/controller/inc/HelpIds.hrc +++ b/chart2/source/controller/inc/helpids.h @@ -16,8 +16,9 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef CHART_HELPIDS_HRC -#define CHART_HELPIDS_HRC + +#ifndef CHART_HELPIDS_H +#define CHART_HELPIDS_H #define HID_SCH_WIN_DOCUMENT "CHART2_HID_SCH_WIN_DOCUMENT" #define HID_SCH_ERROR_BARS_FROM_DATA "CHART2_SCH_ERROR_BARS_FROM_DATA" diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx index 1a5a08f8209b..04094d243c1e 100644 --- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx @@ -22,7 +22,7 @@ #include "macros.hxx" #include "ItemPropertyMap.hxx" #include "RelativeSizeHelper.hxx" -#include <editeng/memberids.hrc> +#include <editeng/memberids.h> #include <editeng/eeitem.hxx> #include <editeng/udlnitem.hxx> #include <editeng/fontitem.hxx> diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx index 9a775fc20c49..130f63957250 100644 --- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx @@ -23,7 +23,7 @@ #include "ItemPropertyMap.hxx" #include "PropertyHelper.hxx" #include "CommonConverters.hxx" -#include <editeng/memberids.hrc> +#include <editeng/memberids.h> #include <svx/xflclit.hxx> #include <svx/xlnclit.hxx> #include <svx/xflbmtit.hxx> diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index dae7c1b6b8d8..c35cf55a067e 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -19,7 +19,7 @@ #include "ChartWindow.hxx" #include "ChartController.hxx" -#include "HelpIds.hrc" +#include "helpids.h" #include "uiobject.hxx" #include <vcl/help.hxx> diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx index b68d2b7c0737..3d3803e4d266 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.cxx +++ b/chart2/source/controller/main/DrawCommandDispatch.cxx @@ -18,7 +18,7 @@ */ #include "DrawCommandDispatch.hxx" -#include "DrawCommandDispatch.hrc" +#include "DrawCommandDispatch.h" #include "ChartController.hxx" #include "DrawViewWrapper.hxx" #include "chartview/DrawModelWrapper.hxx" diff --git a/chart2/source/controller/main/DrawCommandDispatch.hrc b/chart2/source/controller/main/DrawCommandDispatch.h index faf70bde1047..faf70bde1047 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.hrc +++ b/chart2/source/controller/main/DrawCommandDispatch.h diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index ec3fc0a4c583..17b4aaf2b0ea 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -18,7 +18,7 @@ */ #include "ShapeController.hxx" -#include "ShapeController.hrc" +#include "ShapeController.h" #include "ChartController.hxx" #include "ChartWindow.hxx" #include "ViewElementListProvider.hxx" diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx index 6a91b6cc8e20..a22074963513 100644 --- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx @@ -27,7 +27,6 @@ #include "FDatabaseMetaDataResultSet.hxx" #include <comphelper/types.hxx> #include "TPrivilegesResultSet.hxx" -#include "resource/conn_shared_res.hrc" #include "strings.hxx" using namespace ::comphelper; diff --git a/connectivity/source/drivers/jdbc/JBigDecimal.cxx b/connectivity/source/drivers/jdbc/JBigDecimal.cxx index 36a3518fb396..acffce89b759 100644 --- a/connectivity/source/drivers/jdbc/JBigDecimal.cxx +++ b/connectivity/source/drivers/jdbc/JBigDecimal.cxx @@ -19,7 +19,6 @@ #include "java/math/BigDecimal.hxx" #include "java/tools.hxx" -#include "resource/conn_shared_res.hrc" using namespace connectivity; //************ Class: java.lang.Boolean diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx index 0f9ba8fb8f9e..ecd265d3f5dd 100644 --- a/connectivity/source/drivers/jdbc/JConnection.cxx +++ b/connectivity/source/drivers/jdbc/JConnection.cxx @@ -36,7 +36,6 @@ #include <connectivity/dbexception.hxx> #include "java/util/Property.hxx" #include "java/LocalRef.hxx" -#include "resource/conn_shared_res.hrc" #include <com/sun/star/uno/XComponentContext.hpp> #include <jvmaccess/classpath.hxx> #include <comphelper/namedvaluecollection.hxx> diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx index 74513dd5ed76..c05372db4942 100644 --- a/connectivity/source/drivers/jdbc/JDriver.cxx +++ b/connectivity/source/drivers/jdbc/JDriver.cxx @@ -26,7 +26,6 @@ #include "java/tools.hxx" #include <connectivity/dbexception.hxx> #include <jvmfwk/framework.hxx> -#include "resource/conn_shared_res.hrc" #include "strings.hrc" #include "resource/sharedresources.hxx" #include <comphelper/processfactory.hxx> diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx index fed0c3d7be15..6a66929c8fea 100644 --- a/connectivity/source/drivers/jdbc/JStatement.cxx +++ b/connectivity/source/drivers/jdbc/JStatement.cxx @@ -36,7 +36,6 @@ #include <com/sun/star/sdbc/ResultSetType.hpp> #include <com/sun/star/sdbc/FetchDirection.hpp> -#include "resource/conn_shared_res.hrc" #include "strings.hxx" #include <algorithm> diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx index 3b819d94cb65..d90f94cf61e8 100644 --- a/connectivity/source/drivers/jdbc/Object.cxx +++ b/connectivity/source/drivers/jdbc/Object.cxx @@ -25,7 +25,6 @@ #include "java/sql/SQLException.hxx" #include <osl/thread.h> #include "java/LocalRef.hxx" -#include "resource/conn_shared_res.hrc" #include "strings.hxx" #include <comphelper/logging.hxx> diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx index 6763c985283c..b64a9fade6c7 100644 --- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx +++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx @@ -30,7 +30,6 @@ #include <connectivity/dbtools.hxx> #include <connectivity/FValue.hxx> #include <connectivity/dbexception.hxx> -#include "resource/conn_shared_res.hrc" #include "strings.hrc" #include "resource/sharedresources.hxx" #include "java/LocalRef.hxx" diff --git a/connectivity/source/inc/resource/conn_shared_res.hrc b/connectivity/source/inc/resource/conn_shared_res.hrc deleted file mode 100644 index 9008b45bb495..000000000000 --- a/connectivity/source/inc/resource/conn_shared_res.hrc +++ /dev/null @@ -1,65 +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 CONNECTIVITY_SHARED_RES_HRC -#define CONNECTIVITY_SHARED_RES_HRC - -// = normal resource ids, per driver - -// Mozilla driver resource ids -#define STR_MOZAB_BASE 1000 -// either mozab or mork is actually used -#define STR_MORK_BASE 1000 - -// common resource ids -#define STR_COMMON_BASE 1200 - -// Spreadsheet driver resource ids -#define STR_CALC_BASE 1300 - -// DBase driver resource ids -#define STR_DBASE_BASE 1400 - -// ADO driver resource ids -#define STR_ADO_BASE 1450 - -// EVOAB2 driver resource ids -#define STR_EVOAB2_BASE 1500 - -// FILE driver resource ids -#define STR_FILE_BASE 1550 - -// KAB driver resource ids -#define STR_KAB_BASE 1600 - -// MACAB driver resource ids -#define STR_MACAB_BASE 1650 - -// hsqldb driver resource ids -#define STR_HSQLDB_BASE 1750 - -// = resource ids for log messages -#define STR_LOG_MESSAGE_BASE 10000 - -// log messages for the jdbc driver -#define STR_JDBC_LOG_MESSAGE_BASE STR_LOG_MESSAGE_BASE + 500 - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/inc/resource/jdbc_log.hrc b/connectivity/source/inc/resource/jdbc_log.hrc deleted file mode 100644 index 06b2a81b3f3b..000000000000 --- a/connectivity/source/inc/resource/jdbc_log.hrc +++ /dev/null @@ -1,27 +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 CONNECTIVITY_RESOURCE_JDBC_LOG_HRC -#define CONNECTIVITY_RESOURCE_JDBC_LOG_HRC - -#include "resource/conn_shared_res.hrc" - -#endif // CONNECTIVITY_RESOURCE_JDBC_LOG_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/inc/resource/kab_res.hrc b/connectivity/source/inc/resource/kab_res.hrc deleted file mode 100644 index 019e99449b9d..000000000000 --- a/connectivity/source/inc/resource/kab_res.hrc +++ /dev/null @@ -1,35 +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 CONNECTIVITY_RESOURCE_KAB_HRC -#define CONNECTIVITY_RESOURCE_KAB_HRC - -#include "resource/conn_shared_res.hrc" -#include "resource/common_res.hrc" - -// = the kab driver's resource strings - -#define STR_NO_KDE_INST ( STR_KAB_BASE + 0 ) -#define STR_KDE_VERSION_TOO_OLD ( STR_KAB_BASE + 1 ) -#define STR_KDE_VERSION_TOO_NEW ( STR_KAB_BASE + 2 ) -#define STR_KDE_VERSION_TOO_NEW_WORK_AROUND ( STR_KAB_BASE + 3 ) - -#endif // CONNECTIVITY_RESOURCE_KAB_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/inc/treeopt.hrc b/cui/inc/treeopt.hrc index 884a2543e543..aafb185e9f6f 100644 --- a/cui/inc/treeopt.hrc +++ b/cui/inc/treeopt.hrc @@ -20,6 +20,9 @@ #ifndef INCLUDED_CUI_INC_TREEOPT_HRC #define INCLUDED_CUI_INC_TREEOPT_HRC +#include <sal/types.h> +#include <sfx2/pageids.hxx> + #define NC_(Context, String) (Context "\004" u8##String) const std::pair<const char*, sal_uInt16> SID_GENERAL_OPTIONS_RES[] = diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx index b51b319b5ae7..26a16baee01c 100644 --- a/cui/source/customize/SvxMenuConfigPage.cxx +++ b/cui/source/customize/SvxMenuConfigPage.cxx @@ -53,9 +53,8 @@ #include <toolkit/helper/vclunohelper.hxx> #include <algorithm> -#include <cuires.hrc> #include <strings.hrc> -#include "helpid.hrc" +#include "helpids.h" #include "acccfg.hxx" #include "cfg.hxx" diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index bf83de09a634..b434ef282748 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -35,7 +35,6 @@ #include <sal/macros.h> #include <vcl/builderfactory.hxx> -#include "cuires.hrc" #include "strings.hrc" #include <sfx2/strings.hrc> #include <svx/svxids.hrc> diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 41c9cf7b6687..b26e077347bf 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -53,8 +53,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <algorithm> -#include <cuires.hrc> -#include "helpid.hrc" +#include "helpids.h" #include "strings.hrc" #include "acccfg.hxx" diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 1c630c16bee1..cd86a24b8cbd 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -36,7 +36,7 @@ #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/ui/theUICategoryDescription.hpp> -#include "helpid.hrc" +#include "helpids.h" #include <basic/sbx.hxx> #include <basic/basicmanagerrepository.hxx> #include <basic/sbstar.hxx> @@ -44,7 +44,6 @@ #include <basic/sbmod.hxx> #include <basic/basmgr.hxx> #include <tools/urlobj.hxx> -#include "cuires.hrc" #include "strings.hrc" #include "bitmaps.hlst" #include <sfx2/app.hxx> diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx index 78bbdf3d95f3..a3ff1697629b 100644 --- a/cui/source/customize/eventdlg.cxx +++ b/cui/source/customize/eventdlg.cxx @@ -45,8 +45,7 @@ #include "macropg_impl.hxx" #include <dialmgr.hxx> -#include <cuires.hrc> -#include "helpid.hrc" +#include "helpids.h" #include "cfgutil.hxx" #include "cfg.hxx" diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 2b26eca0a0f1..a834f265978a 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -34,8 +34,7 @@ #include <dialmgr.hxx> #include "cfgutil.hxx" #include "cfg.hxx" -#include "helpid.hrc" -#include <cuires.hrc> +#include "helpids.h" #include "headertablistbox.hxx" #include "macropg_impl.hxx" #include <svx/dialogs.hrc> diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index d36cd93a4fed..3803c68731bd 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -44,7 +44,6 @@ #include <vcl/graph.hxx> #include <vcl/builderfactory.hxx> #include <osl/file.hxx> -#include <cuires.hrc> #include <editeng/optitems.hxx> #include <editeng/svxenum.hxx> #include <svx/SpellDialogChildWindow.hxx> diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 2a0e9053c819..500f0143e3ef 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -38,12 +38,12 @@ #include <comphelper/propertysequence.hxx> #include <comphelper/dispatchcommand.hxx> -#include <cuires.hrc> #include <dialmgr.hxx> #include "cuicharmap.hxx" #include <sfx2/request.hxx> #include <sfx2/sfxsids.hrc> #include <sfx2/app.hxx> +#include <editeng/editids.hrc> #include <editeng/fontitem.hxx> #include "strings.hrc" #include "macroass.hxx" diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index b45300ef7bee..f8e6e46026e1 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -23,7 +23,6 @@ #include <dialmgr.hxx> #include <sfx2/tabdlg.hxx> #include <sfx2/app.hxx> -#include <cuires.hrc> #include <svx/fmsrccfg.hxx> #include <svx/fmsrcimp.hxx> #include "strings.hrc" diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index ebda6d05cdd8..fcd2937d10b4 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -33,7 +33,7 @@ #include <svx/gallery1.hxx> #include <svx/galtheme.hxx> #include "cuigaldlg.hxx" -#include "helpid.hrc" +#include "helpids.h" #include "bitmaps.hlst" #include <unotools/syslocale.hxx> #include <com/sun/star/uno/Reference.hxx> diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index 7f499c01a776..e7e86b987d47 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -25,7 +25,6 @@ #include <sfx2/request.hxx> #include <dialmgr.hxx> #include "cuigrfflt.hxx" -#include <cuires.hrc> #include <svx/dialogs.hrc> diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index 374c4b99643d..e1da23aef776 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -102,16 +102,16 @@ SvxHpLinkDlg::SvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings) aImage = Image(aBitmap); } aStrTitle = CuiResId( RID_SVXSTR_HYPERDLG_HLINETTP ); - pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_INTERNET, aStrTitle, imgVector[0], SvxHyperlinkInternetTp::Create ); + pEntry = AddTabPage ( HyperLinkPageType::INTERNET, aStrTitle, imgVector[0], SvxHyperlinkInternetTp::Create ); pEntry->SetQuickHelpText( CuiResId( RID_SVXSTR_HYPERDLG_HLINETTP_HELP ) ); aStrTitle = CuiResId( RID_SVXSTR_HYPERDLG_HLMAILTP ); - pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_MAIL, aStrTitle, imgVector[1], SvxHyperlinkMailTp::Create ); + pEntry = AddTabPage ( HyperLinkPageType::MAIL, aStrTitle, imgVector[1], SvxHyperlinkMailTp::Create ); pEntry->SetQuickHelpText( CuiResId( RID_SVXSTR_HYPERDLG_HLMAILTP_HELP ) ); aStrTitle = CuiResId( RID_SVXSTR_HYPERDLG_HLDOCTP ); - pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_DOCUMENT, aStrTitle, imgVector[2], SvxHyperlinkDocTp::Create ); + pEntry = AddTabPage ( HyperLinkPageType::DOCUMENT, aStrTitle, imgVector[2], SvxHyperlinkDocTp::Create ); pEntry->SetQuickHelpText( CuiResId( RID_SVXSTR_HYPERDLG_HLDOCTP_HELP ) ); aStrTitle = CuiResId( RID_SVXSTR_HYPERDLG_HLDOCNTP ); - pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT, aStrTitle, imgVector[3], SvxHyperlinkNewDocTp::Create ); + pEntry = AddTabPage ( HyperLinkPageType::NEWDOCUMENT, aStrTitle, imgVector[3], SvxHyperlinkNewDocTp::Create ); pEntry->SetQuickHelpText( CuiResId( RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP ) ); // set OK/Cancel - button @@ -127,25 +127,25 @@ SvxHpLinkDlg::SvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings) SetInputSet (mpItemSet.get()); //loop through the pages and get their max bounds and lock that down - ShowPage(RID_SVXPAGE_HYPERLINK_NEWDOCUMENT); + ShowPage(HyperLinkPageType::NEWDOCUMENT); VclBox *pBox = get_content_area(); Size aMaxPrefSize(pBox->get_preferred_size()); - ShowPage(RID_SVXPAGE_HYPERLINK_DOCUMENT); + ShowPage(HyperLinkPageType::DOCUMENT); Size aSize(pBox->get_preferred_size()); aMaxPrefSize.Width() = std::max(aMaxPrefSize.Width(), aSize.Width()); aMaxPrefSize.Height() = std::max(aMaxPrefSize.Height(), aSize.Height()); - ShowPage(RID_SVXPAGE_HYPERLINK_MAIL); + ShowPage(HyperLinkPageType::MAIL); aSize = pBox->get_preferred_size(); aMaxPrefSize.Width() = std::max(aMaxPrefSize.Width(), aSize.Width()); aMaxPrefSize.Height() = std::max(aMaxPrefSize.Height(), aSize.Height()); - ShowPage(RID_SVXPAGE_HYPERLINK_INTERNET); + ShowPage(HyperLinkPageType::INTERNET); aSize = pBox->get_preferred_size(); aMaxPrefSize.Width() = std::max(aMaxPrefSize.Width(), aSize.Width()); aMaxPrefSize.Height() = std::max(aMaxPrefSize.Height(), aSize.Height()); pBox->set_width_request(aMaxPrefSize.Width()); pBox->set_height_request(aMaxPrefSize.Height()); - SetCurPageId(RID_SVXPAGE_HYPERLINK_INTERNET); + SetCurPageId(HyperLinkPageType::INTERNET); // Init Dialog Start(); @@ -301,7 +301,7 @@ IMPL_LINK_NOARG(SvxHpLinkDlg, ClickCloseHdl_Impl, Button*, void) void SvxHpLinkDlg::SetPage ( SvxHyperlinkItem* pItem ) { - sal_uInt16 nPageId = RID_SVXPAGE_HYPERLINK_INTERNET; + sal_uInt16 nPageId = HyperLinkPageType::INTERNET; OUString aStrURL(pItem->GetURL()); INetURLObject aURL(aStrURL); @@ -311,17 +311,17 @@ void SvxHpLinkDlg::SetPage ( SvxHyperlinkItem* pItem ) { case INetProtocol::Http : case INetProtocol::Ftp : - nPageId = RID_SVXPAGE_HYPERLINK_INTERNET; + nPageId = HyperLinkPageType::INTERNET; break; case INetProtocol::File : - nPageId = RID_SVXPAGE_HYPERLINK_DOCUMENT; + nPageId = HyperLinkPageType::DOCUMENT; break; case INetProtocol::Mailto : - nPageId = RID_SVXPAGE_HYPERLINK_MAIL; + nPageId = HyperLinkPageType::MAIL; break; default : if (aStrURL.startsWith("#")) - nPageId = RID_SVXPAGE_HYPERLINK_DOCUMENT; + nPageId = HyperLinkPageType::DOCUMENT; else { // not valid diff --git a/cui/source/dialogs/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx index 99c71350124b..bb358632e5f1 100644 --- a/cui/source/dialogs/cuiimapwnd.cxx +++ b/cui/source/dialogs/cuiimapwnd.cxx @@ -28,7 +28,6 @@ #include <svl/urlbmk.hxx> #include <svx/xoutbmp.hxx> #include <dialmgr.hxx> -#include <cuires.hrc> #include <cuiimapwnd.hxx> #include <svx/svdpage.hxx> #include <svx/svdorect.hxx> diff --git a/cui/source/dialogs/cuitbxform.cxx b/cui/source/dialogs/cuitbxform.cxx index b54de7fe8e31..868e0e984ec4 100644 --- a/cui/source/dialogs/cuitbxform.cxx +++ b/cui/source/dialogs/cuitbxform.cxx @@ -25,7 +25,6 @@ #include <vcl/toolbox.hxx> #include <vcl/fixed.hxx> #include <dialmgr.hxx> -#include <cuires.hrc> #include "cuitbxform.hxx" #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx index cedbf7e14f6c..bfbe9fac7c40 100644 --- a/cui/source/dialogs/dlgname.cxx +++ b/cui/source/dialogs/dlgname.cxx @@ -18,9 +18,6 @@ */ #include <vcl/msgbox.hxx> - -#include <cuires.hrc> - #include "dlgname.hxx" #include "defdlgname.hxx" #include <dialmgr.hxx> diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index d5a16bd468aa..c83fd7332e0a 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -20,8 +20,7 @@ #include "hangulhanjadlg.hxx" #include <dialmgr.hxx> -#include <cuires.hrc> -#include "helpid.hrc" +#include "helpids.h" #include "strings.hrc" #include <algorithm> diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 34c2d9a5fb73..7b97044d26f4 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -39,7 +39,6 @@ #include <toolkit/helper/vclunohelper.hxx> #include "svtools/treelistentry.hxx" -#include <cuires.hrc> #include <strings.hrc> #include "hlmarkwn.hxx" #include "hltpbase.hxx" diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 07277d1fed98..520d0e017d2c 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -21,6 +21,7 @@ #include <sal/config.h> #include <osl/file.hxx> +#include <sfx2/event.hxx> #include <sfx2/frame.hxx> #include <sfx2/viewfrm.hxx> #include <sot/formats.hxx> @@ -31,7 +32,6 @@ #include "hltpbase.hxx" #include "macroass.hxx" #include <svx/svxdlg.hxx> -#include <cuires.hrc> #include <strings.hrc> #include <bitmaps.hlst> #include <vcl/builderfactory.hxx> diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index 63a0ad81bd95..c7f02a1f51d7 100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx @@ -18,7 +18,6 @@ */ #include "hyphen.hxx" -#include "cuires.hrc" #include "dialmgr.hxx" #include <editeng/splwrap.hxx> diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 2b0214810e75..63a93180149d 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -23,8 +23,7 @@ #include "iconcdlg.hxx" -#include "helpid.hrc" -#include <cuires.hrc> +#include "helpids.h" #include <unotools/viewoptions.hxx> #include <svtools/apearcfg.hxx> #include <vcl/mnemonic.hxx> diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index bc68c29d278f..be4eef5cfa18 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -54,7 +54,6 @@ #include <svl/ownlist.hxx> #include <comphelper/seqstream.hxx> -#include "cuires.hrc" #include "strings.hrc" #include <osl/file.hxx> diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index d0a36050babb..527070967e35 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -19,7 +19,6 @@ #include <dialmgr.hxx> #include <svx/svxdlg.hxx> -#include <cuires.hrc> #include <strings.hrc> #include "insrc.hxx" diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 961ff4f7ad18..e65aee2ed72c 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -19,7 +19,7 @@ #include <linkdlg.hxx> #include <vcl/svapp.hxx> -#include "helpid.hrc" +#include "helpids.h" #include <tools/urlobj.hxx> #include <svtools/svmedit.hxx> diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index 7edc03f8b2db..7bc05a3cdc43 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -27,7 +27,6 @@ #include "multipat.hxx" #include <dialmgr.hxx> -#include <cuires.hrc> #include <strings.hrc> #include <comphelper/processfactory.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/cui/source/dialogs/newtabledlg.cxx b/cui/source/dialogs/newtabledlg.cxx index 50e752789f95..d018d6161b2c 100644 --- a/cui/source/dialogs/newtabledlg.cxx +++ b/cui/source/dialogs/newtabledlg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "cuires.hrc" #include "dialmgr.hxx" #include "newtabledlg.hxx" diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index 408613465d23..f002b32ef474 100644 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -19,7 +19,6 @@ #include "passwdomdlg.hxx" -#include "cuires.hrc" #include "strings.hrc" #include "dialmgr.hxx" diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index 057198527390..871b6475eff7 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -29,12 +29,11 @@ #include <comphelper/processfactory.hxx> #include <svx/svxids.hrc> -#include <cuires.hrc> #include <svx/postattr.hxx> #include "postdlg.hxx" #include <dialmgr.hxx> -#include "helpid.hrc" +#include "helpids.h" // class SvxPostItDialog ------------------------------------------------- diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx index 6060252b4152..4966b1fc2b1d 100644 --- a/cui/source/dialogs/screenshotannotationdlg.cxx +++ b/cui/source/dialogs/screenshotannotationdlg.cxx @@ -19,7 +19,6 @@ #include "screenshotannotationdlg.hxx" -#include "cuires.hrc" #include "strings.hrc" #include "dialmgr.hxx" diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 6dcba4d31f36..999ffacfedee 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -26,7 +26,6 @@ #include <vcl/builderfactory.hxx> #include <o3tl/make_unique.hxx> -#include <cuires.hrc> #include <strings.hrc> #include <bitmaps.hlst> #include "scriptdlg.hxx" diff --git a/cui/source/dialogs/sdrcelldlg.cxx b/cui/source/dialogs/sdrcelldlg.cxx index d6e9244cb738..e64f01f31a8d 100644 --- a/cui/source/dialogs/sdrcelldlg.cxx +++ b/cui/source/dialogs/sdrcelldlg.cxx @@ -19,7 +19,6 @@ #include <svl/cjkoptions.hxx> #include <svx/flagsdef.hxx> -#include "cuires.hrc" #include "sdrcelldlg.hxx" #include "dialmgr.hxx" #include "cuitabarea.hxx" diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx index f786644b9ba6..8a4a4bc8d4ff 100644 --- a/cui/source/dialogs/splitcelldlg.cxx +++ b/cui/source/dialogs/splitcelldlg.cxx @@ -22,7 +22,6 @@ #include <svl/eitem.hxx> #include "dialmgr.hxx" #include "splitcelldlg.hxx" -#include "cuires.hrc" namespace { class NoApplyDialog : public SvxStandardDialog diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index 5ccaa5dd1101..7af454f67fb3 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -22,7 +22,6 @@ #include <svl/cjkoptions.hxx> #include <svl/whiter.hxx> #include <sfx2/objsh.hxx> -#include <cuires.hrc> #include <svx/svxitems.hrc> #include <svx/dialmgr.hxx> #include <svx/strarray.hxx> diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 0bf69e5329ce..5299fbde0d44 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -19,7 +19,6 @@ #include "thesdlg.hxx" #include "thesdlg_impl.hxx" -#include "cuires.hrc" #include "strings.hrc" #include "dialmgr.hxx" diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index a93d18ff01f8..056b757b357e 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -22,9 +22,6 @@ #include <sfx2/objsh.hxx> #include <vcl/layout.hxx> #include <vcl/msgbox.hxx> - -#include <cuires.hrc> - #include "zoom.hxx" #include <sfx2/zoomitem.hxx> #include <svx/viewlayoutitem.hxx> diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index ed48d45f94ed..05c834392c11 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -20,10 +20,10 @@ #include "align.hxx" #include "dlgfact.hxx" -#include <sfx2/basedlgs.hxx> #include <sfx2/app.hxx> +#include <sfx2/basedlgs.hxx> +#include <sfx2/pageids.hxx> #include <sfx2/request.hxx> -#include <cuires.hrc> #include <svx/dialogs.hrc> #include "numfmt.hxx" #include "splitcelldlg.hxx" @@ -808,7 +808,7 @@ VclPtr<VclAbstractDialog> AbstractDialogFactory_Impl::CreateVclDialog( vcl::Wind VclPtr<Dialog> pDlg; switch ( nResId ) { - case RID_DEFAULTABOUT: + case SID_ABOUT: { pDlg = VclPtr<AboutDialog>::Create(pParent); break; diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx index 03461d7d5f86..9d7b6954b284 100644 --- a/cui/source/inc/cuihyperdlg.hxx +++ b/cui/source/inc/cuihyperdlg.hxx @@ -32,6 +32,15 @@ #include "iconcdlg.hxx" +// hyperlink dialog +enum HyperLinkPageType +{ + INTERNET, + MAIL, + DOCUMENT, + NEWDOCUMENT +}; + /************************************************************************* |* |* Hyperlink-Dialog diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpids.h index 6ac5734602ba..6ac5734602ba 100644 --- a/cui/source/inc/helpid.hrc +++ b/cui/source/inc/helpids.h diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index 310942d6ddb4..ef2661a7187c 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -38,9 +38,8 @@ #include <dialmgr.hxx> #include <sfx2/docfile.hxx> -#include <cuires.hrc> #include <com/sun/star/frame/XFrame.hpp> -#include "helpid.hrc" +#include "helpids.h" #include <svx/hlnkitem.hxx> #include "hlmarkwn.hxx" diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 09e5b109ffc3..025300b9964b 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -35,6 +35,8 @@ #include <svtools/ctrlbox.hxx> #include <vcl/dialog.hxx> +#define MN_GALLERY_ENTRY 100 + class SvxColorListBox; class SvxNumRule; class SvxBmpNumValueSet; diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx index 9ea41a5161c7..202866e284f9 100644 --- a/cui/source/options/certpath.cxx +++ b/cui/source/options/certpath.cxx @@ -13,7 +13,6 @@ #include <osl/thread.h> #include "svtools/treelistentry.hxx" #include <unotools/securityoptions.hxx> -#include <cuires.hrc> #include "certpath.hxx" #include "dialmgr.hxx" diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index 4e8666cdac1a..d1ff39a6fb19 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -21,7 +21,6 @@ #include <tools/stream.hxx> #include "cfgchart.hxx" #include <dialmgr.hxx> -#include <cuires.hrc> #include <strings.hrc> #define ROW_COLOR_COUNT 12 diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index ae3a2538d386..e076e3ca2311 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -23,8 +23,7 @@ #include <vcl/builderfactory.hxx> #include "connpoolsettings.hxx" #include <svl/eitem.hxx> -#include <cuires.hrc> -#include "helpid.hrc" +#include "helpids.h" #include <strings.hrc> #include <dialmgr.hxx> diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx index 0b3bf50120df..8ee9ac426723 100644 --- a/cui/source/options/cuisrchdlg.cxx +++ b/cui/source/options/cuisrchdlg.cxx @@ -33,8 +33,6 @@ #include "cuisrchdlg.hxx" -#include <cuires.hrc> - #include <svl/srchitem.hxx> #include <svx/pageitem.hxx> #include <dialmgr.hxx> diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index df307e814396..a2590311aae3 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -21,10 +21,9 @@ #include "dbregistersettings.hxx" #include "connpooloptions.hxx" #include <svl/filenotation.hxx> -#include "helpid.hrc" +#include "helpids.h" #include <svtools/editbrowsebox.hxx> #include "svtools/treelistentry.hxx" -#include <cuires.hrc> #include <strings.hrc> #include <bitmaps.hlst> #include <vcl/field.hxx> diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx index 6bb15f5b3aae..c7ab9a2983e9 100644 --- a/cui/source/options/doclinkdialog.cxx +++ b/cui/source/options/doclinkdialog.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <comphelper/processfactory.hxx> -#include <cuires.hrc> #include <strings.hrc> #include <svl/filenotation.hxx> #include <vcl/layout.hxx> diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 103d03fc3ef4..d667c943dd8e 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -27,8 +27,7 @@ #include <svtools/fontsubstconfig.hxx> #include "fontsubs.hxx" #include <dialmgr.hxx> -#include "helpid.hrc" -#include <cuires.hrc> +#include "helpids.h" #include <o3tl/make_unique.hxx> /*********************************************************************/ diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx index fe0e37aae829..517fb17a683f 100644 --- a/cui/source/options/optaccessibility.cxx +++ b/cui/source/options/optaccessibility.cxx @@ -19,7 +19,6 @@ #include <optaccessibility.hxx> #include <dialmgr.hxx> -#include <cuires.hrc> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <officecfg/Office/Common.hxx> diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index f814ad27e3b7..2c011898d484 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -24,7 +24,6 @@ #include <editeng/unolingu.hxx> #include <o3tl/any.hxx> #include <dialmgr.hxx> -#include <cuires.hrc> #include <i18nlangtag/mslangid.hxx> #include <svl/asiancfg.hxx> #include <com/sun/star/lang/Locale.hpp> diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx index 632ccb923404..9795c1d9dd4f 100644 --- a/cui/source/options/optbasic.cxx +++ b/cui/source/options/optbasic.cxx @@ -21,7 +21,6 @@ #include <basic/codecompletecache.hxx> #include <iostream> #include <officecfg/Office/BasicIDE.hxx> -#include <cuires.hrc> SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "OptBasicIDEPage", "cui/ui/optbasicidepage.ui", &rSet) diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index 00ba47e4e0b9..975f1d64e3ec 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -18,7 +18,6 @@ */ #include <unotools/pathoptions.hxx> -#include <cuires.hrc> #include "optchart.hxx" #include <dialmgr.hxx> #include <vcl/builderfactory.hxx> diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 1a64c728eddb..7d70a458dc79 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -35,10 +35,9 @@ #include <vcl/settings.hxx> #include <vcl/builderfactory.hxx> #include <svx/svxdlg.hxx> -#include <helpid.hrc> +#include <helpids.h> #include <dialmgr.hxx> #include "optcolor.hxx" -#include <cuires.hrc> #include <strings.hrc> #include <svx/dlgutil.hxx> diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx index 4f258008d0cb..ca8e9137ae8b 100644 --- a/cui/source/options/optctl.cxx +++ b/cui/source/options/optctl.cxx @@ -19,7 +19,6 @@ #include "optctl.hxx" #include <dialmgr.hxx> -#include <cuires.hrc> #include <svl/ctloptions.hxx> // class SvxCTLOptionsPage ----------------------------------------------------- diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 9f0f8bd434a4..9d1bfcf90825 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -33,7 +33,6 @@ #include <svx/dialogs.hrc> #include <linguistic/misc.hxx> -#include <cuires.hrc> #include <strings.hrc> #include "optdict.hxx" #include <dialmgr.hxx> diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 6964977d3a39..cd39dcac4e54 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -21,8 +21,7 @@ #include <unotools/moduleoptions.hxx> #include <unotools/fltrcfg.hxx> #include "optfltr.hxx" -#include <cuires.hrc> -#include "helpid.hrc" +#include "helpids.h" #include "strings.hrc" #include <dialmgr.hxx> diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 180f6f185bfa..84ecbb97fb83 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -54,7 +54,6 @@ #include <svx/xpool.hxx> #include <svx/dlgutil.hxx> #include "cuitabarea.hxx" -#include <cuires.hrc> #include <editeng/unolingu.hxx> #include <editeng/langitem.hxx> #include <comphelper/processfactory.hxx> diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index 991041917020..7f9e975007eb 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -26,7 +26,6 @@ #include <vcl/edit.hxx> #include <vcl/settings.hxx> -#include <cuires.hrc> #include <unotools/useroptions.hxx> #include "cuioptgenrl.hxx" #include <dialmgr.hxx> diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index 2f449abbddd3..2b47d835870f 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -20,8 +20,7 @@ #include <svtools/langtab.hxx> #include <svtools/htmlcfg.hxx> #include "opthtml.hxx" -#include <cuires.hrc> -#include "helpid.hrc" +#include "helpids.h" #include <dialmgr.hxx> #include <sal/macros.h> diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index db2ff453dbd4..434462ca04a7 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -49,8 +49,7 @@ #include <dialmgr.hxx> #include "optinet2.hxx" #include <svx/svxdlg.hxx> -#include <cuires.hrc> -#include "helpid.hrc" +#include "helpids.h" #include <svx/ofaitem.hxx> #include <sfx2/htmlmode.hxx> #include <svx/svxids.hrc> diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 8141a5b4ccc0..1fc450aa1217 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -31,8 +31,7 @@ #include <officecfg/Office/Common.hxx> #include <svtools/miscopt.hxx> -#include <cuires.hrc> -#include "helpid.hrc" +#include "helpids.h" #include <strings.hrc> #include <vcl/svapp.hxx> #include <vcl/help.hxx> diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx index bbe587a61a67..0c709cc57aa8 100644 --- a/cui/source/options/optjsearch.cxx +++ b/cui/source/options/optjsearch.cxx @@ -19,7 +19,6 @@ #include <unotools/searchopt.hxx> #include <i18nutil/transliteration.hxx> -#include <cuires.hrc> #include <dialmgr.hxx> #include <optjsearch.hxx> diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 1c85f8469c07..0f4d942194a6 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -56,8 +56,7 @@ #include <editeng/optitems.hxx> #include "optlingu.hxx" #include <dialmgr.hxx> -#include <cuires.hrc> -#include "helpid.hrc" +#include "helpids.h" #include <strings.hrc> #include <ucbhelper/content.hxx> diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index 27cb5b48f383..be9d6606c881 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -54,8 +54,7 @@ #include "cuitabarea.hxx" #include "optmemory.hxx" #include <svx/ofaitem.hxx> -#include <cuires.hrc> -#include "helpid.hrc" +#include "helpids.h" #include <dialmgr.hxx> #include <limits> diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx index 0fb1e1a172ee..731f385976be 100644 --- a/cui/source/options/optopencl.cxx +++ b/cui/source/options/optopencl.cxx @@ -34,7 +34,6 @@ #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <com/sun/star/util/XChangesBatch.hpp> -#include <cuires.hrc> #include <strings.hrc> #include <dialmgr.hxx> #include "optopencl.hxx" diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 08b0243a6f02..683683cd8e74 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -34,8 +34,7 @@ #include "optpath.hxx" #include <dialmgr.hxx> -#include <cuires.hrc> -#include "helpid.hrc" +#include "helpids.h" #include "strings.hrc" #include <comphelper/configuration.hxx> #include <comphelper/processfactory.hxx> diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index fc9fb88fa9be..763d902cbd03 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -19,10 +19,6 @@ #include <svl/eitem.hxx> #include <svl/intitem.hxx> - -#include "optsave.hrc" -#include <cuires.hrc> - #include "optsave.hxx" #include <dialmgr.hxx> #include <comphelper/processfactory.hxx> @@ -36,6 +32,7 @@ #include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/util/XFlushable.hpp> +#include <sfx2/sfxsids.hrc> #include <sfx2/docfilt.hxx> #include <vcl/fixed.hxx> #include <unotools/configitem.hxx> diff --git a/cui/source/options/optsave.hrc b/cui/source/options/optsave.hrc deleted file mode 100644 index 485d35ed7765..000000000000 --- a/cui/source/options/optsave.hrc +++ /dev/null @@ -1,35 +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_CUI_SOURCE_OPTIONS_OPTSAVE_HRC -#define INCLUDED_CUI_SOURCE_OPTIONS_OPTSAVE_HRC - -// defines ------------------------------------------------------------------ - -#define APP_WRITER 0 -#define APP_WRITER_WEB 1 -#define APP_WRITER_GLOBAL 2 -#define APP_CALC 3 -#define APP_IMPRESS 4 -#define APP_DRAW 5 -#define APP_MATH 6 -#define APP_COUNT 7 - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx index b30d8c6f0c41..f6957eede0c9 100644 --- a/cui/source/options/optsave.hxx +++ b/cui/source/options/optsave.hxx @@ -26,6 +26,15 @@ #include <vcl/lstbox.hxx> #include <sfx2/tabdlg.hxx> +#define APP_WRITER 0 +#define APP_WRITER_WEB 1 +#define APP_WRITER_GLOBAL 2 +#define APP_CALC 3 +#define APP_IMPRESS 4 +#define APP_DRAW 5 +#define APP_MATH 6 +#define APP_COUNT 7 + namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index fef9e395d7f9..e5576efbcb4d 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -23,7 +23,6 @@ #include <svl/zforlist.hxx> #include "optupdt.hxx" #include <dialmgr.hxx> -#include <cuires.hrc> #include <comphelper/processfactory.hxx> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index 9594e6c644c0..60228c8a9550 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -28,7 +28,6 @@ #include <vcl/graphicfilter.hxx> #include <vcl/mnemonic.hxx> #include <dialmgr.hxx> -#include "cuires.hrc" #include "strings.hrc" #include "personalization.hrc" diff --git a/cui/source/options/securityoptions.cxx b/cui/source/options/securityoptions.cxx index d849d3e77056..0b9d6dd7c94e 100644 --- a/cui/source/options/securityoptions.cxx +++ b/cui/source/options/securityoptions.cxx @@ -19,7 +19,6 @@ #include <unotools/securityoptions.hxx> #include <dialmgr.hxx> -#include <cuires.hrc> #include "securityoptions.hxx" namespace diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 685d2a49e2a0..f3f75e8c60cb 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -22,10 +22,9 @@ #include <svx/dialogs.hrc> -#include "cuires.hrc" #include "strings.hrc" #include "treeopt.hrc" -#include "helpid.hrc" +#include "helpids.h" #include "cfgchart.hxx" #include "connpoolconfig.hxx" diff --git a/cui/source/options/tsaurls.cxx b/cui/source/options/tsaurls.cxx index b1db289d4b13..ea206fb44fd8 100644 --- a/cui/source/options/tsaurls.cxx +++ b/cui/source/options/tsaurls.cxx @@ -9,7 +9,6 @@ #include <officecfg/Office/Common.hxx> #include <svx/svxdlg.hxx> -#include <cuires.hrc> #include <comphelper/sequence.hxx> #include "tsaurls.hxx" diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index b7717221c8af..f6b3aa614f80 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -19,7 +19,6 @@ #include "webconninfo.hxx" #include <dialmgr.hxx> -#include <cuires.hrc> #include <sal/macros.h> #include <com/sun/star/task/InteractionHandler.hpp> #include <com/sun/star/task/PasswordContainer.hpp> diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index dfa4a531870d..34b33726acea 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -21,7 +21,6 @@ #include <editeng/svxenum.hxx> #include <svx/dialogs.hrc> -#include <cuires.hrc> #include <strings.hrc> #include <bitmaps.hlst> #include <svx/rotmodit.hxx> diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index def8d3de5013..308fa651eb78 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -48,11 +48,10 @@ #include <o3tl/make_unique.hxx> #include "autocdlg.hxx" -#include "helpid.hrc" +#include "helpids.h" #include <editeng/acorrcfg.hxx> #include <editeng/svxacorr.hxx> #include "cuicharmap.hxx" -#include "cuires.hrc" #include "strings.hrc" #include <editeng/unolingu.hxx> #include <dialmgr.hxx> diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 343e4ff2722f..2ac62da42ad3 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -31,10 +31,9 @@ #include <svx/dialogs.hrc> #include <svx/strings.hrc> -#include <cuires.hrc> #include <strings.hrc> #include <svx/dialmgr.hxx> -#include <editeng/memberids.hrc> +#include <editeng/memberids.h> #include <editeng/eerdll.hxx> #include <editeng/brushitem.hxx> diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index dbcb814ced3e..5dde954380bb 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -24,10 +24,9 @@ #include <svx/dialmgr.hxx> #include <svx/strings.hrc> -#include <cuires.hrc> #include <strings.hrc> #include <bitmaps.hlst> -#include "helpid.hrc" +#include "helpids.h" #include <svx/xtable.hxx> #include <svx/drawitem.hxx> diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index ef454619a8ad..fa1054c2a9ca 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -68,7 +68,6 @@ #include <editeng/charrotateitem.hxx> #include <officecfg/Office/Common.hxx> #include <svx/svxdlg.hxx> -#include <cuires.hrc> #include <strings.hrc> #include <svl/intitem.hxx> #include <sfx2/request.hxx> diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index d5df97d4c037..2060dabdd87e 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <cuires.hrc> #include <strings.hrc> #include <dialmgr.hxx> #include <sfx2/app.hxx> diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx index d50a60f72c00..fd58cda4fcd1 100644 --- a/cui/source/tabpages/dstribut.cxx +++ b/cui/source/tabpages/dstribut.cxx @@ -18,7 +18,6 @@ */ #include <sfx2/basedlgs.hxx> -#include <cuires.hrc> #include "dstribut.hxx" #include <svx/dialogs.hrc> #include <svx/svddef.hxx> diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 85e2c98e8595..4d95cf2fabe8 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -30,7 +30,6 @@ #include <grfpage.hxx> #include <svx/grfcrop.hxx> #include <rtl/ustring.hxx> -#include <cuires.hrc> #include <tools/fract.hxx> #include <svx/dialogs.hrc> #include <strings.hrc> diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index c0ca4fde6538..3634ac82c565 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -18,7 +18,6 @@ */ #include <comphelper/string.hxx> -#include <cuires.hrc> #include <dialmgr.hxx> #include <sfx2/app.hxx> #include <sfx2/module.hxx> diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 6742eceb4c87..9c176a9ae989 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -30,7 +30,6 @@ #include <sfx2/app.hxx> #include <sfx2/evntconf.hxx> #include <sfx2/objsh.hxx> -#include "cuires.hrc" #include <vcl/fixed.hxx> #include "headertablistbox.hxx" #include "svtools/svlbitm.hxx" diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index c41bf6b52286..4ffd4d87629b 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <cuires.hrc> #include <strings.hrc> #include <dialmgr.hxx> #include <sfx2/app.hxx> diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index a4981f5d84cf..e417c2548341 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -30,7 +30,6 @@ #include <svx/dialogs.hrc> #include <svtools/colorcfg.hxx> -#include <cuires.hrc> #include <strings.hrc> #include <svx/numinf.hxx> diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 30525c1045c6..03e39ec27b7b 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -22,11 +22,10 @@ #include <com/sun/star/text/RelOrientation.hpp> #include <numpages.hxx> -#include <numpages.hrc> #include <dialmgr.hxx> #include <tools/mapunit.hxx> #include <i18nlangtag/mslangid.hxx> -#include <helpid.hrc> +#include <helpids.h> #include <editeng/numitem.hxx> #include <svl/eitem.hxx> #include <vcl/layout.hxx> @@ -69,7 +68,6 @@ #include <vector> #include "sfx2/opengrf.hxx" -#include <cuires.hrc> #include <strings.hrc> #include <sfx2/request.hxx> #include <svl/aeitem.hxx> diff --git a/cui/source/tabpages/numpages.hrc b/cui/source/tabpages/numpages.hrc deleted file mode 100644 index d4f3150d4816..000000000000 --- a/cui/source/tabpages/numpages.hrc +++ /dev/null @@ -1,22 +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 . - */ - -#define MN_GALLERY_ENTRY 100 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 98f0d12ee183..b464bb387df7 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -30,9 +30,8 @@ #include <sfx2/htmlmode.hxx> #include <sal/macros.h> -#include <cuires.hrc> #include <strings.hrc> -#include "helpid.hrc" +#include "helpids.h" #include "page.hxx" #include <svx/pageitem.hxx> #include <editeng/brushitem.hxx> diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index a4f83510ae2c..3b5bf8930333 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -29,7 +29,6 @@ #include <svl/languageoptions.hxx> #include <svl/cjkoptions.hxx> #include <editeng/pgrditem.hxx> -#include <cuires.hrc> #include <strings.hrc> #include "paragrph.hxx" #include <editeng/frmdiritem.hxx> diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 9bcd7c1454e1..3dca342abc17 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -25,7 +25,6 @@ #include <svx/anchorid.hxx> #include <svl/aeitem.hxx> #include <svx/swframevalidation.hxx> -#include <cuires.hrc> #include <sfx2/htmlmode.hxx> #include <svx/svdview.hxx> #include <svx/svdpagv.hxx> diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx index 536db24bde8b..9676abbf774b 100644 --- a/cui/source/tabpages/tabarea.cxx +++ b/cui/source/tabpages/tabarea.cxx @@ -26,7 +26,6 @@ #include <svx/svdview.hxx> #include <svx/dialogs.hrc> -#include <cuires.hrc> #include <svx/xtable.hxx> #include "svx/globl3d.hxx" #include <svx/svdmodel.hxx> diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx index 3a1269c1bc45..070c4b4de64e 100644 --- a/cui/source/tabpages/tabline.cxx +++ b/cui/source/tabpages/tabline.cxx @@ -22,9 +22,6 @@ #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> #include <svx/dialogs.hrc> - -#include <cuires.hrc> - #include "cuitabarea.hxx" #include "cuitabline.hxx" #include "dlgname.hxx" diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 7be2085f9786..50a9b5c0914e 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -23,7 +23,6 @@ #include <vcl/settings.hxx> #include <vcl/builderfactory.hxx> -#include <cuires.hrc> #include <editeng/lrspitem.hxx> #include "tabstpge.hxx" #include <dialmgr.hxx> diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index 31f3e4cb04bf..fbf8302b6a47 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -20,7 +20,6 @@ #include <sfx2/app.hxx> #include <sfx2/module.hxx> -#include <cuires.hrc> #include <svx/dialogs.hrc> #include "textanim.hxx" diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index 6be1e322ea9a..b7cf03f7b81b 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -19,7 +19,6 @@ #include <sfx2/app.hxx> #include <sfx2/module.hxx> -#include <cuires.hrc> #include <svx/svddef.hxx> #include <svx/sdtditm.hxx> #include <svx/sdtagitm.hxx> diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 5e682bf92075..ca4aaab5c65d 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -26,7 +26,6 @@ #include "svx/xattr.hxx" #include <svx/xpool.hxx> -#include <cuires.hrc> #include <svx/xflbckit.hxx> #include <svx/svdattr.hxx> #include <svx/xtable.hxx> diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index bc87cf191c8c..c6667bf53a02 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -25,7 +25,6 @@ #include <svx/dialogs.hrc> #include "svx/xattr.hxx" #include <svx/xpool.hxx> -#include <cuires.hrc> #include <strings.hrc> #include <svx/xflbckit.hxx> #include <svx/svdattr.hxx> diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index fb2a1300696b..3518c9daea0d 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -32,9 +32,8 @@ #include <svx/ofaitem.hxx> #include "com/sun/star/ui/dialogs/TemplateDescription.hpp" -#include <cuires.hrc> #include <strings.hrc> -#include "helpid.hrc" +#include "helpids.h" #include "svx/xattr.hxx" #include <svx/xpool.hxx> #include <svx/xtable.hxx> diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 8de274563d88..e7dd9822abb5 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -27,9 +27,8 @@ #include <sfx2/filedlghelper.hxx> #include "com/sun/star/ui/dialogs/TemplateDescription.hpp" -#include <cuires.hrc> #include <strings.hrc> -#include "helpid.hrc" +#include "helpids.h" #include <svx/colorbox.hxx> #include "svx/xattr.hxx" #include <svx/xtable.hxx> diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 0e78ab78089e..951fcdfb2e85 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -28,9 +28,8 @@ #include <sfx2/module.hxx> #include "com/sun/star/ui/dialogs/TemplateDescription.hpp" -#include <cuires.hrc> #include <strings.hrc> -#include "helpid.hrc" +#include "helpids.h" #include <svx/colorbox.hxx> #include "svx/xattr.hxx" #include <svx/xpool.hxx> diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index de1526d4b7dc..8e1293bd3007 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -24,7 +24,6 @@ #include <sfx2/app.hxx> #include <sfx2/module.hxx> -#include <cuires.hrc> #include <strings.hrc> #include <svx/colorbox.hxx> #include "svx/xattr.hxx" diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 1cd1b4f61a01..ab570642ef69 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -26,9 +26,8 @@ #include <sfx2/filedlghelper.hxx> #include "com/sun/star/ui/dialogs/TemplateDescription.hpp" -#include <cuires.hrc> #include <strings.hrc> -#include "helpid.hrc" +#include "helpids.h" #include "svx/xattr.hxx" #include <svx/xpool.hxx> diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index a5a0579226b7..bb52e85621d7 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -25,9 +25,8 @@ #include <sfx2/filedlghelper.hxx> #include "com/sun/star/ui/dialogs/TemplateDescription.hpp" -#include <cuires.hrc> #include <strings.hrc> -#include "helpid.hrc" +#include "helpids.h" #include <svx/dialmgr.hxx> #include <svx/svdobj.hxx> #include <svx/svdopath.hxx> diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx index 9f57f7e5a0d5..26e1f2b9c7b1 100644 --- a/cui/source/tabpages/tppattern.cxx +++ b/cui/source/tabpages/tppattern.cxx @@ -35,9 +35,8 @@ #include <svx/dialogs.hrc> #include <svx/strings.hrc> -#include <cuires.hrc> #include <strings.hrc> -#include "helpid.hrc" +#include "helpids.h" #include "svx/xattr.hxx" #include <svx/xpool.hxx> #include <svx/xtable.hxx> diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index f4926f6d90e8..8fae2bb86f7a 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -24,7 +24,6 @@ #include "svx/xattr.hxx" #include <svx/xpool.hxx> -#include <cuires.hrc> #include <svx/svdattr.hxx> #include "svx/drawitem.hxx" #include "cuitabarea.hxx" diff --git a/cui/source/tabpages/tptrans.cxx b/cui/source/tabpages/tptrans.cxx index 086d037e0fd0..fd1c5517ddfd 100644 --- a/cui/source/tabpages/tptrans.cxx +++ b/cui/source/tabpages/tptrans.cxx @@ -26,7 +26,6 @@ #include "svx/xattr.hxx" #include <svx/xpool.hxx> -#include <cuires.hrc> #include <svx/xflbckit.hxx> #include <svx/svdattr.hxx> #include <svx/xtable.hxx> diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index af73a1010776..fd024e1295fc 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -27,7 +27,6 @@ #include <svx/sderitm.hxx> #include <svx/dialogs.hrc> #include <svx/transfrmhelper.hxx> -#include <cuires.hrc> #include <editeng/sizeitem.hxx> #include "transfrm.hxx" diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/helpids.h index 569f846822fc..e8d54a4d1193 100644 --- a/dbaccess/inc/dbaccess_helpid.hrc +++ b/dbaccess/inc/helpids.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DBACCESS_INC_DBACCESS_HELPID_HRC -#define INCLUDED_DBACCESS_INC_DBACCESS_HELPID_HRC +#ifndef INCLUDED_DBACCESS_INC_HELPIDS_H +#define INCLUDED_DBACCESS_INC_HELPIDS_H #define HID_DATABROWSE_HEADER "DBACCESS_HID_DATABROWSE_HEADER" diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx index e2e134d5ac52..8f5ac40c5b3d 100644 --- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include "strings.hrc" #include "macromigrationpages.hxx" #include "macromigrationdialog.hxx" diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 402998f35920..f283d0b5646f 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -119,7 +119,7 @@ #include "sqlmessage.hxx" #include "UITools.hxx" #include "dsntypes.hxx" -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include "dlgsave.hxx" #include "dbaccess_slotid.hrc" diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 4f06cfc6a519..d717c43eafaa 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -51,7 +51,7 @@ #include <comphelper/string.hxx> #include <toolkit/helper/vclunohelper.hxx> #include "AppView.hxx" -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include "strings.hrc" #include "strings.hxx" #include "callbacks.hxx" diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index 24a44f4411aa..adc63bd03803 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -19,7 +19,7 @@ #include "AppDetailView.hxx" #include <osl/diagnose.h> -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include "strings.hrc" #include "AppView.hxx" #include <com/sun/star/ui/XUIConfigurationManager.hpp> diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx index 3fe62cb57912..f8b20668ff9d 100644 --- a/dbaccess/source/ui/app/AppIconControl.cxx +++ b/dbaccess/source/ui/app/AppIconControl.cxx @@ -18,7 +18,7 @@ */ #include "AppIconControl.hxx" -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include "core_resource.hxx" #include "strings.hrc" #include "bitmaps.hlst" diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx index 96d546084358..388d05076747 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.cxx +++ b/dbaccess/source/ui/app/AppSwapWindow.cxx @@ -18,7 +18,7 @@ */ #include "AppSwapWindow.hxx" -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include "strings.hrc" #include "AppView.hxx" #include <vcl/svapp.hxx> diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index 6920cc05614f..aa6518820570 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -21,7 +21,7 @@ #include "strings.hrc" #include <tools/debug.hxx> #include <tools/diagnose_ex.h> -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include <vcl/toolbox.hxx> #include <unotools/configmgr.hxx> #include <vcl/waitobj.hxx> diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index b3e7ba256657..e7e9a1f0a6e4 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -80,7 +80,6 @@ #include <cppuhelper/typeprovider.hxx> #include <osl/mutex.hxx> #include <sfx2/app.hxx> -#include <sfx2/sfx.hrc> #include <svx/fmsearch.hxx> #include <svx/svxdlg.hxx> #include <tools/diagnose_ex.h> diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx index e9db894c50e4..3fea8ee737c6 100644 --- a/dbaccess/source/ui/browser/dataview.cxx +++ b/dbaccess/source/ui/browser/dataview.cxx @@ -26,7 +26,6 @@ #include <sfx2/app.hxx> #include <dbaccess/IController.hxx> #include "UITools.hxx" -#include <sfx2/sfx.hrc> #include <svtools/acceleratorexecute.hxx> #include <svtools/imgdef.hxx> #include <tools/diagnose_ex.h> diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx index 116b2051be6c..cfc5329f42b9 100644 --- a/dbaccess/source/ui/browser/dbtreeview.cxx +++ b/dbaccess/source/ui/browser/dbtreeview.cxx @@ -21,7 +21,7 @@ #include <svtools/treelistbox.hxx> #include "dbtreelistbox.hxx" #include "dbtreemodel.hxx" -#include "dbaccess_helpid.hrc" +#include "helpids.h" namespace dbaui { diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 3aa1b9237f56..eba7019d0b72 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -19,7 +19,7 @@ #include "sbagrid.hrc" #include "core_resource.hxx" -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include "uiservices.hxx" #include <sot/exchange.hxx> diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 68cecb3f0cd5..b51a926b3d60 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -19,7 +19,7 @@ #include "browserids.hxx" #include "core_resource.hxx" -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include "dbexchange.hxx" #include "dbtreelistbox.hxx" #include "dbtreemodel.hxx" diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 2a984fa65bae..3b9ed80a3159 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -45,7 +45,7 @@ #include <com/sun/star/util/XNumberFormatTypes.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include "QEnumTypes.hxx" -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include <connectivity/dbtools.hxx> #include <connectivity/dbconversion.hxx> #include <comphelper/numbers.hxx> diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index 15c1ce6a6ab2..7f8abfb129f8 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -32,7 +32,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include "RelControliFace.hxx" #include "strings.hrc" -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include <osl/diagnose.h> #include <list> diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index c19b7ae9d5f8..c24cd608d692 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -27,7 +27,7 @@ #include "sqledit.hxx" #include "QueryTextView.hxx" #include "querycontainerwindow.hxx" -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include "browserids.hxx" #include "querycontroller.hxx" #include "undosqledit.hxx" diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index 5e83545acfda..98bb2a59b82a 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -30,7 +30,7 @@ #include <svl/eitem.hxx> #include <svl/intitem.hxx> #include "dsitems.hxx" -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include "core_resource.hxx" #include <osl/process.h> #include <osl/diagnose.h> diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index a2abf4eb718a..d29be884d7c4 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -33,7 +33,7 @@ #include <svl/intitem.hxx> #include <unotools/moduleoptions.hxx> #include "dsitems.hxx" -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include <osl/process.h> #include <vcl/msgbox.hxx> #include "dbadmin.hxx" diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx index 4305a4c3c5af..d998d7b4e69c 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx @@ -27,7 +27,7 @@ #include <svl/eitem.hxx> #include <svl/intitem.hxx> #include "dsitems.hxx" -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include <osl/process.h> #include <vcl/msgbox.hxx> #include "dbadmin.hxx" diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index b642e5d568f1..a65b7db481eb 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -31,7 +31,7 @@ #include <svl/intitem.hxx> #include "dsitems.hxx" #include "dsnItem.hxx" -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include <vcl/msgbox.hxx> #include <vcl/mnemonic.hxx> #include <svl/cjkoptions.hxx> diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx index 398a3926566b..13994a7108c5 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.cxx +++ b/dbaccess/source/ui/dlg/RelationDlg.cxx @@ -23,7 +23,7 @@ #include <vcl/svapp.hxx> #include "dbu_dlg.hxx" -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include <com/sun/star/sdbc/KeyRule.hpp> #include <tools/debug.hxx> diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index 80b7833ea4c3..81a6ad7a200d 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -33,7 +33,7 @@ #include <svl/intitem.hxx> #include "dsitems.hxx" #include "dbfindex.hxx" -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include <vcl/layout.hxx> #include <vcl/mnemonic.hxx> #include <svl/cjkoptions.hxx> diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index 76b7d7e117cc..3bfdb51278bd 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -22,7 +22,7 @@ #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include "core_resource.hxx" -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include "dbu_pageids.hxx" #include "dbu_dlg.hxx" #include "strings.hrc" diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index 20d103cce4ab..f887f8be4094 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -37,7 +37,7 @@ #include "ConnectionPage.hxx" #include "DriverSettings.hxx" #include "DbAdminImpl.hxx" -#include "dbaccess_helpid.hrc" +#include "helpids.h" namespace dbaui { diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 20b4c4575ada..233d98effaa6 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -41,7 +41,7 @@ #include "propertysetitem.hxx" #include <unotools/confignode.hxx> #include "DbAdminImpl.hxx" -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include "ConnectionPageSetup.hxx" #include "UITools.hxx" #include <dbaccess/AsynchronousLink.hxx> diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index 47620a341e5d..6375ec5fbe59 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -29,7 +29,7 @@ #include "dsnItem.hxx" #include "core_resource.hxx" -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include "dbu_dlg.hxx" #include "strings.hrc" diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx index ec7ab3babded..65167dc6617d 100644 --- a/dbaccess/source/ui/dlg/dlgsave.cxx +++ b/dbaccess/source/ui/dlg/dlgsave.cxx @@ -27,7 +27,7 @@ #include "sqlmessage.hxx" #include <connectivity/dbtools.hxx> #include "UITools.hxx" -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include "SqlNameEdit.hxx" #include <vcl/button.hxx> #include <vcl/fixed.hxx> diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index dbf55cd4501d..2f3a95e82ae8 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -26,7 +26,7 @@ #include "dbu_dlg.hxx" #include "strings.hrc" #include "bitmaps.hlst" -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include "indexfieldscontrol.hxx" #include "indexcollection.hxx" #include <vcl/layout.hxx> diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index 990621d212d8..6eafc8a30366 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -22,7 +22,7 @@ #include "dbu_dlg.hxx" #include "strings.hrc" #include <osl/diagnose.h> -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include <vcl/settings.hxx> #include <vcl/builderfactory.hxx> diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index 0a8fa07cfd46..a0090fa47d0b 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -34,7 +34,7 @@ #include <vcl/msgbox.hxx> #include <unotools/configmgr.hxx> #include <sfx2/sfxuno.hxx> -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include "UITools.hxx" #include "core_resource.hxx" diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 88bd74ebb347..62e1992d2060 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -42,7 +42,7 @@ #include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp> #include "sqlmessage.hxx" #include <vcl/msgbox.hxx> -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include "UITools.hxx" #include <osl/diagnose.h> #include <svtools/imgdef.hxx> diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 671be050b77c..10b7f2a07b36 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -74,7 +74,7 @@ #include <svx/svxids.hrc> #include <svl/itempool.hxx> -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include <svl/itemset.hxx> #include "sbagrid.hrc" #include <svl/rngitem.hxx> diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx index e76ba60e5c64..20ad58771803 100644 --- a/dbaccess/source/ui/misc/WCPage.cxx +++ b/dbaccess/source/ui/misc/WCPage.cxx @@ -23,7 +23,7 @@ #include "WExtendPages.hxx" #include "defaultobjectnamecheck.hxx" -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include "strings.hrc" #include "core_resource.hxx" #include <com/sun/star/sdbc/XResultSet.hpp> diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx index f06388a5e9a9..1090938aafff 100644 --- a/dbaccess/source/ui/misc/WNameMatch.cxx +++ b/dbaccess/source/ui/misc/WNameMatch.cxx @@ -21,7 +21,7 @@ #include <osl/diagnose.h> #include "FieldDescriptions.hxx" #include "WCopyTable.hxx" -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include "core_resource.hxx" #include "strings.hrc" #include "bitmaps.hlst" diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index f10fcd592d62..d8b3cc499afe 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -24,7 +24,7 @@ #include <osl/diagnose.h> #include "FieldDescriptions.hxx" #include "WCopyTable.hxx" -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include "strings.hrc" #include <tools/stream.hxx> #include <svtools/svparser.hxx> diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx index 30f98e857eab..dd667a7cabdc 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.cxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx @@ -21,7 +21,7 @@ #include "QueryTableView.hxx" #include "stringconstants.hxx" #include <osl/diagnose.h> -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include "QueryDesignView.hxx" #include "browserids.hxx" #include "querycontroller.hxx" diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index 330acaa7a626..e6fb6dfb2fcb 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -22,7 +22,7 @@ #include "TableFieldDescription.hxx" #include <tools/diagnose_ex.h> #include <osl/diagnose.h> -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include "QTableWindow.hxx" #include "QTableConnection.hxx" #include "QTableConnectionData.hxx" diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 4c66586c9a8e..c64f95cbab10 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -32,7 +32,7 @@ #include "TableFieldInfo.hxx" #include "strings.hrc" #include "strings.hxx" -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include <com/sun/star/container/XNameAccess.hpp> #include "stringconstants.hxx" #include "QTableWindow.hxx" diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index 988347f399cf..e43e9ceec013 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -33,7 +33,7 @@ #include "stringconstants.hxx" #include <connectivity/dbtools.hxx> #include <comphelper/sequence.hxx> -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include "RelationDesignView.hxx" #include "JoinController.hxx" #include "TableWindow.hxx" diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx index eddff2dce7e4..1fec0f0c9133 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx @@ -19,7 +19,7 @@ #include "FieldDescGenWin.hxx" #include <osl/diagnose.h> -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include "TableDesignHelpBar.hxx" #include "TableFieldControl.hxx" #include "TableDesignView.hxx" diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index d9f35d6a4a2a..144a980a72a3 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -30,7 +30,7 @@ #include "strings.hxx" #include "stringconstants.hxx" #include "browserids.hxx" -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include <comphelper/types.hxx> #include "FieldDescControl.hxx" #include "FieldDescriptions.hxx" diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx index 317ebe73a6e2..c67d080940be 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx @@ -25,7 +25,7 @@ #include <com/sun/star/util/URL.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <vcl/builder.hxx> -#include "dbaccess_helpid.hrc" +#include "helpids.h" using namespace ::dbaui; using namespace ::svt; diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx index 7a049d80d27b..705729d69d25 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx @@ -20,7 +20,7 @@ #include "TableDesignHelpBar.hxx" #include <svtools/svmedit.hxx> #include <vcl/settings.hxx> -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include <memory> using namespace dbaui; #define STANDARD_MARGIN 6 diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index f6a7953214b2..62a1497f4f57 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -19,7 +19,7 @@ #include "TableDesignView.hxx" #include "TableController.hxx" -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include "FieldDescriptions.hxx" #include "TEditControl.hxx" #include "TableFieldDescWin.hxx" diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx index dced4032fc46..081d601388eb 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx @@ -24,7 +24,7 @@ #include "TableDesignHelpBar.hxx" #include <vcl/fixed.hxx> #include <vcl/settings.hxx> -#include "dbaccess_helpid.hrc" +#include "helpids.h" #include "core_resource.hxx" #include "core_resource.hxx" 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" diff --git a/editeng/inc/helpid.hrc b/editeng/inc/helpids.h index 018a50f8e164..5105dbd46b0f 100644 --- a/editeng/inc/helpid.hrc +++ b/editeng/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 INCLUDED_EDITENG_INC_HELPID_HRC -#define INCLUDED_EDITENG_INC_HELPID_HRC +#ifndef INCLUDED_EDITENG_INC_HELPIDS_H +#define INCLUDED_EDITENG_INC_HELPIDS_H #define HID_EDITENG_SPELLER_WORDLANGUAGE "EDITENG_HID_EDITENG_SPELLER_WORDLANGUAGE" #define HID_EDITENG_SPELLER_PARALANGUAGE "EDITENG_HID_EDITENG_SPELLER_PARALANGUAGE" diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 11697dc95edd..1695d6b07780 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -49,7 +49,7 @@ #include <eerdll2.hxx> #include <editeng/editrids.hrc> #include <editeng.hxx> -#include <helpid.hrc> +#include <helpids.h> #include <i18nlangtag/lang.h> #include <vcl/menu.hxx> #include <vcl/window.hxx> diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 0178499d1020..35e5937caca9 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -52,7 +52,7 @@ #include <svtools/grfmgr.hxx> #include <tools/urlobj.hxx> #include <comphelper/types.hxx> -#include <svl/memberid.hrc> +#include <svl/memberid.h> #include <svtools/borderhelper.hxx> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> @@ -79,7 +79,7 @@ #include <editeng/itemtype.hxx> #include <editeng/eerdll.hxx> #include <editeng/unoprnms.hxx> -#include <editeng/memberids.hrc> +#include <editeng/memberids.h> #include <editeng/editerr.hxx> #include <libxml/xmlwriter.h> #include <o3tl/enumrange.hxx> diff --git a/editeng/source/items/justifyitem.cxx b/editeng/source/items/justifyitem.cxx index 9d073ebda5c7..fc9f48e3a6a8 100644 --- a/editeng/source/items/justifyitem.cxx +++ b/editeng/source/items/justifyitem.cxx @@ -18,7 +18,7 @@ */ #include "editeng/justifyitem.hxx" -#include "editeng/memberids.hrc" +#include "editeng/memberids.h" #include "editeng/editrids.hrc" #include "editeng/eerdll.hxx" diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index eab2588de236..166c8ff359da 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -27,7 +27,6 @@ #include <comphelper/types.hxx> #include <tools/mapunit.hxx> #include <svl/itempool.hxx> -#include <svl/memberid.hrc> #include <editeng/editrids.hrc> #include <editeng/lspcitem.hxx> #include <editeng/adjustitem.hxx> @@ -43,7 +42,7 @@ #include <editeng/paravertalignitem.hxx> #include <editeng/pgrditem.hxx> #include <rtl/ustring.hxx> -#include <editeng/memberids.hrc> +#include <editeng/memberids.h> #include <editeng/editids.hrc> #include <editeng/itemtype.hxx> #include <editeng/eerdll.hxx> diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 5821900f3902..37af9cfa6a76 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -31,7 +31,6 @@ #include <editeng/eeitem.hxx> #include <svtools/unitconv.hxx> -#include <svl/memberid.hrc> #include <editeng/editids.hrc> #include <editeng/editrids.hrc> #include <vcl/vclenum.hxx> @@ -62,7 +61,7 @@ #include <com/sun/star/text/FontEmphasis.hpp> #include <com/sun/star/i18n/ScriptType.hpp> #include <editeng/rsiditem.hxx> -#include <editeng/memberids.hrc> +#include <editeng/memberids.h> #include <editeng/flstitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/postitem.hxx> diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 3c832486a04e..7a96b9741532 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -55,7 +55,7 @@ #include <editeng/svxacorr.hxx> #include <editeng/unolingu.hxx> #include <vcl/window.hxx> -#include <helpid.hrc> +#include <helpids.h> #include <com/sun/star/xml/sax/InputSource.hpp> #include <com/sun/star/xml/sax/FastParser.hpp> #include <com/sun/star/xml/sax/FastToken.hpp> diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx index c7f9b0760c4b..f97253d1f785 100644 --- a/editeng/source/uno/unofdesc.cxx +++ b/editeng/source/uno/unofdesc.cxx @@ -28,7 +28,7 @@ #include <editeng/wghtitem.hxx> #include <editeng/crossedoutitem.hxx> #include <editeng/wrlmitem.hxx> -#include <editeng/memberids.hrc> +#include <editeng/memberids.h> #include <svl/itempool.hxx> #include <vcl/unohelp.hxx> diff --git a/extensions/inc/abpilot.hrc b/extensions/inc/abpilot.hrc deleted file mode 100644 index a55a687876a2..000000000000 --- a/extensions/inc/abpilot.hrc +++ /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 EXTENSIONS_ABPILOT_HRC -#define EXTENSIONS_ABPILOT_HRC - -#define HID_ABSPILOT_PREVIOUS "EXTENSIONS_HID_ABSPILOT_PREVIOUS" -#define HID_ABSPILOT_NEXT "EXTENSIONS_HID_ABSPILOT_NEXT" -#define HID_ABSPILOT_CANCEL "EXTENSIONS_HID_ABSPILOT_CANCEL" -#define HID_ABSPILOT_FINISH "EXTENSIONS_HID_ABSPILOT_FINISH" -#define UID_ABSPILOT_HELP "EXTENSIONS_UID_ABSPILOT_HELP" -#define HID_ABSPILOT "EXTENSIONS_HID_ABSPILOT" - -#endif // EXTENSIONS_ABPILOT_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/inc/bibliography.hrc b/extensions/inc/bibliography.hrc deleted file mode 100644 index 9316e19073c1..000000000000 --- a/extensions/inc/bibliography.hrc +++ /dev/null @@ -1,58 +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 EXTENSIONS_BIBLIOGRAPHY_HRC -#define EXTENSIONS_BIBLIOGRAPHY_HRC - -#define HID_BIB_IDENTIFIER_POS "EXTENSIONS_HID_BIB_IDENTIFIER_POS" -#define HID_BIB_AUTHORITYTYPE_POS "EXTENSIONS_HID_BIB_AUTHORITYTYPE_POS" -#define HID_BIB_AUTHOR_POS "EXTENSIONS_HID_BIB_AUTHOR_POS" -#define HID_BIB_TITLE_POS "EXTENSIONS_HID_BIB_TITLE_POS" -#define HID_BIB_YEAR_POS "EXTENSIONS_HID_BIB_YEAR_POS" -#define HID_BIB_ISBN_POS "EXTENSIONS_HID_BIB_ISBN_POS" -#define HID_BIB_BOOKTITLE_POS "EXTENSIONS_HID_BIB_BOOKTITLE_POS" -#define HID_BIB_CHAPTER_POS "EXTENSIONS_HID_BIB_CHAPTER_POS" -#define HID_BIB_EDITION_POS "EXTENSIONS_HID_BIB_EDITION_POS" -#define HID_BIB_EDITOR_POS "EXTENSIONS_HID_BIB_EDITOR_POS" -#define HID_BIB_HOWPUBLISHED_POS "EXTENSIONS_HID_BIB_HOWPUBLISHED_POS" -#define HID_BIB_INSTITUTION_POS "EXTENSIONS_HID_BIB_INSTITUTION_POS" -#define HID_BIB_JOURNAL_POS "EXTENSIONS_HID_BIB_JOURNAL_POS" -#define HID_BIB_MONTH_POS "EXTENSIONS_HID_BIB_MONTH_POS" -#define HID_BIB_NOTE_POS "EXTENSIONS_HID_BIB_NOTE_POS" -#define HID_BIB_ANNOTE_POS "EXTENSIONS_HID_BIB_ANNOTE_POS" -#define HID_BIB_NUMBER_POS "EXTENSIONS_HID_BIB_NUMBER_POS" -#define HID_BIB_ORGANIZATIONS_POS "EXTENSIONS_HID_BIB_ORGANIZATIONS_POS" -#define HID_BIB_PAGES_POS "EXTENSIONS_HID_BIB_PAGES_POS" -#define HID_BIB_PUBLISHER_POS "EXTENSIONS_HID_BIB_PUBLISHER_POS" -#define HID_BIB_ADDRESS_POS "EXTENSIONS_HID_BIB_ADDRESS_POS" -#define HID_BIB_SCHOOL_POS "EXTENSIONS_HID_BIB_SCHOOL_POS" -#define HID_BIB_SERIES_POS "EXTENSIONS_HID_BIB_SERIES_POS" -#define HID_BIB_REPORTTYPE_POS "EXTENSIONS_HID_BIB_REPORTTYPE_POS" -#define HID_BIB_VOLUME_POS "EXTENSIONS_HID_BIB_VOLUME_POS" -#define HID_BIB_URL_POS "EXTENSIONS_HID_BIB_URL_POS" -#define HID_BIB_CUSTOM1_POS "EXTENSIONS_HID_BIB_CUSTOM1_POS" -#define HID_BIB_CUSTOM2_POS "EXTENSIONS_HID_BIB_CUSTOM2_POS" -#define HID_BIB_CUSTOM3_POS "EXTENSIONS_HID_BIB_CUSTOM3_POS" -#define HID_BIB_CUSTOM4_POS "EXTENSIONS_HID_BIB_CUSTOM4_POS" -#define HID_BIB_CUSTOM5_POS "EXTENSIONS_HID_BIB_CUSTOM5_POS" -#define HID_BIB_DB_GRIDCTRL "EXTENSIONS_HID_BIB_DB_GRIDCTRL" - -#endif // EXTENSIONS_BIBLIOGRAPHY_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/inc/dbpilots.hrc b/extensions/inc/dbpilots.hrc deleted file mode 100644 index e0de9c57e007..000000000000 --- a/extensions/inc/dbpilots.hrc +++ /dev/null @@ -1,38 +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 EXTENSIONS_DBPILOT_HRC -#define EXTENSIONS_DBPILOT_HRC - -#define HID_GROUPWIZARD_PREVIOUS "EXTENSIONS_HID_GROUPWIZARD_PREVIOUS" -#define HID_GROUPWIZARD_NEXT "EXTENSIONS_HID_GROUPWIZARD_NEXT" -#define HID_GROUPWIZARD_CANCEL "EXTENSIONS_HID_GROUPWIZARD_CANCEL" -#define HID_GROUPWIZARD_FINISH "EXTENSIONS_HID_GROUPWIZARD_FINISH" -#define HID_LISTWIZARD_PREVIOUS "EXTENSIONS_HID_LISTWIZARD_PREVIOUS" -#define HID_LISTWIZARD_NEXT "EXTENSIONS_HID_LISTWIZARD_NEXT" -#define HID_LISTWIZARD_CANCEL "EXTENSIONS_HID_LISTWIZARD_CANCEL" -#define HID_LISTWIZARD_FINISH "EXTENSIONS_HID_LISTWIZARD_FINISH" -#define HID_GRIDWIZARD_PREVIOUS "EXTENSIONS_HID_GRIDWIZARD_PREVIOUS" -#define HID_GRIDWIZARD_NEXT "EXTENSIONS_HID_GRIDWIZARD_NEXT" -#define HID_GRIDWIZARD_CANCEL "EXTENSIONS_HID_GRIDWIZARD_CANCEL" -#define HID_GRIDWIZARD_FINISH "EXTENSIONS_HID_GRIDWIZARD_FINISH" - -#endif // EXTENSIONS_DBPILOT_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/inc/extensio.hrc b/extensions/inc/extensio.hrc deleted file mode 100644 index 36ec5bba52f5..000000000000 --- a/extensions/inc/extensio.hrc +++ /dev/null @@ -1,42 +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 EXTENSIONS_INC_EXTENSIO_HRC -#define EXTENSIONS_INC_EXTENSIO_HRC - -#include <svl/solar.hrc> - -// - resource id ranges - -#define RID_ABP_START ( RID_MORE_EXTENSIONS_START + 0 ) -#define RID_ABP_END ( RID_MORE_EXTENSIONS_START + 19 ) - -#define RID_DBP_START ( RID_MORE_EXTENSIONS_START + 20 ) -#define RID_DBP_END ( RID_MORE_EXTENSIONS_START + 39 ) - -// !!! please adjust RID_LAST_EXTENSIONS_RANGE if you add new ranges here !!! - -#define RID_LAST_EXTENSIONS_RANGE RID_DBP_END - -#if RID_LAST_EXTENSIONS_RANGE > RID_MORE_EXTENSIONS_END - #error id range overflow -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/inc/propctrlr.hrc b/extensions/inc/helpids.h index 2af190270a16..813bd3b502fd 100644 --- a/extensions/inc/propctrlr.hrc +++ b/extensions/inc/helpids.h @@ -17,67 +17,61 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef EXTENSIONS_PROPCTRLR_HRC -#define EXTENSIONS_PROPCTRLR_HRC +#ifndef EXTENSIONS_HELPIDS_H +#define EXTENSIONS_HELPIDS_H -#define UID_PROP_DLG_FONT_TYPE "EXTENSIONS_UID_PROP_DLG_FONT_TYPE" -#define UID_PROP_DLG_IMAGE_URL "EXTENSIONS_UID_PROP_DLG_IMAGE_URL" -#define UID_PROP_DLG_BACKGROUNDCOLOR "EXTENSIONS_UID_PROP_DLG_BACKGROUNDCOLOR" -#define UID_PROP_DLG_SYMBOLCOLOR "EXTENSIONS_UID_PROP_DLG_SYMBOLCOLOR" -#define UID_PROP_DLG_ATTR_DATASOURCE "EXTENSIONS_UID_PROP_DLG_ATTR_DATASOURCE" -#define UID_PROP_DLG_ATTR_TARGET_URL "EXTENSIONS_UID_PROP_DLG_ATTR_TARGET_URL" -#define UID_PROP_DLG_NUMBER_FORMAT "EXTENSIONS_UID_PROP_DLG_NUMBER_FORMAT" -#define UID_PROP_DLG_CONTROLLABEL "EXTENSIONS_UID_PROP_DLG_CONTROLLABEL" -#define UID_PROP_DLG_FILLCOLOR "EXTENSIONS_UID_PROP_DLG_FILLCOLOR" -#define UID_PROP_DLG_TABINDEX "EXTENSIONS_UID_PROP_DLG_TABINDEX" -#define UID_PROP_DLG_SQLCOMMAND "EXTENSIONS_UID_PROP_DLG_SQLCOMMAND" -#define UID_PROP_DLG_FORMLINKFIELDS "EXTENSIONS_UID_PROP_DLG_FORMLINKFIELDS" -#define UID_PROP_DLG_FILTER "EXTENSIONS_UID_PROP_DLG_FILTER" -#define UID_PROP_DLG_ORDER "EXTENSIONS_UID_PROP_DLG_ORDER" -#define UID_PROP_DLG_SELECTION "EXTENSIONS_UID_PROP_DLG_SELECTION" -#define UID_PROP_DLG_BIND_EXPRESSION "EXTENSIONS_UID_PROP_DLG_BIND_EXPRESSION" -#define UID_PROP_DLG_XSD_REQUIRED "EXTENSIONS_UID_PROP_DLG_XSD_REQUIRED" -#define UID_PROP_DLG_XSD_RELEVANT "EXTENSIONS_UID_PROP_DLG_XSD_RELEVANT" -#define UID_PROP_DLG_XSD_READONLY "EXTENSIONS_UID_PROP_DLG_XSD_READONLY" -#define UID_PROP_DLG_XSD_CONSTRAINT "EXTENSIONS_UID_PROP_DLG_XSD_CONSTRAINT" -#define UID_PROP_DLG_XSD_CALCULATION "EXTENSIONS_UID_PROP_DLG_XSD_CALCULATION" -#define UID_PROP_ADD_DATA_TYPE "EXTENSIONS_UID_PROP_ADD_DATA_TYPE" -#define UID_PROP_REMOVE_DATA_TYPE "EXTENSIONS_UID_PROP_REMOVE_DATA_TYPE" -#define UID_PROP_DLG_BORDERCOLOR "EXTENSIONS_UID_PROP_DLG_BORDERCOLOR" +#define HID_ABSPILOT_PREVIOUS "EXTENSIONS_HID_ABSPILOT_PREVIOUS" +#define HID_ABSPILOT_NEXT "EXTENSIONS_HID_ABSPILOT_NEXT" +#define HID_ABSPILOT_CANCEL "EXTENSIONS_HID_ABSPILOT_CANCEL" +#define HID_ABSPILOT_FINISH "EXTENSIONS_HID_ABSPILOT_FINISH" +#define UID_ABSPILOT_HELP "EXTENSIONS_UID_ABSPILOT_HELP" +#define HID_ABSPILOT "EXTENSIONS_HID_ABSPILOT" -#define UID_BRWEVT_APPROVEACTIONPERFORMED "EXTENSIONS_UID_BRWEVT_APPROVEACTIONPERFORMED" -#define UID_BRWEVT_ACTIONPERFORMED "EXTENSIONS_UID_BRWEVT_ACTIONPERFORMED" -#define UID_BRWEVT_CHANGED "EXTENSIONS_UID_BRWEVT_CHANGED" -#define UID_BRWEVT_TEXTCHANGED "EXTENSIONS_UID_BRWEVT_TEXTCHANGED" -#define UID_BRWEVT_ITEMSTATECHANGED "EXTENSIONS_UID_BRWEVT_ITEMSTATECHANGED" -#define UID_BRWEVT_FOCUSGAINED "EXTENSIONS_UID_BRWEVT_FOCUSGAINED" -#define UID_BRWEVT_FOCUSLOST "EXTENSIONS_UID_BRWEVT_FOCUSLOST" -#define UID_BRWEVT_KEYTYPED "EXTENSIONS_UID_BRWEVT_KEYTYPED" -#define UID_BRWEVT_KEYUP "EXTENSIONS_UID_BRWEVT_KEYUP" -#define UID_BRWEVT_MOUSEENTERED "EXTENSIONS_UID_BRWEVT_MOUSEENTERED" -#define UID_BRWEVT_MOUSEDRAGGED "EXTENSIONS_UID_BRWEVT_MOUSEDRAGGED" -#define UID_BRWEVT_MOUSEMOVED "EXTENSIONS_UID_BRWEVT_MOUSEMOVED" -#define UID_BRWEVT_MOUSEPRESSED "EXTENSIONS_UID_BRWEVT_MOUSEPRESSED" -#define UID_BRWEVT_MOUSERELEASED "EXTENSIONS_UID_BRWEVT_MOUSERELEASED" -#define UID_BRWEVT_MOUSEEXITED "EXTENSIONS_UID_BRWEVT_MOUSEEXITED" -#define UID_BRWEVT_APPROVERESETTED "EXTENSIONS_UID_BRWEVT_APPROVERESETTED" -#define UID_BRWEVT_RESETTED "EXTENSIONS_UID_BRWEVT_RESETTED" -#define UID_BRWEVT_SUBMITTED "EXTENSIONS_UID_BRWEVT_SUBMITTED" -#define UID_BRWEVT_BEFOREUPDATE "EXTENSIONS_UID_BRWEVT_BEFOREUPDATE" -#define UID_BRWEVT_AFTERUPDATE "EXTENSIONS_UID_BRWEVT_AFTERUPDATE" -#define UID_BRWEVT_LOADED "EXTENSIONS_UID_BRWEVT_LOADED" -#define UID_BRWEVT_RELOADING "EXTENSIONS_UID_BRWEVT_RELOADING" -#define UID_BRWEVT_RELOADED "EXTENSIONS_UID_BRWEVT_RELOADED" -#define UID_BRWEVT_UNLOADING "EXTENSIONS_UID_BRWEVT_UNLOADING" -#define UID_BRWEVT_UNLOADED "EXTENSIONS_UID_BRWEVT_UNLOADED" -#define UID_BRWEVT_CONFIRMDELETE "EXTENSIONS_UID_BRWEVT_CONFIRMDELETE" -#define UID_BRWEVT_APPROVEROWCHANGE "EXTENSIONS_UID_BRWEVT_APPROVEROWCHANGE" -#define UID_BRWEVT_ROWCHANGE "EXTENSIONS_UID_BRWEVT_ROWCHANGE" -#define UID_BRWEVT_POSITIONING "EXTENSIONS_UID_BRWEVT_POSITIONING" -#define UID_BRWEVT_POSITIONED "EXTENSIONS_UID_BRWEVT_POSITIONED" -#define UID_BRWEVT_APPROVEPARAMETER "EXTENSIONS_UID_BRWEVT_APPROVEPARAMETER" -#define UID_BRWEVT_ERROROCCURRED "EXTENSIONS_UID_BRWEVT_ERROROCCURRED" -#define UID_BRWEVT_ADJUSTMENTVALUECHANGED "EXTENSIONS_UID_BRWEVT_ADJUSTMENTVALUECHANGED" +#define HID_BIB_IDENTIFIER_POS "EXTENSIONS_HID_BIB_IDENTIFIER_POS" +#define HID_BIB_AUTHORITYTYPE_POS "EXTENSIONS_HID_BIB_AUTHORITYTYPE_POS" +#define HID_BIB_AUTHOR_POS "EXTENSIONS_HID_BIB_AUTHOR_POS" +#define HID_BIB_TITLE_POS "EXTENSIONS_HID_BIB_TITLE_POS" +#define HID_BIB_YEAR_POS "EXTENSIONS_HID_BIB_YEAR_POS" +#define HID_BIB_ISBN_POS "EXTENSIONS_HID_BIB_ISBN_POS" +#define HID_BIB_BOOKTITLE_POS "EXTENSIONS_HID_BIB_BOOKTITLE_POS" +#define HID_BIB_CHAPTER_POS "EXTENSIONS_HID_BIB_CHAPTER_POS" +#define HID_BIB_EDITION_POS "EXTENSIONS_HID_BIB_EDITION_POS" +#define HID_BIB_EDITOR_POS "EXTENSIONS_HID_BIB_EDITOR_POS" +#define HID_BIB_HOWPUBLISHED_POS "EXTENSIONS_HID_BIB_HOWPUBLISHED_POS" +#define HID_BIB_INSTITUTION_POS "EXTENSIONS_HID_BIB_INSTITUTION_POS" +#define HID_BIB_JOURNAL_POS "EXTENSIONS_HID_BIB_JOURNAL_POS" +#define HID_BIB_MONTH_POS "EXTENSIONS_HID_BIB_MONTH_POS" +#define HID_BIB_NOTE_POS "EXTENSIONS_HID_BIB_NOTE_POS" +#define HID_BIB_ANNOTE_POS "EXTENSIONS_HID_BIB_ANNOTE_POS" +#define HID_BIB_NUMBER_POS "EXTENSIONS_HID_BIB_NUMBER_POS" +#define HID_BIB_ORGANIZATIONS_POS "EXTENSIONS_HID_BIB_ORGANIZATIONS_POS" +#define HID_BIB_PAGES_POS "EXTENSIONS_HID_BIB_PAGES_POS" +#define HID_BIB_PUBLISHER_POS "EXTENSIONS_HID_BIB_PUBLISHER_POS" +#define HID_BIB_ADDRESS_POS "EXTENSIONS_HID_BIB_ADDRESS_POS" +#define HID_BIB_SCHOOL_POS "EXTENSIONS_HID_BIB_SCHOOL_POS" +#define HID_BIB_SERIES_POS "EXTENSIONS_HID_BIB_SERIES_POS" +#define HID_BIB_REPORTTYPE_POS "EXTENSIONS_HID_BIB_REPORTTYPE_POS" +#define HID_BIB_VOLUME_POS "EXTENSIONS_HID_BIB_VOLUME_POS" +#define HID_BIB_URL_POS "EXTENSIONS_HID_BIB_URL_POS" +#define HID_BIB_CUSTOM1_POS "EXTENSIONS_HID_BIB_CUSTOM1_POS" +#define HID_BIB_CUSTOM2_POS "EXTENSIONS_HID_BIB_CUSTOM2_POS" +#define HID_BIB_CUSTOM3_POS "EXTENSIONS_HID_BIB_CUSTOM3_POS" +#define HID_BIB_CUSTOM4_POS "EXTENSIONS_HID_BIB_CUSTOM4_POS" +#define HID_BIB_CUSTOM5_POS "EXTENSIONS_HID_BIB_CUSTOM5_POS" +#define HID_BIB_DB_GRIDCTRL "EXTENSIONS_HID_BIB_DB_GRIDCTRL" + +#define HID_GROUPWIZARD_PREVIOUS "EXTENSIONS_HID_GROUPWIZARD_PREVIOUS" +#define HID_GROUPWIZARD_NEXT "EXTENSIONS_HID_GROUPWIZARD_NEXT" +#define HID_GROUPWIZARD_CANCEL "EXTENSIONS_HID_GROUPWIZARD_CANCEL" +#define HID_GROUPWIZARD_FINISH "EXTENSIONS_HID_GROUPWIZARD_FINISH" +#define HID_LISTWIZARD_PREVIOUS "EXTENSIONS_HID_LISTWIZARD_PREVIOUS" +#define HID_LISTWIZARD_NEXT "EXTENSIONS_HID_LISTWIZARD_NEXT" +#define HID_LISTWIZARD_CANCEL "EXTENSIONS_HID_LISTWIZARD_CANCEL" +#define HID_LISTWIZARD_FINISH "EXTENSIONS_HID_LISTWIZARD_FINISH" +#define HID_GRIDWIZARD_PREVIOUS "EXTENSIONS_HID_GRIDWIZARD_PREVIOUS" +#define HID_GRIDWIZARD_NEXT "EXTENSIONS_HID_GRIDWIZARD_NEXT" +#define HID_GRIDWIZARD_CANCEL "EXTENSIONS_HID_GRIDWIZARD_CANCEL" +#define HID_GRIDWIZARD_FINISH "EXTENSIONS_HID_GRIDWIZARD_FINISH" #define HID_PROP_INPUT_REQUIRED "EXTENSIONS_HID_PROP_INPUT_REQUIRED" #define HID_PROP_GROUPBOX "EXTENSIONS_HID_PROP_GROUPBOX" @@ -314,6 +308,17 @@ #define HID_FM_PROPDLG_TAB_EVT "EXTENSIONS_HID_FM_PROPDLG_TAB_EVT" #define HID_PROP_GROUP_NAME "EXTENSIONS_HID_PROP_GROUP_NAME" -#endif // EXTENSIONS_PROPCTRLR_HRC +#define HID_CHECK_FOR_UPD_DLG "EXTENSIONS_HID_CHECK_FOR_UPD_DLG" +#define HID_CHECK_FOR_UPD_CLOSE "EXTENSIONS_HID_CHECK_FOR_UPD_CLOSE" +#define HID_CHECK_FOR_UPD_PAUSE "EXTENSIONS_HID_CHECK_FOR_UPD_PAUSE" +#define HID_CHECK_FOR_UPD_RESUME "EXTENSIONS_HID_CHECK_FOR_UPD_RESUME" +#define HID_CHECK_FOR_UPD_DOWNLOAD "EXTENSIONS_HID_CHECK_FOR_UPD_DOWNLOAD" +#define HID_CHECK_FOR_UPD_DOWNLOAD2 "EXTENSIONS_HID_CHECK_FOR_UPD_DOWNLOAD2" +#define HID_CHECK_FOR_UPD_INSTALL "EXTENSIONS_HID_CHECK_FOR_UPD_INSTALL" +#define HID_CHECK_FOR_UPD_STATUS "EXTENSIONS_HID_CHECK_FOR_UPD_STATUS" +#define HID_CHECK_FOR_UPD_DESCRIPTION "EXTENSIONS_HID_CHECK_FOR_UPD_DESCRIPTION" +#define HID_CHECK_FOR_UPD_CANCEL "EXTENSIONS_HID_CHECK_FOR_UPD_CANCEL" + +#endif // EXTENSIONS_ABPILOT_HRC /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/inc/propctrlr.h b/extensions/inc/propctrlr.h new file mode 100644 index 000000000000..9a819cc08c25 --- /dev/null +++ b/extensions/inc/propctrlr.h @@ -0,0 +1,84 @@ +/* -*- 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 EXTENSIONS_PROPCTRLR_H +#define EXTENSIONS_PROPCTRLR_H + +#define UID_PROP_DLG_FONT_TYPE "EXTENSIONS_UID_PROP_DLG_FONT_TYPE" +#define UID_PROP_DLG_IMAGE_URL "EXTENSIONS_UID_PROP_DLG_IMAGE_URL" +#define UID_PROP_DLG_BACKGROUNDCOLOR "EXTENSIONS_UID_PROP_DLG_BACKGROUNDCOLOR" +#define UID_PROP_DLG_SYMBOLCOLOR "EXTENSIONS_UID_PROP_DLG_SYMBOLCOLOR" +#define UID_PROP_DLG_ATTR_DATASOURCE "EXTENSIONS_UID_PROP_DLG_ATTR_DATASOURCE" +#define UID_PROP_DLG_ATTR_TARGET_URL "EXTENSIONS_UID_PROP_DLG_ATTR_TARGET_URL" +#define UID_PROP_DLG_NUMBER_FORMAT "EXTENSIONS_UID_PROP_DLG_NUMBER_FORMAT" +#define UID_PROP_DLG_CONTROLLABEL "EXTENSIONS_UID_PROP_DLG_CONTROLLABEL" +#define UID_PROP_DLG_FILLCOLOR "EXTENSIONS_UID_PROP_DLG_FILLCOLOR" +#define UID_PROP_DLG_TABINDEX "EXTENSIONS_UID_PROP_DLG_TABINDEX" +#define UID_PROP_DLG_SQLCOMMAND "EXTENSIONS_UID_PROP_DLG_SQLCOMMAND" +#define UID_PROP_DLG_FORMLINKFIELDS "EXTENSIONS_UID_PROP_DLG_FORMLINKFIELDS" +#define UID_PROP_DLG_FILTER "EXTENSIONS_UID_PROP_DLG_FILTER" +#define UID_PROP_DLG_ORDER "EXTENSIONS_UID_PROP_DLG_ORDER" +#define UID_PROP_DLG_SELECTION "EXTENSIONS_UID_PROP_DLG_SELECTION" +#define UID_PROP_DLG_BIND_EXPRESSION "EXTENSIONS_UID_PROP_DLG_BIND_EXPRESSION" +#define UID_PROP_DLG_XSD_REQUIRED "EXTENSIONS_UID_PROP_DLG_XSD_REQUIRED" +#define UID_PROP_DLG_XSD_RELEVANT "EXTENSIONS_UID_PROP_DLG_XSD_RELEVANT" +#define UID_PROP_DLG_XSD_READONLY "EXTENSIONS_UID_PROP_DLG_XSD_READONLY" +#define UID_PROP_DLG_XSD_CONSTRAINT "EXTENSIONS_UID_PROP_DLG_XSD_CONSTRAINT" +#define UID_PROP_DLG_XSD_CALCULATION "EXTENSIONS_UID_PROP_DLG_XSD_CALCULATION" +#define UID_PROP_ADD_DATA_TYPE "EXTENSIONS_UID_PROP_ADD_DATA_TYPE" +#define UID_PROP_REMOVE_DATA_TYPE "EXTENSIONS_UID_PROP_REMOVE_DATA_TYPE" +#define UID_PROP_DLG_BORDERCOLOR "EXTENSIONS_UID_PROP_DLG_BORDERCOLOR" + +#define UID_BRWEVT_APPROVEACTIONPERFORMED "EXTENSIONS_UID_BRWEVT_APPROVEACTIONPERFORMED" +#define UID_BRWEVT_ACTIONPERFORMED "EXTENSIONS_UID_BRWEVT_ACTIONPERFORMED" +#define UID_BRWEVT_CHANGED "EXTENSIONS_UID_BRWEVT_CHANGED" +#define UID_BRWEVT_TEXTCHANGED "EXTENSIONS_UID_BRWEVT_TEXTCHANGED" +#define UID_BRWEVT_ITEMSTATECHANGED "EXTENSIONS_UID_BRWEVT_ITEMSTATECHANGED" +#define UID_BRWEVT_FOCUSGAINED "EXTENSIONS_UID_BRWEVT_FOCUSGAINED" +#define UID_BRWEVT_FOCUSLOST "EXTENSIONS_UID_BRWEVT_FOCUSLOST" +#define UID_BRWEVT_KEYTYPED "EXTENSIONS_UID_BRWEVT_KEYTYPED" +#define UID_BRWEVT_KEYUP "EXTENSIONS_UID_BRWEVT_KEYUP" +#define UID_BRWEVT_MOUSEENTERED "EXTENSIONS_UID_BRWEVT_MOUSEENTERED" +#define UID_BRWEVT_MOUSEDRAGGED "EXTENSIONS_UID_BRWEVT_MOUSEDRAGGED" +#define UID_BRWEVT_MOUSEMOVED "EXTENSIONS_UID_BRWEVT_MOUSEMOVED" +#define UID_BRWEVT_MOUSEPRESSED "EXTENSIONS_UID_BRWEVT_MOUSEPRESSED" +#define UID_BRWEVT_MOUSERELEASED "EXTENSIONS_UID_BRWEVT_MOUSERELEASED" +#define UID_BRWEVT_MOUSEEXITED "EXTENSIONS_UID_BRWEVT_MOUSEEXITED" +#define UID_BRWEVT_APPROVERESETTED "EXTENSIONS_UID_BRWEVT_APPROVERESETTED" +#define UID_BRWEVT_RESETTED "EXTENSIONS_UID_BRWEVT_RESETTED" +#define UID_BRWEVT_SUBMITTED "EXTENSIONS_UID_BRWEVT_SUBMITTED" +#define UID_BRWEVT_BEFOREUPDATE "EXTENSIONS_UID_BRWEVT_BEFOREUPDATE" +#define UID_BRWEVT_AFTERUPDATE "EXTENSIONS_UID_BRWEVT_AFTERUPDATE" +#define UID_BRWEVT_LOADED "EXTENSIONS_UID_BRWEVT_LOADED" +#define UID_BRWEVT_RELOADING "EXTENSIONS_UID_BRWEVT_RELOADING" +#define UID_BRWEVT_RELOADED "EXTENSIONS_UID_BRWEVT_RELOADED" +#define UID_BRWEVT_UNLOADING "EXTENSIONS_UID_BRWEVT_UNLOADING" +#define UID_BRWEVT_UNLOADED "EXTENSIONS_UID_BRWEVT_UNLOADED" +#define UID_BRWEVT_CONFIRMDELETE "EXTENSIONS_UID_BRWEVT_CONFIRMDELETE" +#define UID_BRWEVT_APPROVEROWCHANGE "EXTENSIONS_UID_BRWEVT_APPROVEROWCHANGE" +#define UID_BRWEVT_ROWCHANGE "EXTENSIONS_UID_BRWEVT_ROWCHANGE" +#define UID_BRWEVT_POSITIONING "EXTENSIONS_UID_BRWEVT_POSITIONING" +#define UID_BRWEVT_POSITIONED "EXTENSIONS_UID_BRWEVT_POSITIONED" +#define UID_BRWEVT_APPROVEPARAMETER "EXTENSIONS_UID_BRWEVT_APPROVEPARAMETER" +#define UID_BRWEVT_ERROROCCURRED "EXTENSIONS_UID_BRWEVT_ERROROCCURRED" +#define UID_BRWEVT_ADJUSTMENTVALUECHANGED "EXTENSIONS_UID_BRWEVT_ADJUSTMENTVALUECHANGED" + +#endif // EXTENSIONS_PROPCTRLR_HRC + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/inc/update.hrc b/extensions/inc/update.hrc deleted file mode 100644 index 35fdd39e3e76..000000000000 --- a/extensions/inc/update.hrc +++ /dev/null @@ -1,36 +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 EXTENSIONS_UPDATE_HRC -#define EXTENSIONS_UPDATE_HRC - -#define HID_CHECK_FOR_UPD_DLG "EXTENSIONS_HID_CHECK_FOR_UPD_DLG" -#define HID_CHECK_FOR_UPD_CLOSE "EXTENSIONS_HID_CHECK_FOR_UPD_CLOSE" -#define HID_CHECK_FOR_UPD_PAUSE "EXTENSIONS_HID_CHECK_FOR_UPD_PAUSE" -#define HID_CHECK_FOR_UPD_RESUME "EXTENSIONS_HID_CHECK_FOR_UPD_RESUME" -#define HID_CHECK_FOR_UPD_DOWNLOAD "EXTENSIONS_HID_CHECK_FOR_UPD_DOWNLOAD" -#define HID_CHECK_FOR_UPD_DOWNLOAD2 "EXTENSIONS_HID_CHECK_FOR_UPD_DOWNLOAD2" -#define HID_CHECK_FOR_UPD_INSTALL "EXTENSIONS_HID_CHECK_FOR_UPD_INSTALL" -#define HID_CHECK_FOR_UPD_STATUS "EXTENSIONS_HID_CHECK_FOR_UPD_STATUS" -#define HID_CHECK_FOR_UPD_DESCRIPTION "EXTENSIONS_HID_CHECK_FOR_UPD_DESCRIPTION" -#define HID_CHECK_FOR_UPD_CANCEL "EXTENSIONS_HID_CHECK_FOR_UPD_CANCEL" - -#endif // EXTENSIONS_UPDATE_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx index 8223c1a35f0f..ca485fee4bdb 100644 --- a/extensions/source/abpilot/abspilot.cxx +++ b/extensions/source/abpilot/abspilot.cxx @@ -18,7 +18,7 @@ */ #include "abspilot.hxx" -#include "abpilot.hrc" +#include "helpids.h" #include "strings.hrc" #include "componentmodule.hxx" #include <comphelper/processfactory.hxx> diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx index c34b99164e74..4637a3f41c62 100644 --- a/extensions/source/bibliography/bibbeam.cxx +++ b/extensions/source/bibliography/bibbeam.cxx @@ -22,7 +22,7 @@ #include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/util/XURLTransformer.hpp> -#include "bibliography.hrc" +#include "helpids.h" #include <vcl/lstbox.hxx> #include <vcl/edit.hxx> #include <tools/debug.hxx> diff --git a/extensions/source/bibliography/bibmod.cxx b/extensions/source/bibliography/bibmod.cxx index 9e0c7e30f3a1..c40b83b2ac68 100644 --- a/extensions/source/bibliography/bibmod.cxx +++ b/extensions/source/bibliography/bibmod.cxx @@ -26,7 +26,7 @@ #include <com/sun/star/lang/XLocalizable.hpp> #include "bibmod.hxx" -#include "bibprop.hrc" +#include "bibprop.hxx" #include "bibview.hxx" #include "bibresid.hxx" #include "datman.hxx" diff --git a/extensions/source/bibliography/bibprop.hrc b/extensions/source/bibliography/bibprop.hxx index 46d6d40c9291..21261dc5ad76 100644 --- a/extensions/source/bibliography/bibprop.hrc +++ b/extensions/source/bibliography/bibprop.hxx @@ -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 INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBPROP_HRC -#define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBPROP_HRC +#ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBPROP_HXX +#define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBPROP_HXX extern rtl::OUString FM_PROP_LABEL; extern rtl::OUString FM_PROP_NAME; diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 87d7e1b1eafa..9890daa05654 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -64,13 +64,13 @@ #include "bibresid.hxx" #include "bibmod.hxx" #include "bibview.hxx" -#include "bibprop.hrc" +#include "bibprop.hxx" #include "toolbar.hxx" #include "bibconfig.hxx" #include "bibbeam.hxx" #include "general.hxx" #include "strings.hrc" -#include "bibliography.hrc" +#include "helpids.h" #include <connectivity/dbtools.hxx> #include <memory> diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index 23e00ac58232..4f7f811fb5a5 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -32,7 +32,7 @@ #include "bibconfig.hxx" #include <cppuhelper/implbase.hxx> #include <vcl/svapp.hxx> -#include "bibliography.hrc" +#include "helpids.h" #include <comphelper/processfactory.hxx> #include <com/sun/star/form/XConfirmDeleteListener.hpp> #include <com/sun/star/form/runtime/XFormController.hpp> diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index 55389976bab9..d20e53d61a6f 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -32,12 +32,12 @@ #include "bibresid.hxx" #include "datman.hxx" #include "bibconfig.hxx" -#include "bibprop.hrc" +#include "bibprop.hxx" #include "strings.hrc" #include "bibmod.hxx" #include "bibview.hxx" #include "bibtools.hxx" -#include "bibliography.hrc" +#include "helpids.h" #include <tools/debug.hxx> #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index bdc61e2461d1..efb95571eed2 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -30,7 +30,7 @@ #include <sal/log.hxx> #include <tools/debug.hxx> #include "dbptools.hxx" -#include "dbpilots.hrc" +#include "helpids.h" #define GW_STATE_DATASOURCE_SELECTION 0 #define GW_STATE_FIELDSELECTION 1 diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx index 269715e3e86b..740d8fe15d72 100644 --- a/extensions/source/dbpilots/groupboxwiz.cxx +++ b/extensions/source/dbpilots/groupboxwiz.cxx @@ -23,7 +23,7 @@ #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> #include "optiongrouplayouter.hxx" -#include "dbpilots.hrc" +#include "helpids.h" #include <comphelper/processfactory.hxx> #define GBW_STATE_OPTIONLIST 0 diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index a3899444c1d1..17b6894fc5d9 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -27,7 +27,7 @@ #include <tools/debug.hxx> #include <vcl/msgbox.hxx> #include <connectivity/dbtools.hxx> -#include "dbpilots.hrc" +#include "helpids.h" #include <comphelper/extract.hxx> diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx index 48f19b53bae9..86629b5e0024 100644 --- a/extensions/source/propctrlr/browserview.cxx +++ b/extensions/source/propctrlr/browserview.cxx @@ -19,7 +19,8 @@ #include "browserview.hxx" #include "propertyeditor.hxx" -#include "propctrlr.hrc" +#include "helpids.h" +#include "propctrlr.h" #include <vcl/tabpage.hxx> #include <memory> diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx index 21c2eaf2331a..475ad3f247a4 100644 --- a/extensions/source/propctrlr/defaultforminspection.cxx +++ b/extensions/source/propctrlr/defaultforminspection.cxx @@ -20,10 +20,11 @@ #include "defaultforminspection.hxx" #include "pcrcommon.hxx" #include "pcrservices.hxx" +#include "helpids.h" #include "strings.hrc" #include "strings.hrc" #include "modulepcr.hxx" -#include "propctrlr.hrc" +#include "propctrlr.h" #include "formmetadata.hxx" #include <com/sun/star/ucb/AlreadyInitializedException.hpp> diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx index 45e106db0b0f..5593fce5e1bf 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.cxx +++ b/extensions/source/propctrlr/eformspropertyhandler.cxx @@ -21,7 +21,7 @@ #include "formstrings.hxx" #include "formmetadata.hxx" #include "pcrservices.hxx" -#include "propctrlr.hrc" +#include "propctrlr.h" #include "formbrowsertools.hxx" #include "eformshelper.hxx" #include "handlerhelper.hxx" diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index b33fc45f1605..9b690dbd135c 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -20,7 +20,8 @@ #include "eventhandler.hxx" #include "pcrservices.hxx" -#include "propctrlr.hrc" +#include "helpids.h" +#include "propctrlr.h" #include "formbrowsertools.hxx" #include "strings.hrc" #include "formstrings.hxx" diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index cf53f9428941..cfd0ce7cf7d0 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -20,8 +20,7 @@ #include "controltype.hxx" #include "pcrservices.hxx" -#include "propctrlr.hrc" -#include "extensio.hrc" +#include "propctrlr.h" #include "fontdialog.hxx" #include "formcomponenthandler.hxx" #include "formlinkdialog.hxx" diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx index a65eb6eabdaf..27258f949977 100644 --- a/extensions/source/propctrlr/formcontroller.cxx +++ b/extensions/source/propctrlr/formcontroller.cxx @@ -22,7 +22,7 @@ #include "pcrservices.hxx" #include "formstrings.hxx" #include "defaultforminspection.hxx" -#include "propctrlr.hrc" +#include "propctrlr.h" #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/util/VetoException.hpp> diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index d0f375f2bcde..334c4cbc8292 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -20,9 +20,10 @@ #include "formmetadata.hxx" #include "formstrings.hxx" #include "command.hrc" +#include "helpids.h" #include "strings.hrc" #include "stringarrays.hrc" -#include "propctrlr.hrc" +#include "propctrlr.h" #include <comphelper/extract.hxx> #include <osl/diagnose.h> #include <sal/macros.h> diff --git a/extensions/source/propctrlr/listselectiondlg.hrc b/extensions/source/propctrlr/listselectiondlg.hrc deleted file mode 100644 index ee62daa5fd5c..000000000000 --- a/extensions/source/propctrlr/listselectiondlg.hrc +++ /dev/null @@ -1,29 +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 EXTENSIONS_SOURCE_PROPCTRLR_LISTSELECTIONDLG_HRC -#define EXTENSIONS_SOURCE_PROPCTRLR_LISTSELECTIONDLG_HRC - -#define PB_OK 1 -#define PB_CANCEL 2 -#define PB_HELP 3 - -#endif // EXTENSIONS_SOURCE_PROPCTRLR_LISTSELECTIONDLG_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx index c9a077234fe2..b79323790cc3 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx @@ -26,7 +26,7 @@ #include "xsddatatypes.hxx" #include "modulepcr.hxx" #include "strings.hrc" -#include "propctrlr.hrc" +#include "propctrlr.h" #include "newdatatype.hxx" #include "xsdvalidationhelper.hxx" #include "pcrcommon.hxx" diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx index 503552261f63..4c4eca89b045 100644 --- a/extensions/source/update/check/updatehdl.cxx +++ b/extensions/source/update/check/updatehdl.cxx @@ -19,7 +19,7 @@ #include "updatehdl.hxx" -#include "update.hrc" +#include "helpids.h" #include "osl/diagnose.h" #include "osl/thread.hxx" diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index 4afdda908a1a..2b62b30f1990 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -46,7 +46,6 @@ #include <vcl/button.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/strings.hrc> #include "rtl/ustrbuf.hxx" diff --git a/filter/inc/filter.hrc b/filter/inc/filter.hrc deleted file mode 100644 index 6c5071d19406..000000000000 --- a/filter/inc/filter.hrc +++ /dev/null @@ -1,36 +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_FILTER_INC_HRC -#define INCLUDED_FILTER_INC_HRC - -#include <svl/solar.hrc> - -// Help-Ids -------------------------------------------------------------- - -#define RID_PDF_DIALOG_START (RID_FILTER_START + 0) -// RID_PDF_DIALOG_END (RID_FILTER_START + 19) -#define RID_XSLT_DIALOG_START (RID_FILTER_START + 20) -// RID_XSLT_DIALOG_END (RID_FILTER_START + 69) - -// warning, next range is RID_FILTER_START + 100 ! - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx index 9910ac26c9bf..a258b315c6b6 100644 --- a/forms/source/component/CheckBox.cxx +++ b/forms/source/component/CheckBox.cxx @@ -19,7 +19,6 @@ #include "CheckBox.hxx" #include "property.hxx" -#include "property.hrc" #include "services.hxx" #include <comphelper/basicio.hxx> #include <comphelper/processfactory.hxx> diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx index e8bdea30e299..18647097b426 100644 --- a/forms/source/component/Columns.cxx +++ b/forms/source/component/Columns.cxx @@ -20,7 +20,6 @@ #include <string.h> #include "Columns.hxx" -#include "property.hrc" #include "property.hxx" #include "componenttools.hxx" #include "findpos.hxx" diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx index cac09c9d5099..121bcc7e18eb 100644 --- a/forms/source/component/ComboBox.cxx +++ b/forms/source/component/ComboBox.cxx @@ -20,7 +20,6 @@ #include "ComboBox.hxx" #include "property.hxx" -#include "property.hrc" #include "services.hxx" #include "frm_resource.hxx" diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index e4ba7f24fa4b..925d8a8fa3f2 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -24,7 +24,6 @@ #include "strings.hrc" #include "frm_resource.hxx" #include "GroupManager.hxx" -#include "property.hrc" #include "property.hxx" #include "services.hxx" diff --git a/forms/source/component/EditBase.cxx b/forms/source/component/EditBase.cxx index eef46ef2bbb9..a04ae4fb4044 100644 --- a/forms/source/component/EditBase.cxx +++ b/forms/source/component/EditBase.cxx @@ -19,7 +19,6 @@ #include "EditBase.hxx" #include "property.hxx" -#include "property.hrc" #include "services.hxx" #include <tools/debug.hxx> #include <comphelper/basicio.hxx> diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx index 4006e6cdea44..0a8b501df219 100644 --- a/forms/source/component/File.cxx +++ b/forms/source/component/File.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/form/FormComponentType.hpp> -#include "property.hrc" #include "services.hxx" #include <cppuhelper/queryinterface.hxx> #include <tools/debug.hxx> diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx index eee60278e94f..37b1e5e14a03 100644 --- a/forms/source/component/Filter.cxx +++ b/forms/source/component/Filter.cxx @@ -21,7 +21,6 @@ #include "FormComponent.hxx" #include "strings.hrc" #include "frm_resource.hxx" -#include "property.hrc" #include "property.hxx" #include "services.hxx" diff --git a/forms/source/component/FixedText.cxx b/forms/source/component/FixedText.cxx index 3509a9d42c58..990eaded5068 100644 --- a/forms/source/component/FixedText.cxx +++ b/forms/source/component/FixedText.cxx @@ -19,7 +19,6 @@ #include "FixedText.hxx" #include "services.hxx" -#include "property.hrc" #include "property.hxx" #include <comphelper/processfactory.hxx> diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index fae24966a626..51a54bac573d 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -20,7 +20,6 @@ #include "FormComponent.hxx" #include "strings.hrc" #include "frm_resource.hxx" -#include "property.hrc" #include "services.hxx" #include <com/sun/star/awt/XTextComponent.hpp> diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index cbae77c3211c..4d101828d3ad 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -18,7 +18,6 @@ */ #include "FormattedField.hxx" #include "services.hxx" -#include "property.hrc" #include "property.hxx" #include "frm_resource.hxx" #include "strings.hrc" diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx index 0b2bb82bf75f..dd7ff7c303d9 100644 --- a/forms/source/component/Grid.cxx +++ b/forms/source/component/Grid.cxx @@ -22,7 +22,6 @@ #include "Columns.hxx" #include "findpos.hxx" #include "Grid.hxx" -#include "property.hrc" #include "property.hxx" #include "services.hxx" #include <com/sun/star/form/FormComponentType.hpp> diff --git a/forms/source/component/GroupBox.cxx b/forms/source/component/GroupBox.cxx index 6c696a20ca8d..5f1a34bc541c 100644 --- a/forms/source/component/GroupBox.cxx +++ b/forms/source/component/GroupBox.cxx @@ -19,7 +19,6 @@ #include "GroupBox.hxx" #include "property.hxx" -#include "property.hrc" #include "services.hxx" #include <tools/debug.hxx> #include <comphelper/processfactory.hxx> diff --git a/forms/source/component/GroupManager.cxx b/forms/source/component/GroupManager.cxx index 859f6d91e537..6a6876d0e7a6 100644 --- a/forms/source/component/GroupManager.cxx +++ b/forms/source/component/GroupManager.cxx @@ -24,7 +24,7 @@ #include <osl/diagnose.h> #include <tools/solar.h> -#include "property.hrc" +#include "frm_strings.hxx" #include <algorithm> diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx index 739dbb9b1e3f..a41a25d56bdc 100644 --- a/forms/source/component/Hidden.cxx +++ b/forms/source/component/Hidden.cxx @@ -19,7 +19,6 @@ #include "Hidden.hxx" #include "property.hxx" -#include "property.hrc" #include "services.hxx" #include <tools/debug.hxx> #include <comphelper/basicio.hxx> diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index c72c211ce2b0..7aeb238b269d 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -19,7 +19,6 @@ #include "ImageControl.hxx" -#include "property.hrc" #include "strings.hrc" #include "frm_resource.hxx" #include "services.hxx" diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index 7d1f39ca8e14..4da790559b6b 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -21,7 +21,6 @@ #include "ListBox.hxx" #include "property.hxx" -#include "property.hrc" #include "services.hxx" #include "frm_resource.hxx" #include "strings.hrc" diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx index 4ba80eac0cc2..66f40ac5265f 100644 --- a/forms/source/component/RadioButton.cxx +++ b/forms/source/component/RadioButton.cxx @@ -20,7 +20,6 @@ #include "RadioButton.hxx" #include "GroupManager.hxx" #include "property.hxx" -#include "property.hrc" #include "services.hxx" #include <comphelper/basicio.hxx> #include <comphelper/processfactory.hxx> diff --git a/forms/source/component/formcontrolfont.cxx b/forms/source/component/formcontrolfont.cxx index 16195bf85532..94a2eee15f41 100644 --- a/forms/source/component/formcontrolfont.cxx +++ b/forms/source/component/formcontrolfont.cxx @@ -18,7 +18,7 @@ */ #include "formcontrolfont.hxx" -#include "property.hrc" +#include "frm_strings.hxx" #include "property.hxx" #include <cppuhelper/propshlp.hxx> #include <comphelper/property.hxx> diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index 607208941c02..ff82e1a33357 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FORMS_SOURCE_INC_FORMCOMPONENT_HXX #include "cloneable.hxx" -#include "property.hrc" #include "property.hxx" #include "propertybaghelper.hxx" #include "resettable.hxx" diff --git a/forms/source/inc/property.hrc b/forms/source/inc/property.hrc deleted file mode 100644 index 73e5e8e1de89..000000000000 --- a/forms/source/inc/property.hrc +++ /dev/null @@ -1,304 +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_FORMS_SOURCE_INC_PROPERTY_HRC -#define INCLUDED_FORMS_SOURCE_INC_PROPERTY_HRC - -#include <rtl/ustring.hxx> -#include "frm_strings.hxx" - -namespace frm -{ - -// PropertyId's, who have a mapping to a PropertyName -#define PROPERTY_ID_START 0 - -#define PROPERTY_ID_NAME (PROPERTY_ID_START + 1) -#define PROPERTY_ID_TABINDEX (PROPERTY_ID_START + 2) -#define PROPERTY_ID_CONTROLSOURCE (PROPERTY_ID_START + 3) -#define PROPERTY_ID_MASTERFIELDS (PROPERTY_ID_START + 4) -#define PROPERTY_ID_DATASOURCE (PROPERTY_ID_START + 6) -#define PROPERTY_ID_CLASSID (PROPERTY_ID_START + 9) -#define PROPERTY_ID_CURSORTYPE (PROPERTY_ID_START + 10) -#define PROPERTY_ID_READONLY (PROPERTY_ID_START + 11) -#define PROPERTY_ID_NAVIGATION (PROPERTY_ID_START + 13) -#define PROPERTY_ID_CYCLE (PROPERTY_ID_START + 14) -#define PROPERTY_ID_ALLOWADDITIONS (PROPERTY_ID_START + 15) -#define PROPERTY_ID_ALLOWEDITS (PROPERTY_ID_START + 16) -#define PROPERTY_ID_ALLOWDELETIONS (PROPERTY_ID_START + 17) -#define PROPERTY_ID_NATIVE_LOOK (PROPERTY_ID_START + 18) -#define PROPERTY_ID_INPUT_REQUIRED (PROPERTY_ID_START + 19) -#define PROPERTY_ID_WRITING_MODE (PROPERTY_ID_START + 20) -#define PROPERTY_ID_CONTEXT_WRITING_MODE (PROPERTY_ID_START + 21) -#define PROPERTY_ID_VERTICAL_ALIGN (PROPERTY_ID_START + 22) -#define PROPERTY_ID_GRAPHIC (PROPERTY_ID_START + 23) -#define PROPERTY_ID_GROUP_NAME (PROPERTY_ID_START + 24) - // free - // free - // free - // free - // free - // free -#define PROPERTY_ID_VALUE (PROPERTY_ID_START + 31) // INT32 - // free -#define PROPERTY_ID_FORMATKEY (PROPERTY_ID_START + 33) // UINT32 - // free - // free - // free -#define PROPERTY_ID_SIZE (PROPERTY_ID_START + 37) // UINT32 -#define PROPERTY_ID_REFERENCE_DEVICE (PROPERTY_ID_START + 38) // XDevice - // free - // free - // free -#define PROPERTY_ID_WIDTH (PROPERTY_ID_START + 42) // UINT16 -#define PROPERTY_ID_DEFAULTCONTROL (PROPERTY_ID_START + 43) // string -#define PROPERTY_ID_BOUNDCOLUMN (PROPERTY_ID_START + 44) // UINT16 may be null -#define PROPERTY_ID_LISTSOURCETYPE (PROPERTY_ID_START + 45) // UINT16 -#define PROPERTY_ID_LISTSOURCE (PROPERTY_ID_START + 46) // string - // FREE -#define PROPERTY_ID_TEXT (PROPERTY_ID_START + 48) // string -#define PROPERTY_ID_STRINGITEMLIST (PROPERTY_ID_START + 49) // wsstringsequence -#define PROPERTY_ID_LABEL (PROPERTY_ID_START + 50) // string -#define PROPERTY_ID_HIDEINACTIVESELECTION (PROPERTY_ID_START + 51) // sal_Bool -#define PROPERTY_ID_STATE (PROPERTY_ID_START + 52) // UINT16 -#define PROPERTY_ID_DELAY (PROPERTY_ID_START + 53) // sal_Int32 -#define PROPERTY_ID_FONT (PROPERTY_ID_START + 54) // font -#define PROPERTY_ID_HASNAVIGATION (PROPERTY_ID_START + 55) -#define PROPERTY_ID_BORDERCOLOR (PROPERTY_ID_START + 56) // sal_Int32 -#define PROPERTY_ID_ROWHEIGHT (PROPERTY_ID_START + 57) // UINT16 -#define PROPERTY_ID_BACKGROUNDCOLOR (PROPERTY_ID_START + 58) // sal_Int32 -#define PROPERTY_ID_FILLCOLOR (PROPERTY_ID_START + 59) // UINT32 -#define PROPERTY_ID_TEXTCOLOR (PROPERTY_ID_START + 60) // UINT32 -#define PROPERTY_ID_LINECOLOR (PROPERTY_ID_START + 61) // UINT32 -#define PROPERTY_ID_BORDER (PROPERTY_ID_START + 62) // UINT16 -#define PROPERTY_ID_ALIGN (PROPERTY_ID_START + 63) // UINT16 -#define PROPERTY_ID_DROPDOWN (PROPERTY_ID_START + 64) // BOOL -#define PROPERTY_ID_UNCHECKED_REFVALUE (PROPERTY_ID_START + 65) // ::rtl::OUString -#define PROPERTY_ID_HSCROLL (PROPERTY_ID_START + 66) // BOOL -#define PROPERTY_ID_VSCROLL (PROPERTY_ID_START + 67) // BOOL -#define PROPERTY_ID_TABSTOP (PROPERTY_ID_START + 68) // BOOL -#define PROPERTY_ID_REFVALUE (PROPERTY_ID_START + 69) // ::rtl::OUString -#define PROPERTY_ID_BUTTONTYPE (PROPERTY_ID_START + 70) // UINT16 -#define PROPERTY_ID_DEFAULT_TEXT (PROPERTY_ID_START + 71) // ::rtl::OUString -#define PROPERTY_ID_SUBMIT_ACTION (PROPERTY_ID_START + 72) // string -#define PROPERTY_ID_SUBMIT_METHOD (PROPERTY_ID_START + 73) // FmSubmitMethod -#define PROPERTY_ID_SUBMIT_ENCODING (PROPERTY_ID_START + 74) // FmSubmitEncoding -#define PROPERTY_ID_DEFAULT_VALUE (PROPERTY_ID_START + 75) // ::rtl::OUString -#define PROPERTY_ID_SUBMIT_TARGET (PROPERTY_ID_START + 76) // ::rtl::OUString -#define PROPERTY_ID_DEFAULT_STATE (PROPERTY_ID_START + 77) // UINT16 -#define PROPERTY_ID_VALUE_SEQ (PROPERTY_ID_START + 78) // StringSeq -#define PROPERTY_ID_IMAGE_URL (PROPERTY_ID_START + 79) // ::rtl::OUString -#define PROPERTY_ID_SELECT_VALUE (PROPERTY_ID_START + 80) // StringSeq -#define PROPERTY_ID_SELECT_VALUE_SEQ (PROPERTY_ID_START + 81) // StringSeq - // free - // free - // free - // free - // free - // free - // free - // free - // free -#define PROPERTY_ID_SELECT_SEQ (PROPERTY_ID_START + 91) // INT16Seq -#define PROPERTY_ID_DEFAULT_SELECT_SEQ (PROPERTY_ID_START + 92) // INT16Seq -#define PROPERTY_ID_MULTISELECTION (PROPERTY_ID_START + 93) // BOOL -#define PROPERTY_ID_MULTILINE (PROPERTY_ID_START + 94) // BOOL -#define PROPERTY_ID_DATE (PROPERTY_ID_START + 95) // UINT32 -#define PROPERTY_ID_DATEMIN (PROPERTY_ID_START + 96) // UINT32 -#define PROPERTY_ID_DATEMAX (PROPERTY_ID_START + 97) // UINT32 -#define PROPERTY_ID_DATEFORMAT (PROPERTY_ID_START + 98) // UINT16 -#define PROPERTY_ID_TIME (PROPERTY_ID_START + 99) // UINT32 -#define PROPERTY_ID_TIMEMIN (PROPERTY_ID_START +100) // UINT32 -#define PROPERTY_ID_TIMEMAX (PROPERTY_ID_START +101) // UINT32 -#define PROPERTY_ID_TIMEFORMAT (PROPERTY_ID_START +102) // UINT16 -#define PROPERTY_ID_VALUEMIN (PROPERTY_ID_START +103) // INT32 -#define PROPERTY_ID_VALUEMAX (PROPERTY_ID_START +104) // INT32 -#define PROPERTY_ID_VALUESTEP (PROPERTY_ID_START +105) // INT32 -#define PROPERTY_ID_CURRENCYSYMBOL (PROPERTY_ID_START +106) // ::rtl::OUString -#define PROPERTY_ID_EDITMASK (PROPERTY_ID_START +107) // ::rtl::OUString -#define PROPERTY_ID_LITERALMASK (PROPERTY_ID_START +108) // ::rtl::OUString -#define PROPERTY_ID_ENABLED (PROPERTY_ID_START +109) // BOOL -#define PROPERTY_ID_AUTOCOMPLETE (PROPERTY_ID_START +110) // BOOL -#define PROPERTY_ID_LINECOUNT (PROPERTY_ID_START +111) // UINT16 -#define PROPERTY_ID_MAXTEXTLEN (PROPERTY_ID_START +112) // UINT16 -#define PROPERTY_ID_SPIN (PROPERTY_ID_START +113) // BOOL -#define PROPERTY_ID_STRICTFORMAT (PROPERTY_ID_START +114) // BOOL -#define PROPERTY_ID_SHOWTHOUSANDSEP (PROPERTY_ID_START +115) // BOOL -#define PROPERTY_ID_HARDLINEBREAKS (PROPERTY_ID_START +116) // BOOL -#define PROPERTY_ID_PRINTABLE (PROPERTY_ID_START +117) // BOOL -#define PROPERTY_ID_TARGET_URL (PROPERTY_ID_START +118) // ::rtl::OUString -#define PROPERTY_ID_TARGET_FRAME (PROPERTY_ID_START +119) // ::rtl::OUString -#define PROPERTY_ID_TAG (PROPERTY_ID_START +120) // ::rtl::OUString -#define PROPERTY_ID_ECHO_CHAR (PROPERTY_ID_START +121) // UINT16 -#define PROPERTY_ID_SHOW_POSITION (PROPERTY_ID_START +122) // sal_Bool -#define PROPERTY_ID_SHOW_NAVIGATION (PROPERTY_ID_START +123) // sal_Bool -#define PROPERTY_ID_SHOW_RECORDACTIONS (PROPERTY_ID_START +124) // sal_Bool -#define PROPERTY_ID_SHOW_FILTERSORT (PROPERTY_ID_START +125) // sal_Bool -#define PROPERTY_ID_EMPTY_IS_NULL (PROPERTY_ID_START +126) // Bool -#define PROPERTY_ID_DECIMAL_ACCURACY (PROPERTY_ID_START +127) // UINT16 -#define PROPERTY_ID_DATE_SHOW_CENTURY (PROPERTY_ID_START +128) // Bool -#define PROPERTY_ID_TRISTATE (PROPERTY_ID_START +129) // Bool -#define PROPERTY_ID_DEFAULT_BUTTON (PROPERTY_ID_START +130) // Bool -#define PROPERTY_ID_HIDDEN_VALUE (PROPERTY_ID_START +131) // ::rtl::OUString -#define PROPERTY_ID_DECIMALS (PROPERTY_ID_START +132) // UINT16 -#define PROPERTY_ID_AUTOINCREMENT (PROPERTY_ID_START +133) // UINT16 - // free -#define PROPERTY_ID_FILTER (PROPERTY_ID_START +135) // ::rtl::OUString - // free -#define PROPERTY_ID_QUERY (PROPERTY_ID_START +137) // ::rtl::OUString -#define PROPERTY_ID_DEFAULT_LONG_VALUE (PROPERTY_ID_START +138) // Double -#define PROPERTY_ID_DEFAULT_DATE (PROPERTY_ID_START +139) // UINT32 -#define PROPERTY_ID_DEFAULT_TIME (PROPERTY_ID_START +140) -#define PROPERTY_ID_HELPTEXT (PROPERTY_ID_START +141) -#define PROPERTY_ID_FONT_NAME (PROPERTY_ID_START +142) -#define PROPERTY_ID_FONT_STYLENAME (PROPERTY_ID_START +143) -#define PROPERTY_ID_FONT_FAMILY (PROPERTY_ID_START +144) -#define PROPERTY_ID_FONT_CHARSET (PROPERTY_ID_START +145) -#define PROPERTY_ID_FONT_HEIGHT (PROPERTY_ID_START +146) -#define PROPERTY_ID_FONT_WEIGHT (PROPERTY_ID_START +147) -#define PROPERTY_ID_FONT_SLANT (PROPERTY_ID_START +148) -#define PROPERTY_ID_FONT_UNDERLINE (PROPERTY_ID_START +149) -#define PROPERTY_ID_FONT_STRIKEOUT (PROPERTY_ID_START +150) -#define PROPERTY_ID_ISPASSTHROUGH (PROPERTY_ID_START +151) -#define PROPERTY_ID_HELPURL (PROPERTY_ID_START +152) // ::rtl::OUString -#define PROPERTY_ID_RECORDMARKER (PROPERTY_ID_START +153) -#define PROPERTY_ID_BOUNDFIELD (PROPERTY_ID_START +154) -#define PROPERTY_ID_FORMATSSUPPLIER (PROPERTY_ID_START +155) // XNumberFormatsSupplier -#define PROPERTY_ID_TREATASNUMERIC (PROPERTY_ID_START +156) // BOOL -#define PROPERTY_ID_EFFECTIVE_VALUE (PROPERTY_ID_START +157) // ANY (string or double) -#define PROPERTY_ID_EFFECTIVE_DEFAULT (PROPERTY_ID_START +158) // dito -#define PROPERTY_ID_EFFECTIVE_MIN (PROPERTY_ID_START +159) // dito -#define PROPERTY_ID_EFFECTIVE_MAX (PROPERTY_ID_START +160) // dito -#define PROPERTY_ID_HIDDEN (PROPERTY_ID_START +161) // BOOL -#define PROPERTY_ID_FILTERPROPOSAL (PROPERTY_ID_START +162) // BOOL -#define PROPERTY_ID_FIELDSOURCE (PROPERTY_ID_START +163) // String -#define PROPERTY_ID_TABLENAME (PROPERTY_ID_START +164) // String -#define PROPERTY_ID_ENABLEVISIBLE (PROPERTY_ID_START +165) // BOOL - // FREE - // FREE - // FREE - // FREE -#define PROPERTY_ID_CONTROLLABEL (PROPERTY_ID_START +171) // XPropertySet -#define PROPERTY_ID_CURRSYM_POSITION (PROPERTY_ID_START +172) // String - // FREE -#define PROPERTY_ID_CURSORCOLOR (PROPERTY_ID_START +174) // INT32 -#define PROPERTY_ID_ALWAYSSHOWCURSOR (PROPERTY_ID_START +175) // BOOL -#define PROPERTY_ID_DISPLAYSYNCHRON (PROPERTY_ID_START +176) // BOOL -#define PROPERTY_ID_ISMODIFIED (PROPERTY_ID_START +177) // BOOL -#define PROPERTY_ID_ISNEW (PROPERTY_ID_START +178) // BOOL -#define PROPERTY_ID_PRIVILEGES (PROPERTY_ID_START +179) // INT32 -#define PROPERTY_ID_DETAILFIELDS (PROPERTY_ID_START +180) // Sequence< ::rtl::OUString > -#define PROPERTY_ID_COMMAND (PROPERTY_ID_START +181) // String -#define PROPERTY_ID_COMMANDTYPE (PROPERTY_ID_START +182) // INT32 (css::sdb::CommandType) -#define PROPERTY_ID_RESULTSET_CONCURRENCY (PROPERTY_ID_START +183)// INT32 (css::sdbc::ResultSetConcurrency) -#define PROPERTY_ID_INSERTONLY (PROPERTY_ID_START +184) // BOOL -#define PROPERTY_ID_RESULTSET_TYPE (PROPERTY_ID_START +185) // INT32 (css::sdbc::ResultSetType) -#define PROPERTY_ID_ESCAPE_PROCESSING (PROPERTY_ID_START +186) // BOOL -#define PROPERTY_ID_APPLYFILTER (PROPERTY_ID_START +187) // BOOL - -#define PROPERTY_ID_ISNULLABLE (PROPERTY_ID_START +188) // BOOL -#define PROPERTY_ID_ACTIVECOMMAND (PROPERTY_ID_START +189) // String -#define PROPERTY_ID_ISCURRENCY (PROPERTY_ID_START +190) // BOOL -#define PROPERTY_ID_URL (PROPERTY_ID_START +192) // String -#define PROPERTY_ID_TITLE (PROPERTY_ID_START +193) // String -#define PROPERTY_ID_ACTIVE_CONNECTION (PROPERTY_ID_START +194) // css::sdbc::XConnection -#define PROPERTY_ID_SCALE (PROPERTY_ID_START +195) // INT32 -#define PROPERTY_ID_SORT (PROPERTY_ID_START +196) // String - - // free - // free -#define PROPERTY_ID_FETCHSIZE (PROPERTY_ID_START +199) - // free -#define PROPERTY_ID_SEARCHABLE (PROPERTY_ID_START +201) -#define PROPERTY_ID_ISREADONLY (PROPERTY_ID_START +202) - // free -#define PROPERTY_ID_FIELDTYPE (PROPERTY_ID_START +204) -#define PROPERTY_ID_COLUMNSERVICENAME (PROPERTY_ID_START +205) -#define PROPERTY_ID_CONTROLSOURCEPROPERTY (PROPERTY_ID_START +206) -#define PROPERTY_ID_REALNAME (PROPERTY_ID_START +207) -#define PROPERTY_ID_FONT_WORDLINEMODE (PROPERTY_ID_START +208) -#define PROPERTY_ID_TEXTLINECOLOR (PROPERTY_ID_START +209) -#define PROPERTY_ID_FONTEMPHASISMARK (PROPERTY_ID_START +210) -#define PROPERTY_ID_FONTRELIEF (PROPERTY_ID_START +211) - -#define PROPERTY_ID_DISPATCHURLINTERNAL ( PROPERTY_ID_START + 212 ) // sal_Bool -#define PROPERTY_ID_PERSISTENCE_MAXTEXTLENGTH ( PROPERTY_ID_START + 213 ) // sal_Int16 -#define PROPERTY_ID_DEFAULT_SCROLL_VALUE ( PROPERTY_ID_START + 214 ) // sal_Int32 -#define PROPERTY_ID_DEFAULT_SPIN_VALUE ( PROPERTY_ID_START + 215 ) // sal_Int32 -#define PROPERTY_ID_SCROLL_VALUE ( PROPERTY_ID_START + 216 ) // sal_Int32 -#define PROPERTY_ID_SPIN_VALUE ( PROPERTY_ID_START + 217 ) // sal_Int32 -#define PROPERTY_ID_ICONSIZE ( PROPERTY_ID_START + 218 ) // sal_Int16 - -#define PROPERTY_ID_FONT_CHARWIDTH ( PROPERTY_ID_START + 219 ) // float -#define PROPERTY_ID_FONT_KERNING ( PROPERTY_ID_START + 220 ) // sal_Bool -#define PROPERTY_ID_FONT_ORIENTATION ( PROPERTY_ID_START + 221 ) // float -#define PROPERTY_ID_FONT_PITCH ( PROPERTY_ID_START + 222 ) // sal_Int16 -#define PROPERTY_ID_FONT_TYPE ( PROPERTY_ID_START + 223 ) // sal_Int16 -#define PROPERTY_ID_FONT_WIDTH ( PROPERTY_ID_START + 224 ) // sal_Int16 -#define PROPERTY_ID_RICH_TEXT ( PROPERTY_ID_START + 225 ) // sal_Bool - -#define PROPERTY_ID_DYNAMIC_CONTROL_BORDER ( PROPERTY_ID_START + 226 ) // sal_Bool -#define PROPERTY_ID_CONTROL_BORDER_COLOR_FOCUS ( PROPERTY_ID_START + 227 ) // sal_Int32 -#define PROPERTY_ID_CONTROL_BORDER_COLOR_MOUSE ( PROPERTY_ID_START + 228 ) // sal_Int32 -#define PROPERTY_ID_CONTROL_BORDER_COLOR_INVALID ( PROPERTY_ID_START + 229 ) // sal_Int32 - -#define PROPERTY_ID_XSD_PATTERN ( PROPERTY_ID_START + 230 ) -#define PROPERTY_ID_XSD_WHITESPACE ( PROPERTY_ID_START + 231 ) -#define PROPERTY_ID_XSD_LENGTH ( PROPERTY_ID_START + 232 ) -#define PROPERTY_ID_XSD_MIN_LENGTH ( PROPERTY_ID_START + 233 ) -#define PROPERTY_ID_XSD_MAX_LENGTH ( PROPERTY_ID_START + 234 ) -#define PROPERTY_ID_XSD_TOTAL_DIGITS ( PROPERTY_ID_START + 235 ) -#define PROPERTY_ID_XSD_FRACTION_DIGITS ( PROPERTY_ID_START + 236 ) -#define PROPERTY_ID_XSD_MAX_INCLUSIVE_INT ( PROPERTY_ID_START + 237 ) -#define PROPERTY_ID_XSD_MAX_EXCLUSIVE_INT ( PROPERTY_ID_START + 238 ) -#define PROPERTY_ID_XSD_MIN_INCLUSIVE_INT ( PROPERTY_ID_START + 239 ) -#define PROPERTY_ID_XSD_MIN_EXCLUSIVE_INT ( PROPERTY_ID_START + 240 ) -#define PROPERTY_ID_XSD_MAX_INCLUSIVE_DOUBLE ( PROPERTY_ID_START + 241 ) -#define PROPERTY_ID_XSD_MAX_EXCLUSIVE_DOUBLE ( PROPERTY_ID_START + 242 ) -#define PROPERTY_ID_XSD_MIN_INCLUSIVE_DOUBLE ( PROPERTY_ID_START + 243 ) -#define PROPERTY_ID_XSD_MIN_EXCLUSIVE_DOUBLE ( PROPERTY_ID_START + 244 ) -#define PROPERTY_ID_XSD_MAX_INCLUSIVE_DATE ( PROPERTY_ID_START + 245 ) -#define PROPERTY_ID_XSD_MAX_EXCLUSIVE_DATE ( PROPERTY_ID_START + 246 ) -#define PROPERTY_ID_XSD_MIN_INCLUSIVE_DATE ( PROPERTY_ID_START + 247 ) -#define PROPERTY_ID_XSD_MIN_EXCLUSIVE_DATE ( PROPERTY_ID_START + 248 ) -#define PROPERTY_ID_XSD_MAX_INCLUSIVE_TIME ( PROPERTY_ID_START + 249 ) -#define PROPERTY_ID_XSD_MAX_EXCLUSIVE_TIME ( PROPERTY_ID_START + 250 ) -#define PROPERTY_ID_XSD_MIN_INCLUSIVE_TIME ( PROPERTY_ID_START + 251 ) -#define PROPERTY_ID_XSD_MIN_EXCLUSIVE_TIME ( PROPERTY_ID_START + 252 ) -#define PROPERTY_ID_XSD_MAX_INCLUSIVE_DATE_TIME ( PROPERTY_ID_START + 253 ) -#define PROPERTY_ID_XSD_MAX_EXCLUSIVE_DATE_TIME ( PROPERTY_ID_START + 254 ) -#define PROPERTY_ID_XSD_MIN_INCLUSIVE_DATE_TIME ( PROPERTY_ID_START + 255 ) -#define PROPERTY_ID_XSD_MIN_EXCLUSIVE_DATE_TIME ( PROPERTY_ID_START + 256 ) -#define PROPERTY_ID_XSD_IS_BASIC ( PROPERTY_ID_START + 257 ) -#define PROPERTY_ID_XSD_TYPE_CLASS ( PROPERTY_ID_START + 258 ) - -#define PROPERTY_ID_LINEEND_FORMAT ( PROPERTY_ID_START + 259 ) // css.awt.LineEndFormat -#define PROPERTY_ID_GENERATEVBAEVENTS ( PROPERTY_ID_START + 260 ) -#define PROPERTY_ID_CONTROL_TYPE_IN_MSO ( PROPERTY_ID_START + 261 ) -#define PROPERTY_ID_OBJ_ID_IN_MSO ( PROPERTY_ID_START + 262 ) - -#define PROPERTY_ID_TYPEDITEMLIST ( PROPERTY_ID_START + 263 ) // Sequence<Any> - -// start ID for aggregated properties -#define PROPERTY_ID_AGGREGATE_ID (PROPERTY_ID_START + 10000) - -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx index b718e1851800..b5d879a9e7a6 100644 --- a/forms/source/inc/property.hxx +++ b/forms/source/inc/property.hxx @@ -39,6 +39,278 @@ using namespace comphelper; namespace frm { +// PropertyId's, who have a mapping to a PropertyName +#define PROPERTY_ID_START 0 + +#define PROPERTY_ID_NAME (PROPERTY_ID_START + 1) +#define PROPERTY_ID_TABINDEX (PROPERTY_ID_START + 2) +#define PROPERTY_ID_CONTROLSOURCE (PROPERTY_ID_START + 3) +#define PROPERTY_ID_MASTERFIELDS (PROPERTY_ID_START + 4) +#define PROPERTY_ID_DATASOURCE (PROPERTY_ID_START + 6) +#define PROPERTY_ID_CLASSID (PROPERTY_ID_START + 9) +#define PROPERTY_ID_CURSORTYPE (PROPERTY_ID_START + 10) +#define PROPERTY_ID_READONLY (PROPERTY_ID_START + 11) +#define PROPERTY_ID_NAVIGATION (PROPERTY_ID_START + 13) +#define PROPERTY_ID_CYCLE (PROPERTY_ID_START + 14) +#define PROPERTY_ID_ALLOWADDITIONS (PROPERTY_ID_START + 15) +#define PROPERTY_ID_ALLOWEDITS (PROPERTY_ID_START + 16) +#define PROPERTY_ID_ALLOWDELETIONS (PROPERTY_ID_START + 17) +#define PROPERTY_ID_NATIVE_LOOK (PROPERTY_ID_START + 18) +#define PROPERTY_ID_INPUT_REQUIRED (PROPERTY_ID_START + 19) +#define PROPERTY_ID_WRITING_MODE (PROPERTY_ID_START + 20) +#define PROPERTY_ID_CONTEXT_WRITING_MODE (PROPERTY_ID_START + 21) +#define PROPERTY_ID_VERTICAL_ALIGN (PROPERTY_ID_START + 22) +#define PROPERTY_ID_GRAPHIC (PROPERTY_ID_START + 23) +#define PROPERTY_ID_GROUP_NAME (PROPERTY_ID_START + 24) + // free + // free + // free + // free + // free + // free +#define PROPERTY_ID_VALUE (PROPERTY_ID_START + 31) // INT32 + // free +#define PROPERTY_ID_FORMATKEY (PROPERTY_ID_START + 33) // UINT32 + // free + // free + // free +#define PROPERTY_ID_SIZE (PROPERTY_ID_START + 37) // UINT32 +#define PROPERTY_ID_REFERENCE_DEVICE (PROPERTY_ID_START + 38) // XDevice + // free + // free + // free +#define PROPERTY_ID_WIDTH (PROPERTY_ID_START + 42) // UINT16 +#define PROPERTY_ID_DEFAULTCONTROL (PROPERTY_ID_START + 43) // string +#define PROPERTY_ID_BOUNDCOLUMN (PROPERTY_ID_START + 44) // UINT16 may be null +#define PROPERTY_ID_LISTSOURCETYPE (PROPERTY_ID_START + 45) // UINT16 +#define PROPERTY_ID_LISTSOURCE (PROPERTY_ID_START + 46) // string + // FREE +#define PROPERTY_ID_TEXT (PROPERTY_ID_START + 48) // string +#define PROPERTY_ID_STRINGITEMLIST (PROPERTY_ID_START + 49) // wsstringsequence +#define PROPERTY_ID_LABEL (PROPERTY_ID_START + 50) // string +#define PROPERTY_ID_HIDEINACTIVESELECTION (PROPERTY_ID_START + 51) // sal_Bool +#define PROPERTY_ID_STATE (PROPERTY_ID_START + 52) // UINT16 +#define PROPERTY_ID_DELAY (PROPERTY_ID_START + 53) // sal_Int32 +#define PROPERTY_ID_FONT (PROPERTY_ID_START + 54) // font +#define PROPERTY_ID_HASNAVIGATION (PROPERTY_ID_START + 55) +#define PROPERTY_ID_BORDERCOLOR (PROPERTY_ID_START + 56) // sal_Int32 +#define PROPERTY_ID_ROWHEIGHT (PROPERTY_ID_START + 57) // UINT16 +#define PROPERTY_ID_BACKGROUNDCOLOR (PROPERTY_ID_START + 58) // sal_Int32 +#define PROPERTY_ID_FILLCOLOR (PROPERTY_ID_START + 59) // UINT32 +#define PROPERTY_ID_TEXTCOLOR (PROPERTY_ID_START + 60) // UINT32 +#define PROPERTY_ID_LINECOLOR (PROPERTY_ID_START + 61) // UINT32 +#define PROPERTY_ID_BORDER (PROPERTY_ID_START + 62) // UINT16 +#define PROPERTY_ID_ALIGN (PROPERTY_ID_START + 63) // UINT16 +#define PROPERTY_ID_DROPDOWN (PROPERTY_ID_START + 64) // BOOL +#define PROPERTY_ID_UNCHECKED_REFVALUE (PROPERTY_ID_START + 65) // ::rtl::OUString +#define PROPERTY_ID_HSCROLL (PROPERTY_ID_START + 66) // BOOL +#define PROPERTY_ID_VSCROLL (PROPERTY_ID_START + 67) // BOOL +#define PROPERTY_ID_TABSTOP (PROPERTY_ID_START + 68) // BOOL +#define PROPERTY_ID_REFVALUE (PROPERTY_ID_START + 69) // ::rtl::OUString +#define PROPERTY_ID_BUTTONTYPE (PROPERTY_ID_START + 70) // UINT16 +#define PROPERTY_ID_DEFAULT_TEXT (PROPERTY_ID_START + 71) // ::rtl::OUString +#define PROPERTY_ID_SUBMIT_ACTION (PROPERTY_ID_START + 72) // string +#define PROPERTY_ID_SUBMIT_METHOD (PROPERTY_ID_START + 73) // FmSubmitMethod +#define PROPERTY_ID_SUBMIT_ENCODING (PROPERTY_ID_START + 74) // FmSubmitEncoding +#define PROPERTY_ID_DEFAULT_VALUE (PROPERTY_ID_START + 75) // ::rtl::OUString +#define PROPERTY_ID_SUBMIT_TARGET (PROPERTY_ID_START + 76) // ::rtl::OUString +#define PROPERTY_ID_DEFAULT_STATE (PROPERTY_ID_START + 77) // UINT16 +#define PROPERTY_ID_VALUE_SEQ (PROPERTY_ID_START + 78) // StringSeq +#define PROPERTY_ID_IMAGE_URL (PROPERTY_ID_START + 79) // ::rtl::OUString +#define PROPERTY_ID_SELECT_VALUE (PROPERTY_ID_START + 80) // StringSeq +#define PROPERTY_ID_SELECT_VALUE_SEQ (PROPERTY_ID_START + 81) // StringSeq + // free + // free + // free + // free + // free + // free + // free + // free + // free +#define PROPERTY_ID_SELECT_SEQ (PROPERTY_ID_START + 91) // INT16Seq +#define PROPERTY_ID_DEFAULT_SELECT_SEQ (PROPERTY_ID_START + 92) // INT16Seq +#define PROPERTY_ID_MULTISELECTION (PROPERTY_ID_START + 93) // BOOL +#define PROPERTY_ID_MULTILINE (PROPERTY_ID_START + 94) // BOOL +#define PROPERTY_ID_DATE (PROPERTY_ID_START + 95) // UINT32 +#define PROPERTY_ID_DATEMIN (PROPERTY_ID_START + 96) // UINT32 +#define PROPERTY_ID_DATEMAX (PROPERTY_ID_START + 97) // UINT32 +#define PROPERTY_ID_DATEFORMAT (PROPERTY_ID_START + 98) // UINT16 +#define PROPERTY_ID_TIME (PROPERTY_ID_START + 99) // UINT32 +#define PROPERTY_ID_TIMEMIN (PROPERTY_ID_START +100) // UINT32 +#define PROPERTY_ID_TIMEMAX (PROPERTY_ID_START +101) // UINT32 +#define PROPERTY_ID_TIMEFORMAT (PROPERTY_ID_START +102) // UINT16 +#define PROPERTY_ID_VALUEMIN (PROPERTY_ID_START +103) // INT32 +#define PROPERTY_ID_VALUEMAX (PROPERTY_ID_START +104) // INT32 +#define PROPERTY_ID_VALUESTEP (PROPERTY_ID_START +105) // INT32 +#define PROPERTY_ID_CURRENCYSYMBOL (PROPERTY_ID_START +106) // ::rtl::OUString +#define PROPERTY_ID_EDITMASK (PROPERTY_ID_START +107) // ::rtl::OUString +#define PROPERTY_ID_LITERALMASK (PROPERTY_ID_START +108) // ::rtl::OUString +#define PROPERTY_ID_ENABLED (PROPERTY_ID_START +109) // BOOL +#define PROPERTY_ID_AUTOCOMPLETE (PROPERTY_ID_START +110) // BOOL +#define PROPERTY_ID_LINECOUNT (PROPERTY_ID_START +111) // UINT16 +#define PROPERTY_ID_MAXTEXTLEN (PROPERTY_ID_START +112) // UINT16 +#define PROPERTY_ID_SPIN (PROPERTY_ID_START +113) // BOOL +#define PROPERTY_ID_STRICTFORMAT (PROPERTY_ID_START +114) // BOOL +#define PROPERTY_ID_SHOWTHOUSANDSEP (PROPERTY_ID_START +115) // BOOL +#define PROPERTY_ID_HARDLINEBREAKS (PROPERTY_ID_START +116) // BOOL +#define PROPERTY_ID_PRINTABLE (PROPERTY_ID_START +117) // BOOL +#define PROPERTY_ID_TARGET_URL (PROPERTY_ID_START +118) // ::rtl::OUString +#define PROPERTY_ID_TARGET_FRAME (PROPERTY_ID_START +119) // ::rtl::OUString +#define PROPERTY_ID_TAG (PROPERTY_ID_START +120) // ::rtl::OUString +#define PROPERTY_ID_ECHO_CHAR (PROPERTY_ID_START +121) // UINT16 +#define PROPERTY_ID_SHOW_POSITION (PROPERTY_ID_START +122) // sal_Bool +#define PROPERTY_ID_SHOW_NAVIGATION (PROPERTY_ID_START +123) // sal_Bool +#define PROPERTY_ID_SHOW_RECORDACTIONS (PROPERTY_ID_START +124) // sal_Bool +#define PROPERTY_ID_SHOW_FILTERSORT (PROPERTY_ID_START +125) // sal_Bool +#define PROPERTY_ID_EMPTY_IS_NULL (PROPERTY_ID_START +126) // Bool +#define PROPERTY_ID_DECIMAL_ACCURACY (PROPERTY_ID_START +127) // UINT16 +#define PROPERTY_ID_DATE_SHOW_CENTURY (PROPERTY_ID_START +128) // Bool +#define PROPERTY_ID_TRISTATE (PROPERTY_ID_START +129) // Bool +#define PROPERTY_ID_DEFAULT_BUTTON (PROPERTY_ID_START +130) // Bool +#define PROPERTY_ID_HIDDEN_VALUE (PROPERTY_ID_START +131) // ::rtl::OUString +#define PROPERTY_ID_DECIMALS (PROPERTY_ID_START +132) // UINT16 +#define PROPERTY_ID_AUTOINCREMENT (PROPERTY_ID_START +133) // UINT16 + // free +#define PROPERTY_ID_FILTER (PROPERTY_ID_START +135) // ::rtl::OUString + // free +#define PROPERTY_ID_QUERY (PROPERTY_ID_START +137) // ::rtl::OUString +#define PROPERTY_ID_DEFAULT_LONG_VALUE (PROPERTY_ID_START +138) // Double +#define PROPERTY_ID_DEFAULT_DATE (PROPERTY_ID_START +139) // UINT32 +#define PROPERTY_ID_DEFAULT_TIME (PROPERTY_ID_START +140) +#define PROPERTY_ID_HELPTEXT (PROPERTY_ID_START +141) +#define PROPERTY_ID_FONT_NAME (PROPERTY_ID_START +142) +#define PROPERTY_ID_FONT_STYLENAME (PROPERTY_ID_START +143) +#define PROPERTY_ID_FONT_FAMILY (PROPERTY_ID_START +144) +#define PROPERTY_ID_FONT_CHARSET (PROPERTY_ID_START +145) +#define PROPERTY_ID_FONT_HEIGHT (PROPERTY_ID_START +146) +#define PROPERTY_ID_FONT_WEIGHT (PROPERTY_ID_START +147) +#define PROPERTY_ID_FONT_SLANT (PROPERTY_ID_START +148) +#define PROPERTY_ID_FONT_UNDERLINE (PROPERTY_ID_START +149) +#define PROPERTY_ID_FONT_STRIKEOUT (PROPERTY_ID_START +150) +#define PROPERTY_ID_ISPASSTHROUGH (PROPERTY_ID_START +151) +#define PROPERTY_ID_HELPURL (PROPERTY_ID_START +152) // ::rtl::OUString +#define PROPERTY_ID_RECORDMARKER (PROPERTY_ID_START +153) +#define PROPERTY_ID_BOUNDFIELD (PROPERTY_ID_START +154) +#define PROPERTY_ID_FORMATSSUPPLIER (PROPERTY_ID_START +155) // XNumberFormatsSupplier +#define PROPERTY_ID_TREATASNUMERIC (PROPERTY_ID_START +156) // BOOL +#define PROPERTY_ID_EFFECTIVE_VALUE (PROPERTY_ID_START +157) // ANY (string or double) +#define PROPERTY_ID_EFFECTIVE_DEFAULT (PROPERTY_ID_START +158) // dito +#define PROPERTY_ID_EFFECTIVE_MIN (PROPERTY_ID_START +159) // dito +#define PROPERTY_ID_EFFECTIVE_MAX (PROPERTY_ID_START +160) // dito +#define PROPERTY_ID_HIDDEN (PROPERTY_ID_START +161) // BOOL +#define PROPERTY_ID_FILTERPROPOSAL (PROPERTY_ID_START +162) // BOOL +#define PROPERTY_ID_FIELDSOURCE (PROPERTY_ID_START +163) // String +#define PROPERTY_ID_TABLENAME (PROPERTY_ID_START +164) // String +#define PROPERTY_ID_ENABLEVISIBLE (PROPERTY_ID_START +165) // BOOL + // FREE + // FREE + // FREE + // FREE +#define PROPERTY_ID_CONTROLLABEL (PROPERTY_ID_START +171) // XPropertySet +#define PROPERTY_ID_CURRSYM_POSITION (PROPERTY_ID_START +172) // String + // FREE +#define PROPERTY_ID_CURSORCOLOR (PROPERTY_ID_START +174) // INT32 +#define PROPERTY_ID_ALWAYSSHOWCURSOR (PROPERTY_ID_START +175) // BOOL +#define PROPERTY_ID_DISPLAYSYNCHRON (PROPERTY_ID_START +176) // BOOL +#define PROPERTY_ID_ISMODIFIED (PROPERTY_ID_START +177) // BOOL +#define PROPERTY_ID_ISNEW (PROPERTY_ID_START +178) // BOOL +#define PROPERTY_ID_PRIVILEGES (PROPERTY_ID_START +179) // INT32 +#define PROPERTY_ID_DETAILFIELDS (PROPERTY_ID_START +180) // Sequence< ::rtl::OUString > +#define PROPERTY_ID_COMMAND (PROPERTY_ID_START +181) // String +#define PROPERTY_ID_COMMANDTYPE (PROPERTY_ID_START +182) // INT32 (css::sdb::CommandType) +#define PROPERTY_ID_RESULTSET_CONCURRENCY (PROPERTY_ID_START +183)// INT32 (css::sdbc::ResultSetConcurrency) +#define PROPERTY_ID_INSERTONLY (PROPERTY_ID_START +184) // BOOL +#define PROPERTY_ID_RESULTSET_TYPE (PROPERTY_ID_START +185) // INT32 (css::sdbc::ResultSetType) +#define PROPERTY_ID_ESCAPE_PROCESSING (PROPERTY_ID_START +186) // BOOL +#define PROPERTY_ID_APPLYFILTER (PROPERTY_ID_START +187) // BOOL + +#define PROPERTY_ID_ISNULLABLE (PROPERTY_ID_START +188) // BOOL +#define PROPERTY_ID_ACTIVECOMMAND (PROPERTY_ID_START +189) // String +#define PROPERTY_ID_ISCURRENCY (PROPERTY_ID_START +190) // BOOL +#define PROPERTY_ID_URL (PROPERTY_ID_START +192) // String +#define PROPERTY_ID_TITLE (PROPERTY_ID_START +193) // String +#define PROPERTY_ID_ACTIVE_CONNECTION (PROPERTY_ID_START +194) // css::sdbc::XConnection +#define PROPERTY_ID_SCALE (PROPERTY_ID_START +195) // INT32 +#define PROPERTY_ID_SORT (PROPERTY_ID_START +196) // String + + // free + // free +#define PROPERTY_ID_FETCHSIZE (PROPERTY_ID_START +199) + // free +#define PROPERTY_ID_SEARCHABLE (PROPERTY_ID_START +201) +#define PROPERTY_ID_ISREADONLY (PROPERTY_ID_START +202) + // free +#define PROPERTY_ID_FIELDTYPE (PROPERTY_ID_START +204) +#define PROPERTY_ID_COLUMNSERVICENAME (PROPERTY_ID_START +205) +#define PROPERTY_ID_CONTROLSOURCEPROPERTY (PROPERTY_ID_START +206) +#define PROPERTY_ID_REALNAME (PROPERTY_ID_START +207) +#define PROPERTY_ID_FONT_WORDLINEMODE (PROPERTY_ID_START +208) +#define PROPERTY_ID_TEXTLINECOLOR (PROPERTY_ID_START +209) +#define PROPERTY_ID_FONTEMPHASISMARK (PROPERTY_ID_START +210) +#define PROPERTY_ID_FONTRELIEF (PROPERTY_ID_START +211) + +#define PROPERTY_ID_DISPATCHURLINTERNAL ( PROPERTY_ID_START + 212 ) // sal_Bool +#define PROPERTY_ID_PERSISTENCE_MAXTEXTLENGTH ( PROPERTY_ID_START + 213 ) // sal_Int16 +#define PROPERTY_ID_DEFAULT_SCROLL_VALUE ( PROPERTY_ID_START + 214 ) // sal_Int32 +#define PROPERTY_ID_DEFAULT_SPIN_VALUE ( PROPERTY_ID_START + 215 ) // sal_Int32 +#define PROPERTY_ID_SCROLL_VALUE ( PROPERTY_ID_START + 216 ) // sal_Int32 +#define PROPERTY_ID_SPIN_VALUE ( PROPERTY_ID_START + 217 ) // sal_Int32 +#define PROPERTY_ID_ICONSIZE ( PROPERTY_ID_START + 218 ) // sal_Int16 + +#define PROPERTY_ID_FONT_CHARWIDTH ( PROPERTY_ID_START + 219 ) // float +#define PROPERTY_ID_FONT_KERNING ( PROPERTY_ID_START + 220 ) // sal_Bool +#define PROPERTY_ID_FONT_ORIENTATION ( PROPERTY_ID_START + 221 ) // float +#define PROPERTY_ID_FONT_PITCH ( PROPERTY_ID_START + 222 ) // sal_Int16 +#define PROPERTY_ID_FONT_TYPE ( PROPERTY_ID_START + 223 ) // sal_Int16 +#define PROPERTY_ID_FONT_WIDTH ( PROPERTY_ID_START + 224 ) // sal_Int16 +#define PROPERTY_ID_RICH_TEXT ( PROPERTY_ID_START + 225 ) // sal_Bool + +#define PROPERTY_ID_DYNAMIC_CONTROL_BORDER ( PROPERTY_ID_START + 226 ) // sal_Bool +#define PROPERTY_ID_CONTROL_BORDER_COLOR_FOCUS ( PROPERTY_ID_START + 227 ) // sal_Int32 +#define PROPERTY_ID_CONTROL_BORDER_COLOR_MOUSE ( PROPERTY_ID_START + 228 ) // sal_Int32 +#define PROPERTY_ID_CONTROL_BORDER_COLOR_INVALID ( PROPERTY_ID_START + 229 ) // sal_Int32 + +#define PROPERTY_ID_XSD_PATTERN ( PROPERTY_ID_START + 230 ) +#define PROPERTY_ID_XSD_WHITESPACE ( PROPERTY_ID_START + 231 ) +#define PROPERTY_ID_XSD_LENGTH ( PROPERTY_ID_START + 232 ) +#define PROPERTY_ID_XSD_MIN_LENGTH ( PROPERTY_ID_START + 233 ) +#define PROPERTY_ID_XSD_MAX_LENGTH ( PROPERTY_ID_START + 234 ) +#define PROPERTY_ID_XSD_TOTAL_DIGITS ( PROPERTY_ID_START + 235 ) +#define PROPERTY_ID_XSD_FRACTION_DIGITS ( PROPERTY_ID_START + 236 ) +#define PROPERTY_ID_XSD_MAX_INCLUSIVE_INT ( PROPERTY_ID_START + 237 ) +#define PROPERTY_ID_XSD_MAX_EXCLUSIVE_INT ( PROPERTY_ID_START + 238 ) +#define PROPERTY_ID_XSD_MIN_INCLUSIVE_INT ( PROPERTY_ID_START + 239 ) +#define PROPERTY_ID_XSD_MIN_EXCLUSIVE_INT ( PROPERTY_ID_START + 240 ) +#define PROPERTY_ID_XSD_MAX_INCLUSIVE_DOUBLE ( PROPERTY_ID_START + 241 ) +#define PROPERTY_ID_XSD_MAX_EXCLUSIVE_DOUBLE ( PROPERTY_ID_START + 242 ) +#define PROPERTY_ID_XSD_MIN_INCLUSIVE_DOUBLE ( PROPERTY_ID_START + 243 ) +#define PROPERTY_ID_XSD_MIN_EXCLUSIVE_DOUBLE ( PROPERTY_ID_START + 244 ) +#define PROPERTY_ID_XSD_MAX_INCLUSIVE_DATE ( PROPERTY_ID_START + 245 ) +#define PROPERTY_ID_XSD_MAX_EXCLUSIVE_DATE ( PROPERTY_ID_START + 246 ) +#define PROPERTY_ID_XSD_MIN_INCLUSIVE_DATE ( PROPERTY_ID_START + 247 ) +#define PROPERTY_ID_XSD_MIN_EXCLUSIVE_DATE ( PROPERTY_ID_START + 248 ) +#define PROPERTY_ID_XSD_MAX_INCLUSIVE_TIME ( PROPERTY_ID_START + 249 ) +#define PROPERTY_ID_XSD_MAX_EXCLUSIVE_TIME ( PROPERTY_ID_START + 250 ) +#define PROPERTY_ID_XSD_MIN_INCLUSIVE_TIME ( PROPERTY_ID_START + 251 ) +#define PROPERTY_ID_XSD_MIN_EXCLUSIVE_TIME ( PROPERTY_ID_START + 252 ) +#define PROPERTY_ID_XSD_MAX_INCLUSIVE_DATE_TIME ( PROPERTY_ID_START + 253 ) +#define PROPERTY_ID_XSD_MAX_EXCLUSIVE_DATE_TIME ( PROPERTY_ID_START + 254 ) +#define PROPERTY_ID_XSD_MIN_INCLUSIVE_DATE_TIME ( PROPERTY_ID_START + 255 ) +#define PROPERTY_ID_XSD_MIN_EXCLUSIVE_DATE_TIME ( PROPERTY_ID_START + 256 ) +#define PROPERTY_ID_XSD_IS_BASIC ( PROPERTY_ID_START + 257 ) +#define PROPERTY_ID_XSD_TYPE_CLASS ( PROPERTY_ID_START + 258 ) + +#define PROPERTY_ID_LINEEND_FORMAT ( PROPERTY_ID_START + 259 ) // css.awt.LineEndFormat +#define PROPERTY_ID_GENERATEVBAEVENTS ( PROPERTY_ID_START + 260 ) +#define PROPERTY_ID_CONTROL_TYPE_IN_MSO ( PROPERTY_ID_START + 261 ) +#define PROPERTY_ID_OBJ_ID_IN_MSO ( PROPERTY_ID_START + 262 ) + +#define PROPERTY_ID_TYPEDITEMLIST ( PROPERTY_ID_START + 263 ) // Sequence<Any> + +// start ID for aggregated properties +#define PROPERTY_ID_AGGREGATE_ID (PROPERTY_ID_START + 10000) + //= assignment property handle <-> property name //= used by the PropertySetAggregationHelper diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx index 5c2facc6505f..b27c306e870b 100644 --- a/forms/source/misc/InterfaceContainer.cxx +++ b/forms/source/misc/InterfaceContainer.cxx @@ -22,7 +22,6 @@ #include "frm_resource.hxx" #include "InterfaceContainer.hxx" #include "componenttools.hxx" -#include "property.hrc" #include "services.hxx" #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/forms/source/misc/property.cxx b/forms/source/misc/property.cxx index 9fed981242e9..c57d43dc2de3 100644 --- a/forms/source/misc/property.cxx +++ b/forms/source/misc/property.cxx @@ -20,8 +20,6 @@ #include "frm_strings.hxx" #include "property.hxx" -#include "property.hrc" - namespace frm { diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index 5bdd44154c93..3e010f8711e5 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -18,7 +18,6 @@ */ #include "richtextcontrol.hxx" -#include "property.hrc" #include "services.hxx" #include "richtextmodel.hxx" diff --git a/forms/source/xforms/datatyperepository.cxx b/forms/source/xforms/datatyperepository.cxx index cafdd5ce07b3..c6a860b3db87 100644 --- a/forms/source/xforms/datatyperepository.cxx +++ b/forms/source/xforms/datatyperepository.cxx @@ -23,7 +23,7 @@ #include "strings.hrc" #include "frm_resource.hxx" #include "frm_strings.hxx" -#include "property.hrc" +#include "property.hxx" #include <com/sun/star/container/ElementExistException.hpp> #include <com/sun/star/util/VetoException.hpp> diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx index 5b8373223389..82473435c102 100644 --- a/forms/source/xforms/datatypes.cxx +++ b/forms/source/xforms/datatypes.cxx @@ -20,7 +20,8 @@ #include <memory> #include "datatypes.hxx" #include "resourcehelper.hxx" -#include "property.hrc" +#include "frm_strings.hxx" +#include "property.hxx" #include "convert.hxx" #include <com/sun/star/xsd/WhiteSpaceTreatment.hpp> diff --git a/formula/inc/core_resource.hrc b/formula/inc/core_resource.hrc index 57aa4644e30b..cd9db81c9994 100644 --- a/formula/inc/core_resource.hrc +++ b/formula/inc/core_resource.hrc @@ -20,7 +20,7 @@ #ifndef INCLUDED_FORMULA_INC_CORE_RESOURCE_HRC #define INCLUDED_FORMULA_INC_CORE_RESOURCE_HRC -#include "formula/compiler.hrc" +#include "formula/compiler.hxx" #include <utility> #define NC_(Context, String) (Context "\004" u8##String) diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index bb634fcdfa46..ca99b8e99311 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -31,7 +31,7 @@ #include "formula/token.hxx" #include "formula/tokenarray.hxx" #include "formula/FormulaCompiler.hxx" -#include <formula/compiler.hrc> +#include <formula/compiler.hxx> #include <svl/sharedstringpool.hxx> #include <memory> diff --git a/formula/source/ui/dlg/formdlgs.hrc b/formula/source/ui/dlg/formdlgs.hrc deleted file mode 100644 index 1f213864b89e..000000000000 --- a/formula/source/ui/dlg/formdlgs.hrc +++ /dev/null @@ -1,24 +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 . - */ - -// For tab page -#define TP_FUNCTION 1 -#define TP_STRUCT 2 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 8a1f3a774818..2c21e5a584e7 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -40,7 +40,6 @@ #include <unotools/charclass.hxx> #include <tools/diagnose_ex.h> -#include "formdlgs.hrc" #include "funcpage.hxx" #include "formula/formula.hxx" #include "formula/IFunctionDescription.hxx" @@ -64,6 +63,10 @@ #include <comphelper/string.hxx> #include <map> +// For tab page +#define TP_FUNCTION 1 +#define TP_STRUCT 2 + #define TOKEN_OPEN 0 #define TOKEN_CLOSE 1 #define TOKEN_SEP 2 diff --git a/fpicker/source/aqua/resourceprovider.mm b/fpicker/source/aqua/resourceprovider.mm index 6942d0fe9fda..e924179f4f40 100644 --- a/fpicker/source/aqua/resourceprovider.mm +++ b/fpicker/source/aqua/resourceprovider.mm @@ -23,7 +23,7 @@ #include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include <osl/mutex.hxx> -#include <fpicker/fpicker.hrc> +#include <fpicker/strings.hrc> #include <vcl/svapp.hxx> #include <tools/resmgr.hxx> #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp> diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx index 1b92732e3239..53b6c36bf41c 100644 --- a/fpicker/source/office/RemoteFilesDialog.hxx +++ b/fpicker/source/office/RemoteFilesDialog.hxx @@ -24,7 +24,7 @@ #include <unotools/viewoptions.hxx> #include <vcl/button.hxx> -#include <fpicker/fpicker.hrc> +#include <fpicker/strings.hrc> #include <vcl/menubtn.hxx> #include <vcl/dialog.hxx> #include <vcl/vclptr.hxx> diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 3415f2e2d06c..d77dc47fae30 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -42,8 +42,8 @@ #include "svtools/treelistentry.hxx" #include <toolkit/helper/vclunohelper.hxx> -#include "fpicker/fpicker.hrc" -#include "svtools/helpid.hrc" +#include "fpicker/strings.hrc" +#include "svtools/helpids.h" #include <svtools/strings.hrc> #include "strings.hrc" #include "bitmaps.hlst" diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx index 118d7ab932f5..e2782b1a984e 100644 --- a/fpicker/source/win32/misc/resourceprovider.cxx +++ b/fpicker/source/win32/misc/resourceprovider.cxx @@ -25,7 +25,7 @@ #include <rtl/ustrbuf.hxx> #include "resourceprovider.hxx" #include <osl/mutex.hxx> -#include <fpicker/fpicker.hrc> +#include <fpicker/strings.hrc> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> diff --git a/include/basic/sbxdef.hxx b/include/basic/sbxdef.hxx index 2e87cf6f196d..a7c589bab64f 100644 --- a/include/basic/sbxdef.hxx +++ b/include/basic/sbxdef.hxx @@ -22,7 +22,6 @@ #define INCLUDED_BASIC_SBXDEF_HXX -#ifndef __RSC #include <vcl/errcode.hxx> #include <o3tl/typed_flags_set.hxx> @@ -124,9 +123,6 @@ enum class SbxNameType { // Type of the questioned name of a variable ShortTypes, // Name%(A%,B$) }; -#endif - - // New error codes per define #define ERRCODE_SBX_SYNTAX ErrCode(1UL | ERRCODE_AREA_SBX | ERRCODE_CLASS_COMPILER) #define ERRCODE_SBX_NOTIMP ErrCode(2UL | ERRCODE_AREA_SBX | ERRCODE_CLASS_NOTSUPPORTED) @@ -159,8 +155,6 @@ enum class SbxNameType { // Type of the questioned name of a variable #define ERRCODE_SBX_NOT_A_COLL ErrCode(29UL | ERRCODE_AREA_SBX | ERRCODE_CLASS_RUNTIME) // Object contains no elements #define LAST_SBX_ERROR_ID 29UL -#ifndef __RSC - // Flag-Bits: enum class SbxFlagBits { NONE = 0x0000, @@ -252,8 +246,6 @@ namespace o3tl // The numeric values of sal_True and FALSE enum SbxBOOL { SbxFALSE = 0, SbxTRUE = -1 }; -#endif //ifndef __RSC - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/memberids.hrc b/include/editeng/memberids.h index 1ffcb87df182..611b52620096 100644 --- a/include/editeng/memberids.hrc +++ b/include/editeng/memberids.h @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_EDITENG_MEMBERIDS_HRC -#define INCLUDED_EDITENG_MEMBERIDS_HRC +#ifndef INCLUDED_EDITENG_MEMBERIDS_H +#define INCLUDED_EDITENG_MEMBERIDS_H -#include <svl/memberid.hrc> +#include <svl/memberid.h> #define MID_LOCATION 0x3c #define MID_TRANSPARENT 0x4b diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index 3cc7932d25b6..6267d963eee3 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -59,7 +59,7 @@ #include <editeng/unoedsrc.hxx> #include <editeng/eeitem.hxx> #include <editeng/editengdllapi.h> -#include <editeng/memberids.hrc> +#include <editeng/memberids.h> class SvxItemPropertySet; diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hxx index 4f625f589cbc..4921dd303330 100644 --- a/include/formula/compiler.hrc +++ b/include/formula/compiler.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef FORMULA_COMPILER_HRC -#define FORMULA_COMPILER_HRC +#ifndef FORMULA_COMPILER_HXX +#define FORMULA_COMPILER_HXX /* Central definition of OpCodes for spreadsheet functions */ diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx index 90223b141b7f..1258b5824694 100644 --- a/include/formula/opcode.hxx +++ b/include/formula/opcode.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_FORMULA_OPCODE_HXX #define INCLUDED_FORMULA_OPCODE_HXX -#include <formula/compiler.hrc> +#include <formula/compiler.hxx> #include <sal/types.h> enum OpCode : sal_uInt16 diff --git a/include/fpicker/fpicker.hrc b/include/fpicker/strings.hrc index ad0569aed0ed..ad0569aed0ed 100644 --- a/include/fpicker/fpicker.hrc +++ b/include/fpicker/strings.hrc diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h index 0fbd4d3d597c..c4152fd54030 100644 --- a/include/i18nlangtag/lang.h +++ b/include/i18nlangtag/lang.h @@ -85,9 +85,6 @@ * comments are used. Do NOT use // C++ style comments. */ /* disable typedef for usage in svtools/source/misc/langtab.src */ -#ifdef __RSC -#define LanguageType(x) (x) -#else #include <sal/types.h> #include <o3tl/strong_int.hxx> #include <ostream> @@ -104,11 +101,8 @@ namespace o3tl template<> template<> constexpr strong_int<unsigned short,LanguageTypeTag>::strong_int(short, std::enable_if<std::is_integral<short>::value, int>::type) = delete; } -#endif - #define LANGUAGE_MASK_PRIMARY 0x03ff - #define LANGUAGE_DONTKNOW LanguageType(0x03FF) /* yes, the mask */ #define LANGUAGE_NONE LanguageType(0x00FF) #define LANGUAGE_HID_HUMAN_INTERFACE_DEVICE LanguageType(0x04FF) diff --git a/include/rtl/textenc.h b/include/rtl/textenc.h index 4866a19de76f..067011e1f94a 100644 --- a/include/rtl/textenc.h +++ b/include/rtl/textenc.h @@ -20,12 +20,6 @@ #ifndef INCLUDED_RTL_TEXTENC_H #define INCLUDED_RTL_TEXTENC_H -#ifdef __RSC -/* Enable resources to use these values, rsc can't handle casts */ -#define RTL_TEXTENC_CAST( val ) (val) - -#else /* !__RSC */ - #include <sal/types.h> /** The various supported text encodings. @@ -40,8 +34,6 @@ typedef sal_uInt16 rtl_TextEncoding; #define RTL_TEXTENC_CAST( val ) ((rtl_TextEncoding) val) -#endif /* __RSC */ - #define RTL_TEXTENCODING_DONTKNOW (RTL_TEXTENC_CAST( 0 )) #define RTL_TEXTENCODING_MS_1252 (RTL_TEXTENC_CAST( 1 )) #define RTL_TEXTENCODING_APPLE_ROMAN (RTL_TEXTENC_CAST( 2 )) diff --git a/include/sfx2/dialogs.hrc b/include/sfx2/dialogs.hrc deleted file mode 100644 index 893feb9f221a..000000000000 --- a/include/sfx2/dialogs.hrc +++ /dev/null @@ -1,26 +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_SFX2_DIALOGS_HRC -#define INCLUDED_SFX2_DIALOGS_HRC - -#include <sfx2/sfxsids.hrc> - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/event.hxx b/include/sfx2/event.hxx index ec57c9d5bf55..7dbb9c08cf32 100644 --- a/include/sfx2/event.hxx +++ b/include/sfx2/event.hxx @@ -21,7 +21,6 @@ #include <sal/config.h> #include <sfx2/dllapi.h> -#include <sfx2/sfx.hrc> #include <svl/hint.hxx> #include <unotools/eventcfg.hxx> #include <rtl/ustring.hxx> @@ -31,8 +30,18 @@ #include <com/sun/star/frame/XController2.hpp> #include <com/sun/star/view/PrintableState.hpp> -class SfxObjectShell; +#define EVENT_SFX_START 5000 +// EVENT_SFX_END 9999 + +#define EVENT_APP_START 20000 +// EVENT_APP_END 29999 +// Events for Controls etc. +#define SFX_EVENT_MOUSEOVER_OBJECT ( EVENT_SFX_START + 100 ) +#define SFX_EVENT_MOUSECLICK_OBJECT ( EVENT_SFX_START + 101 ) +#define SFX_EVENT_MOUSEOUT_OBJECT ( EVENT_SFX_START + 102 ) + +class SfxObjectShell; enum class SfxEventHintId { NONE = 0, diff --git a/include/sfx2/groupid.hxx b/include/sfx2/groupid.hxx index 072ac723319b..288c33e224f5 100644 --- a/include/sfx2/groupid.hxx +++ b/include/sfx2/groupid.hxx @@ -19,10 +19,6 @@ #ifndef INCLUDED_SFX2_GROUPID_HXX #define INCLUDED_SFX2_GROUPID_HXX -#ifdef __RSC -#define SfxGroupId(x) (x) -#else - #include <o3tl/strong_int.hxx> #include <sal/types.h> #include <functional> @@ -50,7 +46,41 @@ inline SfxGroupId operator+(SfxGroupId lhs, sal_uInt16 rhs) { return SfxGroupId((sal_uInt16)lhs + rhs); } -#endif + +// group ids + +// !! If you add a new group, please change sfxbasecontroller.cxx and +// !! com.sun.star.frame.CommandGroup accordingly! + +#define RID_GROUPS_SFXOFFSET SfxGroupId(32700) +#define GID_INTERN (RID_GROUPS_SFXOFFSET+ 0) +#define GID_APPLICATION (RID_GROUPS_SFXOFFSET+ 1) +#define GID_DOCUMENT (RID_GROUPS_SFXOFFSET+ 2) +#define GID_VIEW (RID_GROUPS_SFXOFFSET+ 3) +#define GID_EDIT (RID_GROUPS_SFXOFFSET+ 4) +#define GID_MACRO (RID_GROUPS_SFXOFFSET+ 5) +#define GID_OPTIONS (RID_GROUPS_SFXOFFSET+ 6) +#define GID_MATH (RID_GROUPS_SFXOFFSET+ 7) +#define GID_NAVIGATOR (RID_GROUPS_SFXOFFSET+ 8) +#define GID_INSERT (RID_GROUPS_SFXOFFSET+ 9) +#define GID_FORMAT (RID_GROUPS_SFXOFFSET+10) +#define GID_TEMPLATE (RID_GROUPS_SFXOFFSET+11) +#define GID_TEXT (RID_GROUPS_SFXOFFSET+12) +#define GID_FRAME (RID_GROUPS_SFXOFFSET+13) +#define GID_GRAPHIC (RID_GROUPS_SFXOFFSET+14) +#define GID_TABLE (RID_GROUPS_SFXOFFSET+15) +#define GID_ENUMERATION (RID_GROUPS_SFXOFFSET+16) +#define GID_DATA (RID_GROUPS_SFXOFFSET+17) +#define GID_SPECIAL (RID_GROUPS_SFXOFFSET+18) +#define GID_IMAGE (RID_GROUPS_SFXOFFSET+19) +#define GID_CHART (RID_GROUPS_SFXOFFSET+20) +#define GID_EXPLORER (RID_GROUPS_SFXOFFSET+21) +#define GID_CONNECTOR (RID_GROUPS_SFXOFFSET+22) +#define GID_MODIFY (RID_GROUPS_SFXOFFSET+23) +#define GID_DRAWING (RID_GROUPS_SFXOFFSET+24) +#define GID_CONTROLS (RID_GROUPS_SFXOFFSET+25) +#define GID_NAVIGATION (RID_GROUPS_SFXOFFSET+26) + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx index a0a9afb0ef7f..becbab341eee 100644 --- a/include/sfx2/objface.hxx +++ b/include/sfx2/objface.hxx @@ -32,6 +32,28 @@ class SfxConfigItem; class SfxModule; class SvStream; +#define SFX_OBJECTBAR_APPLICATION 0 +#define SFX_OBJECTBAR_OBJECT 1 +#define SFX_OBJECTBAR_TOOLS 2 +#define SFX_OBJECTBAR_MACRO 3 +#define SFX_OBJECTBAR_FULLSCREEN 4 +#define SFX_OBJECTBAR_RECORDING 5 +#define SFX_OBJECTBAR_COMMONTASK 6 +#define SFX_OBJECTBAR_OPTIONS 7 +#define SFX_OBJECTBAR_NAVIGATION 12 +#define SFX_OBJECTBAR_MAX 13 + +enum class StatusBarId : sal_uInt32 +{ + None = 0, + GenericStatusBar = 4, + WriterStatusBar = 20013, + MathStatusBar = 20816, + DrawStatusBar = 23007, + CalcStatusBar = 26005, + BasicIdeStatusBar = 30805 +}; + class SFX2_DLLPUBLIC SfxInterface final { friend class SfxSlotPool; @@ -69,7 +91,7 @@ public: void RegisterObjectBar(sal_uInt16, SfxVisibilityFlags nFlags, ToolbarId eId, SfxShellFeature nFeature); void RegisterChildWindow(sal_uInt16, bool bContext = false); void RegisterChildWindow(sal_uInt16, bool bContext, SfxShellFeature nFeature); - void RegisterStatusBar(sal_uInt32 nResId); + void RegisterStatusBar(StatusBarId eId); ToolbarId GetObjectBarId(sal_uInt16 nNo) const; sal_uInt16 GetObjectBarPos( sal_uInt16 nNo ) const; SfxVisibilityFlags GetObjectBarFlags( sal_uInt16 nNo ) const; @@ -81,7 +103,7 @@ public: sal_uInt16 GetChildWindowCount() const; void RegisterPopupMenu( const OUString& ); const OUString& GetPopupMenuName() const; - sal_uInt32 GetStatusBarId() const; + StatusBarId GetStatusBarId() const; void Register( SfxModule* ); diff --git a/cui/source/inc/cuires.hrc b/include/sfx2/pageids.hxx index beec430dcd7a..3eadcf6f5ce2 100644 --- a/cui/source/inc/cuires.hrc +++ b/include/sfx2/pageids.hxx @@ -17,21 +17,22 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CUI_SOURCE_INC_CUIRES_HRC -#define INCLUDED_CUI_SOURCE_INC_CUIRES_HRC +#ifndef INCLUDED_SFX2_PAGEIDS_HXX +#define INCLUDED_SFX2_PAGEIDS_HXX -#include <sfx2/sfx.hrc> -#include <sfx2/dialogs.hrc> +#include <svl/solar.hrc> -// Resource-Id's ------------------------------------------------------------ +#define RID_OPTIONS_START (SID_LIB_START + 2000) +// RID_OPTIONS_END (RID_OPTIONS_START + 100) -// Gallery -#define RID_CUI_GALLERY_START (RID_SVX_START + 360) -// RID_CUI_GALLERY_END (RID_SVX_START + 410) +// ResId's ------------------------------------------------------------------ -// options -#define RID_SVXPAGE_JSEARCH_OPTIONS (RID_SVX_START + 840) -#define RID_SVX_FONT_SUBSTITUTION (RID_SVX_START + 18) +#define RID_SFXPAGE_SAVE (RID_OPTIONS_START + 0) +#define RID_SFXPAGE_GENERAL (RID_OPTIONS_START + 1) +#define RID_SFXPAGE_PATH (RID_OPTIONS_START + 6) +#define RID_SFXPAGE_LINGU (RID_OPTIONS_START + 7) + +#define RID_SFXPAGE_PRINTOPTIONS (RID_OPTIONS_START + 12) // treeopt #define RID_SVXPAGE_COLOR (RID_SVX_START + 60) @@ -57,11 +58,11 @@ #define RID_SVXPAGE_COLORCONFIG (RID_SVX_START + 249) #define RID_SVXPAGE_BASICIDE_OPTIONS (RID_SVX_START + 209) -// hyperlink dialog -#define RID_SVXPAGE_HYPERLINK_INTERNET (RID_SVX_START + 228) -#define RID_SVXPAGE_HYPERLINK_MAIL (RID_SVX_START + 229) -#define RID_SVXPAGE_HYPERLINK_DOCUMENT (RID_SVX_START + 230) -#define RID_SVXPAGE_HYPERLINK_NEWDOCUMENT (RID_SVX_START + 231) +// Resource-Id's ------------------------------------------------------------ + +// options +#define RID_SVXPAGE_JSEARCH_OPTIONS (RID_SVX_START + 840) +#define RID_SVX_FONT_SUBSTITUTION (RID_SVX_START + 18) #define RID_SVXPAGE_OPENCL (RID_SVX_START + 254) diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc deleted file mode 100644 index 1b5e603d6b40..000000000000 --- a/include/sfx2/sfx.hrc +++ /dev/null @@ -1,162 +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_SFX2_SFX_HRC -#define INCLUDED_SFX2_SFX_HRC - -#include <svl/solar.hrc> -#include <svl/memberid.hrc> -#include <sfx2/groupid.hxx> - -#define RID_GROUPS_SFXOFFSET SfxGroupId(32700) - -#define EVENT_SFX_START 5000 -// EVENT_SFX_END 9999 - -// EVENT_LIB_START 10000 -// EVENT_LIB_END 19999 - -#define EVENT_APP_START 20000 -// EVENT_APP_END 29999 - -// Warning: the following are simultaneously SID_ON_ ... - - -// Events for Controls etc. -#define SFX_EVENT_MOUSEOVER_OBJECT ( EVENT_SFX_START + 100 ) -#define SFX_EVENT_MOUSECLICK_OBJECT ( EVENT_SFX_START + 101 ) -#define SFX_EVENT_MOUSEOUT_OBJECT ( EVENT_SFX_START + 102 ) - -#define RID_SFX_APP_START (RID_SFX_START + 256) -#define RID_SFX_MENU_START (RID_SFX_START + 768) -// RID_SFX_CONFIG_START (RID_SFX_START + 1536) -#define RID_SFX_DOC_START (RID_SFX_START + 1792) -#define RID_SFX_DIALOG_START (RID_SFX_START + 2048) -#define RID_SFX_BASTYP_START (RID_SFX_START + 2304) -#define RID_SFX_EXPLORER_START (RID_SFX_START + 2816) - -// RID_CNT_START (RID_SFX_START + 3072) - -#define RID_SFX_SFXLOCAL_START (RID_SFX_START + 3082) -#define RID_SFX_VIEW_START (RID_SFX_START + 4096) -#define RID_SFX_SIDEBAR_START (RID_SFX_START + 4150) -#define RID_SFX_PROPERTYPANEL_START (RID_SFX_START + 4400) -// RID_CNT_START2 (RID_SFX_START + 4500) -// RID_SFX_TPLCOMPONENT_START (RID_SFX_START + 6800) -// RID_SFX_HELPCOMPONENT_START (RID_SFX_START + 7000) - -#define SFX_OBJECTBAR_APPLICATION 0 -#define SFX_OBJECTBAR_OBJECT 1 -#define SFX_OBJECTBAR_TOOLS 2 -#define SFX_OBJECTBAR_MACRO 3 -#define SFX_OBJECTBAR_FULLSCREEN 4 -#define SFX_OBJECTBAR_RECORDING 5 -#define SFX_OBJECTBAR_COMMONTASK 6 -#define SFX_OBJECTBAR_OPTIONS 7 -#define SFX_OBJECTBAR_NAVIGATION 12 -#define SFX_OBJECTBAR_MAX 13 - -// temporary due to compatibility - -#define RID_DEFAULTABOUT (RID_SFX_START+0) - -// group ids - -// !! If you add a new group, please change sfxbasecontroller.cxx and -// !! com.sun.star.frame.CommandGroup accordingly! - -#define GID_INTERN (RID_GROUPS_SFXOFFSET+ 0) -#define GID_APPLICATION (RID_GROUPS_SFXOFFSET+ 1) -#define GID_DOCUMENT (RID_GROUPS_SFXOFFSET+ 2) -#define GID_VIEW (RID_GROUPS_SFXOFFSET+ 3) -#define GID_EDIT (RID_GROUPS_SFXOFFSET+ 4) -#define GID_MACRO (RID_GROUPS_SFXOFFSET+ 5) -#define GID_OPTIONS (RID_GROUPS_SFXOFFSET+ 6) -#define GID_MATH (RID_GROUPS_SFXOFFSET+ 7) -#define GID_NAVIGATOR (RID_GROUPS_SFXOFFSET+ 8) -#define GID_INSERT (RID_GROUPS_SFXOFFSET+ 9) -#define GID_FORMAT (RID_GROUPS_SFXOFFSET+10) -#define GID_TEMPLATE (RID_GROUPS_SFXOFFSET+11) -#define GID_TEXT (RID_GROUPS_SFXOFFSET+12) -#define GID_FRAME (RID_GROUPS_SFXOFFSET+13) -#define GID_GRAPHIC (RID_GROUPS_SFXOFFSET+14) -#define GID_TABLE (RID_GROUPS_SFXOFFSET+15) -#define GID_ENUMERATION (RID_GROUPS_SFXOFFSET+16) -#define GID_DATA (RID_GROUPS_SFXOFFSET+17) -#define GID_SPECIAL (RID_GROUPS_SFXOFFSET+18) -#define GID_IMAGE (RID_GROUPS_SFXOFFSET+19) -#define GID_CHART (RID_GROUPS_SFXOFFSET+20) -#define GID_EXPLORER (RID_GROUPS_SFXOFFSET+21) -#define GID_CONNECTOR (RID_GROUPS_SFXOFFSET+22) -#define GID_MODIFY (RID_GROUPS_SFXOFFSET+23) -#define GID_DRAWING (RID_GROUPS_SFXOFFSET+24) -#define GID_CONTROLS (RID_GROUPS_SFXOFFSET+25) -#define GID_NAVIGATION (RID_GROUPS_SFXOFFSET+26) - -#define RID_OPTIONS_START (SID_LIB_START + 2000) -// RID_OPTIONS_END (RID_OPTIONS_START + 100) - -// ResId's ------------------------------------------------------------------ - -#define RID_SFXPAGE_SAVE (RID_OPTIONS_START + 0) -#define RID_SFXPAGE_GENERAL (RID_OPTIONS_START + 1) -#define RID_SFXPAGE_PATH (RID_OPTIONS_START + 6) -#define RID_SFXPAGE_LINGU (RID_OPTIONS_START + 7) - -#define RID_SFXPAGE_PRINTOPTIONS (RID_OPTIONS_START + 12) - -// Member-Ids ------------------------------------------------------------ - -#define MID_DOCINFO_DESCRIPTION 0x13 -#define MID_DOCINFO_KEYWORDS 0x17 -#define MID_DOCINFO_SUBJECT 0x1b -#define MID_DOCINFO_TITLE 0x1d -#define MID_DOCINFO_AUTOLOADENABLED 0x2d -#define MID_DOCINFO_AUTOLOADURL 0x2e -#define MID_DOCINFO_AUTOLOADSECS 0x2f -#define MID_DOCINFO_DEFAULTTARGET 0x30 -#define MID_DOCINFO_USEUSERDATA 0x31 -#define MID_DOCINFO_DELETEUSERDATA 0x32 -#define MID_DOCINFO_USETHUMBNAILSAVE 0x33 - -// only for FastPropertySet -#define MID_TYPE 0x38 -#define MID_VALUE 0x39 -#define MID_VALUESET 0x40 - -// Config-Ids ----------------------------------------------------------- - -#define SFX_ITEMTYPE_SW_BEGIN 20000 -// SFX_ITEMTYPE_SW_END 22999 - -#define SFX_ITEMTYPE_SD_BEGIN 23000 -// SFX_ITEMTYPE_SD_END 25999 - -#define SFX_ITEMTYPE_SC_BEGIN 26000 -// SFX_ITEMTYPE_SC_END 27999 - -// free: 28000-32767 - -// Slot-Ids ------------------------------------------------------------- - -#include <sfx2/sfxsids.hrc> - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index eeb793619fab..d8703674810e 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -20,7 +20,7 @@ #define INCLUDED_SFX2_SFXSIDS_HRC #include <svl/solar.hrc> -#include <svl/memberid.hrc> +#include <svl/memberid.h> // Please be careful: // Changing just one part here doesn't add new diff --git a/include/svl/memberid.hrc b/include/svl/memberid.h index 5dcafe62f6f9..afe106d41bbe 100644 --- a/include/svl/memberid.hrc +++ b/include/svl/memberid.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVL_MEMBERID_HRC -#define INCLUDED_SVL_MEMBERID_HRC +#ifndef INCLUDED_SVL_MEMBERID_H +#define INCLUDED_SVL_MEMBERID_H #define MID_X 1 #define MID_Y 2 @@ -62,6 +62,24 @@ #define MID_SEARCH_SEARCHFORMATTED 22 #define MID_SEARCH_ALGORITHMTYPE2 23 +// SfxDocumentInfoItem +#define MID_DOCINFO_DESCRIPTION 0x13 +#define MID_DOCINFO_KEYWORDS 0x17 +#define MID_DOCINFO_SUBJECT 0x1b +#define MID_DOCINFO_TITLE 0x1d +#define MID_DOCINFO_AUTOLOADENABLED 0x2d +#define MID_DOCINFO_AUTOLOADURL 0x2e +#define MID_DOCINFO_AUTOLOADSECS 0x2f +#define MID_DOCINFO_DEFAULTTARGET 0x30 +#define MID_DOCINFO_USEUSERDATA 0x31 +#define MID_DOCINFO_DELETEUSERDATA 0x32 +#define MID_DOCINFO_USETHUMBNAILSAVE 0x33 + +// only for FastPropertySet +#define MID_TYPE 0x38 +#define MID_VALUE 0x39 +#define MID_VALUESET 0x40 + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/solar.hrc b/include/svl/solar.hrc index 85ef73080ea8..f284ff4fe473 100644 --- a/include/svl/solar.hrc +++ b/include/svl/solar.hrc @@ -25,75 +25,15 @@ #define OWN_ATTR_VALUE_START 3900 #define OWN_ATTR_VALUE_END 3993 -#define RID_SFX_START 260 -// RID_SFX_END 9999 - #define RID_LIB_START 10000 #define RID_LIB_END 19999 #define RID_SVX_START (RID_LIB_START) // RID_SVX_END (RID_LIB_START+499) -// free: 500-2999 - -#define RID_BASIC_START (RID_LIB_START+3000) -// RID_BASIC_END (RID_LIB_START+4499) - -#define RID_UUI_START (RID_LIB_START+4500) -// RID_UUI_END (RID_LIB_START+4599) - -// free: 4600-4849 - -#define RID_BASICIDE_START (RID_LIB_START+4850) -// RID_BASICIDE_END (RID_LIB_START+4949) - -#define RID_SVXITEMS_START (RID_LIB_START+4950) -#define RID_SVXITEMS_END (RID_LIB_START+5599) - -// free: 5600-5699 - -#define RID_EXTENSIONS_START (RID_LIB_START+5700) -// RID_EXTENSIONS_END (RID_LIB_START+5799) - -#define RID_EDIT_START (RID_LIB_START+5800) -#define RID_EDIT_END (RID_LIB_START+6369) - -#define RID_FPICKER_START (RID_LIB_START+6370) -// RID_FPICKER_END (RID_LIB_START+6389) - -#define RID_SVTOOLS_START (RID_LIB_START+6390) -// RID_SVTOOLS_END (RID_LIB_START+6499) - -// free: 6500-6799 - -#define RID_DLG_START (RID_LIB_START+6800) -// RID_DLG_END (RID_LIB_START+6899) - #define RID_OFA_START (RID_LIB_START+6900) // RID_OFA_END (RID_LIB_START+7399) -// free: RID_LIB_START+7400 to +7449 - -#define RID_SVL_START (RID_LIB_START+7450) -// RID_SVL_END (RID_LIB_START+7899) - -#define RID_FORMS_START (RID_LIB_START+8000) -// RID_FORMS_END (RID_LIB_START+8999) - -#define RID_FORMLAYER_START (RID_LIB_START+9000) -// RID_FORMLAYER_END (RID_LIB_START+9199) - -#define RID_DBACCESS_START (RID_LIB_START+9200) -#define RID_DBACCESS_END (RID_LIB_START+9699) - -#define RID_MORE_EXTENSIONS_START (RID_LIB_START+9700) -#define RID_MORE_EXTENSIONS_END (RID_LIB_START+9999) - -// free: 10000-10199 - -#define RID_FILTER_START (RID_LIB_START+10200) -// RID_FILTER_END (RID_LIB_START+10299) - // do *NOT* add more ranges here, RID_LIB_END is (RID_LIB_START + 10000) #define RID_APP_START 20000 @@ -102,59 +42,18 @@ #define RID_SW_START (20000) // RID_SW_END (25999) -// free: 26000-26999 - -#define RID_SD_START (27000) -// RID_SD_END (27999) - -#define RID_OBJ_START (30000) -// RID_OBJ_END (32767) - -#define RID_RPT_START (RID_OBJ_START+768) -// RID_RPT_END (RID_OBJ_START+1000) - -#define RID_FORMULA_START (RID_OBJ_START+1001) -// RID_FORMULA_END (RID_OBJ_START+1200) +// free: 26000-28199 // Help-Ids -------------------------------------------------------------- #define HID_START 32768 -// HID_VCL_START (HID_START+100) -// HID_VCL_END (HID_START+150) - -// free: 200-299 - -// HID_SFX_START (HID_START+300) -// HID_SFX_END (HID_START+999) - -#define HID_LIB_START (HID_START+1000) -// HID_LIB_END (HID_START+19999) - -// free: HID_LIB_START 0-1699 - -// HID_OFA_START (HID_LIB_START+1760) -#define HID_OFA_END (HID_LIB_START+1999) - -// free: HID_LIB_START 2000-2050 - -// free: HID_LIB_START 2070-9999 - -// free: HID_START 20000-24999 - #define HID_SC_START (HID_START+25000) // HID_SC_END (HID_START+26999) #define HID_SD_START (HID_START+27000) // HID_SD_END (HID_START+27999) -// free: HID_START 28000-29999 - -// HID_OBJ_START (HID_START+30000) -// HID_OBJ_END (HID_START+32767) - -// free: HID_OBJ_START+2281 to HID_OBJ_START+2800 - // Slot Ids #define SID_SFX_START 5000 @@ -176,7 +75,6 @@ #define SID_SMA_START (SID_OBJ_START + 256) // SID_SMA_END (SID_OBJ_START + 511) -// free: SID_OBJ_START + 512 to SID_OBJ_START + 767 #define SID_BASICIDE_START (SID_OBJ_START + 768) // SID_BASICIDE_END (SID_BASICIDE_START + 255) diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx index f59cdf930baa..541e55c89805 100644 --- a/include/svtools/addresstemplate.hxx +++ b/include/svtools/addresstemplate.hxx @@ -36,6 +36,8 @@ #include <com/sun/star/sdbc/XDataSource.hpp> #include <unotools/configitem.hxx> +#define FIELD_PAIRS_VISIBLE 5 +#define FIELD_CONTROLS_VISIBLE 2 * FIELD_PAIRS_VISIBLE namespace svt { diff --git a/include/svtools/ehdl.hxx b/include/svtools/ehdl.hxx index 50426b37fb2d..b858f2b31d37 100644 --- a/include/svtools/ehdl.hxx +++ b/include/svtools/ehdl.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_SVTOOLS_EHDL_HXX #define INCLUDED_SVTOOLS_EHDL_HXX -#ifndef __RSC - #include <memory> #include <svtools/svtdllapi.h> @@ -74,6 +72,4 @@ private: #endif -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/helpid.hrc b/include/svtools/helpids.h index db1601f7de55..309a42260de3 100644 --- a/include/svtools/helpid.hrc +++ b/include/svtools/helpids.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_HELPID_HRC -#define INCLUDED_SVTOOLS_HELPID_HRC +#ifndef INCLUDED_SVTOOLS_HELPIDS_H +#define INCLUDED_SVTOOLS_HELPIDS_H #define HID_FILEDLG_LINK_CB "SVT_HID_FILEDLG_LINK_CB" #define HID_FILEDLG_PREVIEW_CB "SVT_HID_FILEDLG_PREVIEW_CB" diff --git a/include/svtools/imagemgr.hxx b/include/svtools/imagemgr.hxx index 27e4013f7d2c..a81cbbf70efe 100644 --- a/include/svtools/imagemgr.hxx +++ b/include/svtools/imagemgr.hxx @@ -23,6 +23,59 @@ #include <svtools/svtdllapi.h> #include <sal/types.h> +#define IMAGELIST_START 3076 // must match to old Id's in SFX! + +#define IMG_IMPRESS (IMAGELIST_START + 47) +#define IMG_BITMAP (IMAGELIST_START + 49) +#define IMG_CALC (IMAGELIST_START + 50) +#define IMG_CALCTEMPLATE (IMAGELIST_START + 51) +#define IMG_DATABASE (IMAGELIST_START + 53) +#define IMG_IMPRESSTEMPLATE (IMAGELIST_START + 54) +#define IMG_GIF (IMAGELIST_START + 61) +#define IMG_HTML (IMAGELIST_START + 63) +#define IMG_JPG (IMAGELIST_START + 64) +#define IMG_MATH (IMAGELIST_START + 68) +#define IMG_MATHTEMPLATE (IMAGELIST_START + 69) +#define IMG_FILE (IMAGELIST_START + 74) +#define IMG_PCD (IMAGELIST_START + 76) +#define IMG_PCT (IMAGELIST_START + 77) +#define IMG_PCX (IMAGELIST_START + 78) +#define IMG_SIM (IMAGELIST_START + 79) +#define IMG_TEXTFILE (IMAGELIST_START + 80) +#define IMG_TIFF (IMAGELIST_START + 82) +#define IMG_WMF (IMAGELIST_START + 84) +#define IMG_WRITER (IMAGELIST_START + 86) +#define IMG_WRITERTEMPLATE (IMAGELIST_START + 87) +#define IMG_FIXEDDEV (IMAGELIST_START + 88) +#define IMG_REMOVABLEDEV (IMAGELIST_START + 89) +#define IMG_CDROMDEV (IMAGELIST_START + 90) +#define IMG_NETWORKDEV (IMAGELIST_START + 91) +#define IMG_TABLE (IMAGELIST_START + 112) +#define IMG_FOLDER (IMAGELIST_START + 113) +#define IMG_DXF (IMAGELIST_START + 141) +#define IMG_MET (IMAGELIST_START + 142) +#define IMG_PNG (IMAGELIST_START + 143) +#define IMG_SGF (IMAGELIST_START + 144) +#define IMG_SGV (IMAGELIST_START + 145) +#define IMG_SVM (IMAGELIST_START + 146) +#define IMG_GLOBAL_DOC (IMAGELIST_START + 150) +#define IMG_DRAW (IMAGELIST_START + 151) +#define IMG_DRAWTEMPLATE (IMAGELIST_START + 152) +#define IMG_TEMPLATE (IMAGELIST_START + 166) +#define IMG_OO_DATABASE_DOC (IMAGELIST_START + 169) +#define IMG_OO_DRAW_DOC (IMAGELIST_START + 170) +#define IMG_OO_MATH_DOC (IMAGELIST_START + 171) +#define IMG_OO_GLOBAL_DOC (IMAGELIST_START + 172) +#define IMG_OO_IMPRESS_DOC (IMAGELIST_START + 173) +#define IMG_OO_CALC_DOC (IMAGELIST_START + 174) +#define IMG_OO_WRITER_DOC (IMAGELIST_START + 175) +#define IMG_OO_DRAW_TEMPLATE (IMAGELIST_START + 176) +#define IMG_OO_IMPRESS_TEMPLATE (IMAGELIST_START + 177) +#define IMG_OO_CALC_TEMPLATE (IMAGELIST_START + 178) +#define IMG_OO_WRITER_TEMPLATE (IMAGELIST_START + 179) +#define IMG_EXTENSION (IMAGELIST_START + 180) + + class Image; namespace rtl { class OUString; diff --git a/include/svtools/soerr.hxx b/include/svtools/soerr.hxx index 380efe1d0a2b..11f18da3c979 100644 --- a/include/svtools/soerr.hxx +++ b/include/svtools/soerr.hxx @@ -20,10 +20,8 @@ #define INCLUDED_SVTOOLS_SOERR_HXX #include <vcl/errcode.hxx> -#ifndef __RSC #include <svtools/ehdl.hxx> #include <svtools/svtdllapi.h> -#endif // error codes #define SO_ERR(x) ErrCode(ERRCODE_AREA_SO | ERRCODE_CLASS_SO | x) @@ -39,10 +37,8 @@ // error contexts #define ERRCTX_SO_DOVERB 1 -#ifndef __RSC SVT_DLLPUBLIC const ErrMsgCode* getRID_SO_ERROR_HANDLER(); SVT_DLLPUBLIC const ErrMsgCode* getRID_SO_ERRCTX(); -#endif #endif diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc index 45f12bc3bc54..1c620a67c697 100644 --- a/include/svx/dialogs.hrc +++ b/include/svx/dialogs.hrc @@ -21,7 +21,7 @@ #define INCLUDED_SVX_DIALOGS_HRC #include <svx/svxids.hrc> -#include <sfx2/dialogs.hrc> +#include <sfx2/sfxsids.hrc> // factory IDs of tabpages implemented in CUI #define RID_SVXPAGE_CHAR_TWOLINES (RID_SVX_START + 242) @@ -75,6 +75,7 @@ #define RID_SW_TP_OPTPRINT_PAGE (RID_OFA_START + 209) #define RID_SW_TP_OPTTABLE_PAGE (RID_OFA_START + 210) #define RID_SW_TP_REDLINE_OPT (RID_OFA_START + 212) +#define RID_SW_TP_DOC_STAT (RID_OFA_START + 252) #define RID_SW_TP_OPTCOMPATIBILITY_PAGE (RID_OFA_START + 255) #define RID_SW_TP_COMPARISON_OPT (RID_OFA_START + 257) #define RID_SW_TP_HTML_CONTENT_OPT (RID_OFA_START + 240) diff --git a/include/svx/exthelpid.hrc b/include/svx/exthelpid.hrc deleted file mode 100644 index bcd17303b868..000000000000 --- a/include/svx/exthelpid.hrc +++ /dev/null @@ -1,34 +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_SVX_EXTHELPID_HRC -#define INCLUDED_SVX_EXTHELPID_HRC - -// these HIDs are used in SVX and also in other modules, mainly CUI -// the reason is that different controls have the same help texts assigned -// but are implemented in different libraries -// to avoid "exporting" the whole HID list only those few ones that are shared -// are moved to this exported (delivered) hrc file - -// Help-Ids -------------------------------------------------------------- -#define HID_GALLERY_ACTUALIZE "SVX_HID_GALLERY_ACTUALIZE" -#define HID_GALLERY_TITLE "SVX_HID_GALLERY_TITLE" - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx index 31892bc8ef85..694677b0614d 100644 --- a/include/svx/float3d.hxx +++ b/include/svx/float3d.hxx @@ -33,6 +33,29 @@ #include <svx/dlgctrl.hxx> #include <svx/svdmodel.hxx> +// Lower part +#define CTL_PREVIEW 12 +#define CTL_LIGHT_PREVIEW 13 + +// Geometry + +// Depiction/Appearance +#define FT_DISTANCE 51 + +// Lighting +#define BTN_LIGHT_1 60 +#define BTN_LIGHT_2 61 +#define BTN_LIGHT_3 62 +#define BTN_LIGHT_4 63 +#define BTN_LIGHT_5 64 +#define BTN_LIGHT_6 65 +#define BTN_LIGHT_7 66 +#define BTN_LIGHT_8 67 +#define FT_LIGHTSOURCE 77 +#define LB_AMBIENTLIGHT 78 +#define BTN_AMBIENT_COLOR 79 +#define FT_AMBIENTLIGHT 80 + enum class ViewType3D { Geo = 1, diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx index e328ab8b1e78..e23754b657b0 100644 --- a/include/svx/imapdlg.hxx +++ b/include/svx/imapdlg.hxx @@ -32,6 +32,28 @@ #include <svx/svxdllapi.h> #include <vector> +#define TBI_APPLY 1 +#define TBI_OPEN 2 +#define TBI_SAVEAS 3 + +#define TBI_SELECT 4 +#define TBI_RECT 5 +#define TBI_CIRCLE 6 +#define TBI_POLY 7 +#define TBI_FREEPOLY 8 + +#define TBI_ACTIVE 16 +#define TBI_MACRO 18 +#define TBI_PROPERTY 19 + +#define TBI_POLYEDIT 30 +#define TBI_POLYMOVE 31 +#define TBI_POLYINSERT 32 +#define TBI_POLYDELETE 33 + +#define TBI_UNDO 40 +#define TBI_REDO 41 + class ImageMap; /************************************************************************* diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc index a3ec0eedc488..6416454d1160 100644 --- a/include/svx/strings.hrc +++ b/include/svx/strings.hrc @@ -1256,6 +1256,281 @@ // String for saving modified image (instead of original) #define RID_SVXSTR_SAVE_MODIFIED_IMAGE NC_("RID_SVXSTR_SAVE_MODIFIED_IMAGE", "The image has been modified. By default the original image will be saved.\nDo you want to save the modified version instead ?") +#define RID_SUBSETSTR_BASIC_LATIN NC_("RID_SUBSETMAP", "Basic Latin") +#define RID_SUBSETSTR_LATIN_1 NC_("RID_SUBSETMAP", "Latin-1") +#define RID_SUBSETSTR_LATIN_EXTENDED_A NC_("RID_SUBSETMAP", "Latin Extended-A") +#define RID_SUBSETSTR_LATIN_EXTENDED_B NC_("RID_SUBSETMAP", "Latin Extended-B") +#define RID_SUBSETSTR_IPA_EXTENSIONS NC_("RID_SUBSETMAP", "IPA Extensions") +#define RID_SUBSETSTR_SPACING_MODIFIERS NC_("RID_SUBSETMAP", "Spacing Modifier Letters") +#define RID_SUBSETSTR_COMB_DIACRITICAL NC_("RID_SUBSETMAP", "Combining Diacritical Marks") +#define RID_SUBSETSTR_BASIC_GREEK NC_("RID_SUBSETMAP", "Basic Greek") +#define RID_SUBSETSTR_GREEK_SYMS_COPTIC NC_("RID_SUBSETMAP", "Greek Symbols And Coptic") +#define RID_SUBSETSTR_CYRILLIC NC_("RID_SUBSETMAP", "Cyrillic") +#define RID_SUBSETSTR_ARMENIAN NC_("RID_SUBSETMAP", "Armenian") +#define RID_SUBSETSTR_BASIC_HEBREW NC_("RID_SUBSETMAP", "Basic Hebrew") +#define RID_SUBSETSTR_HEBREW_EXTENDED NC_("RID_SUBSETMAP", "Hebrew Extended") +#define RID_SUBSETSTR_BASIC_ARABIC NC_("RID_SUBSETMAP", "Basic Arabic") +#define RID_SUBSETSTR_ARABIC_EXTENDED NC_("RID_SUBSETMAP", "Arabic Extended") +#define RID_SUBSETSTR_DEVANAGARI NC_("RID_SUBSETMAP", "Devanagari") +#define RID_SUBSETSTR_BENGALI NC_("RID_SUBSETMAP", "Bengali") +#define RID_SUBSETSTR_GURMUKHI NC_("RID_SUBSETMAP", "Gurmukhi") +#define RID_SUBSETSTR_GUJARATI NC_("RID_SUBSETMAP", "Gujarati") +#define RID_SUBSETSTR_ODIA NC_("RID_SUBSETMAP", "Odia") +#define RID_SUBSETSTR_TAMIL NC_("RID_SUBSETMAP", "Tamil") +#define RID_SUBSETSTR_TELUGU NC_("RID_SUBSETMAP", "Telugu") +#define RID_SUBSETSTR_KANNADA NC_("RID_SUBSETMAP", "Kannada") +#define RID_SUBSETSTR_MALAYALAM NC_("RID_SUBSETMAP", "Malayalam") +#define RID_SUBSETSTR_THAI NC_("RID_SUBSETMAP", "Thai") +#define RID_SUBSETSTR_LAO NC_("RID_SUBSETMAP", "Lao") +#define RID_SUBSETSTR_BASIC_GEORGIAN NC_("RID_SUBSETMAP", "Basic Georgian") +#define RID_SUBSETSTR_GEORGIAN_EXTENDED NC_("RID_SUBSETMAP", "Georgian Extended") +#define RID_SUBSETSTR_HANGUL_JAMO NC_("RID_SUBSETMAP", "Hangul Jamo") +#define RID_SUBSETSTR_LATIN_EXTENDED_ADDS NC_("RID_SUBSETMAP", "Latin Extended Additionals") +#define RID_SUBSETSTR_GREEK_EXTENDED NC_("RID_SUBSETMAP", "Greek Extended") +#define RID_SUBSETSTR_GENERAL_PUNCTUATION NC_("RID_SUBSETMAP", "General punctuation") +#define RID_SUBSETSTR_SUB_SUPER_SCRIPTS NC_("RID_SUBSETMAP", "Superscripts and Subscripts") +#define RID_SUBSETSTR_CURRENCY_SYMBOLS NC_("RID_SUBSETMAP", "Currency Symbols") +#define RID_SUBSETSTR_COMB_DIACRITIC_SYMS NC_("RID_SUBSETMAP", "Combining Diacritical Symbols") +#define RID_SUBSETSTR_LETTERLIKE_SYMBOLS NC_("RID_SUBSETMAP", "Letterlike Symbols") +#define RID_SUBSETSTR_NUMBER_FORMS NC_("RID_SUBSETMAP", "Number Forms") +#define RID_SUBSETSTR_ARROWS NC_("RID_SUBSETMAP", "Arrows") +#define RID_SUBSETSTR_MATH_OPERATORS NC_("RID_SUBSETMAP", "Mathematical Operators") +#define RID_SUBSETSTR_MISC_TECHNICAL NC_("RID_SUBSETMAP", "Miscellaneous Technical") +#define RID_SUBSETSTR_CONTROL_PICTURES NC_("RID_SUBSETMAP", "Control Pictures") +#define RID_SUBSETSTR_OPTICAL_CHAR_REC NC_("RID_SUBSETMAP", "Optical Character Recognition") +#define RID_SUBSETSTR_ENCLOSED_ALPHANUM NC_("RID_SUBSETMAP", "Enclosed Alphanumerics") +#define RID_SUBSETSTR_BOX_DRAWING NC_("RID_SUBSETMAP", "Box Drawing") +#define RID_SUBSETSTR_BLOCK_ELEMENTS NC_("RID_SUBSETMAP", "Block Elements") +#define RID_SUBSETSTR_GEOMETRIC_SHAPES NC_("RID_SUBSETMAP", "Geometric Shapes") +#define RID_SUBSETSTR_MISC_DINGBATS NC_("RID_SUBSETMAP", "Miscellaneous Symbols") +#define RID_SUBSETSTR_DINGBATS NC_("RID_SUBSETMAP", "Dingbats") +#define RID_SUBSETSTR_CJK_SYMS_PUNCTUATION NC_("RID_SUBSETMAP", "CJK Symbols And Punctuation") +#define RID_SUBSETSTR_HIRAGANA NC_("RID_SUBSETMAP", "Hiragana") +#define RID_SUBSETSTR_KATAKANA NC_("RID_SUBSETMAP", "Katakana") +#define RID_SUBSETSTR_BOPOMOFO NC_("RID_SUBSETMAP", "Bopomofo") +#define RID_SUBSETSTR_HANGUL_COMPAT_JAMO NC_("RID_SUBSETMAP", "Hangul Compatibility Jamo") +#define RID_SUBSETSTR_CJK_MISC NC_("RID_SUBSETMAP", "CJK Miscellaneous") +#define RID_SUBSETSTR_ENCLOSED_CJK_LETTERS NC_("RID_SUBSETMAP", "Enclosed CJK Letters And Months") +#define RID_SUBSETSTR_CJK_COMPATIBILITY NC_("RID_SUBSETMAP", "CJK Compatibility") +#define RID_SUBSETSTR_HANGUL NC_("RID_SUBSETMAP", "Hangul") +#define RID_SUBSETSTR_CJK_UNIFIED_IDGRAPH NC_("RID_SUBSETMAP", "CJK Unified Ideographs") +#define RID_SUBSETSTR_CJK_EXT_A_UNIFIED_IDGRAPH NC_("RID_SUBSETMAP", "CJK Unified Ideographs Extension A") +#define RID_SUBSETSTR_PRIVATE_USE_AREA NC_("RID_SUBSETMAP", "Private Use Area") +#define RID_SUBSETSTR_CJK_COMPAT_IDGRAPHS NC_("RID_SUBSETMAP", "CJK Compatibility Ideographs") +#define RID_SUBSETSTR_ALPHA_PRESENTATION NC_("RID_SUBSETMAP", "Alphabetic Presentation Forms") +#define RID_SUBSETSTR_ARABIC_PRESENT_A NC_("RID_SUBSETMAP", "Arabic Presentation Forms-A") +#define RID_SUBSETSTR_COMBINING_HALF_MARKS NC_("RID_SUBSETMAP", "Combining Half Marks") +#define RID_SUBSETSTR_CJK_COMPAT_FORMS NC_("RID_SUBSETMAP", "CJK Compatibility Forms") +#define RID_SUBSETSTR_SMALL_FORM_VARIANTS NC_("RID_SUBSETMAP", "Small Form Variants") +#define RID_SUBSETSTR_ARABIC_PRESENT_B NC_("RID_SUBSETMAP", "Arabic Presentation Forms-B") +#define RID_SUBSETSTR_HALFW_FULLW_FORMS NC_("RID_SUBSETMAP", "Half-width and Full-width Forms") +#define RID_SUBSETSTR_SPECIALS NC_("RID_SUBSETMAP", "Specials") +#define RID_SUBSETSTR_YI_SYLLABLES NC_("RID_SUBSETMAP", "Yi Syllables") +#define RID_SUBSETSTR_YI_RADICALS NC_("RID_SUBSETMAP", "Yi Radicals") +#define RID_SUBSETSTR_OLD_ITALIC NC_("RID_SUBSETMAP", "Old Italic") +#define RID_SUBSETSTR_GOTHIC NC_("RID_SUBSETMAP", "Gothic") +#define RID_SUBSETSTR_DESERET NC_("RID_SUBSETMAP", "Deseret") +#define RID_SUBSETSTR_BYZANTINE_MUSICAL_SYMBOLS NC_("RID_SUBSETMAP", "Byzantine Musical Symbols") +#define RID_SUBSETSTR_MUSICAL_SYMBOLS NC_("RID_SUBSETMAP", "Musical Symbols") +#define RID_SUBSETSTR_MATHEMATICAL_ALPHANUMERIC_SYMBOLS NC_("RID_SUBSETMAP", "Mathematical Alphanumeric Symbols") +#define RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B NC_("RID_SUBSETMAP", "CJK Unified Ideographs Extension B") +#define RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C NC_("RID_SUBSETMAP", "CJK Unified Ideographs Extension C") +#define RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D NC_("RID_SUBSETMAP", "CJK Unified Ideographs Extension D") +#define RID_SUBSETSTR_CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT NC_("RID_SUBSETMAP", "CJK Compatibility Ideographs Supplement") +#define RID_SUBSETSTR_TAGS NC_("RID_SUBSETMAP", "Tags") +#define RID_SUBSETSTR_CYRILLIC_SUPPLEMENTARY NC_("RID_SUBSETMAP", "Cyrillic Supplement") +#define RID_SUBSETSTR_VARIATION_SELECTORS NC_("RID_SUBSETMAP", "Variation Selectors") +#define RID_SUBSETSTR_SUPPLEMENTARY_PRIVATE_USE_AREA_A NC_("RID_SUBSETMAP", "Supplementary Private Use Area-A") +#define RID_SUBSETSTR_SUPPLEMENTARY_PRIVATE_USE_AREA_B NC_("RID_SUBSETMAP", "Supplementary Private Use Area-B") +#define RID_SUBSETSTR_LIMBU NC_("RID_SUBSETMAP", "Limbu") +#define RID_SUBSETSTR_TAI_LE NC_("RID_SUBSETMAP", "Tai Le") +#define RID_SUBSETSTR_KHMER_SYMBOLS NC_("RID_SUBSETMAP", "Khmer Symbols") +#define RID_SUBSETSTR_PHONETIC_EXTENSIONS NC_("RID_SUBSETMAP", "Phonetic Extensions") +#define RID_SUBSETSTR_MISCELLANEOUS_SYMBOLS_AND_ARROWS NC_("RID_SUBSETMAP", "Miscellaneous Symbols And Arrows") +#define RID_SUBSETSTR_YIJING_HEXAGRAM_SYMBOLS NC_("RID_SUBSETMAP", "Yijing Hexagram Symbols") +#define RID_SUBSETSTR_LINEAR_B_SYLLABARY NC_("RID_SUBSETMAP", "Linear B Syllabary") +#define RID_SUBSETSTR_LINEAR_B_IDEOGRAMS NC_("RID_SUBSETMAP", "Linear B Ideograms") +#define RID_SUBSETSTR_AEGEAN_NUMBERS NC_("RID_SUBSETMAP", "Aegean Numbers") +#define RID_SUBSETSTR_UGARITIC NC_("RID_SUBSETMAP", "Ugaritic") +#define RID_SUBSETSTR_SHAVIAN NC_("RID_SUBSETMAP", "Shavian") +#define RID_SUBSETSTR_OSMANYA NC_("RID_SUBSETMAP", "Osmanya") +#define RID_SUBSETSTR_SINHALA NC_("RID_SUBSETMAP", "Sinhala") +#define RID_SUBSETSTR_TIBETAN NC_("RID_SUBSETMAP", "Tibetan") +#define RID_SUBSETSTR_MYANMAR NC_("RID_SUBSETMAP", "Myanmar") +#define RID_SUBSETSTR_KHMER NC_("RID_SUBSETMAP", "Khmer") +#define RID_SUBSETSTR_OGHAM NC_("RID_SUBSETMAP", "Ogham") +#define RID_SUBSETSTR_RUNIC NC_("RID_SUBSETMAP", "Runic") +#define RID_SUBSETSTR_SYRIAC NC_("RID_SUBSETMAP", "Syriac") +#define RID_SUBSETSTR_THAANA NC_("RID_SUBSETMAP", "Thaana") +#define RID_SUBSETSTR_ETHIOPIC NC_("RID_SUBSETMAP", "Ethiopic") +#define RID_SUBSETSTR_CHEROKEE NC_("RID_SUBSETMAP", "Cherokee") +#define RID_SUBSETSTR_CANADIAN_ABORIGINAL NC_("RID_SUBSETMAP", "Canadian Aboriginal Syllables") +#define RID_SUBSETSTR_MONGOLIAN NC_("RID_SUBSETMAP", "Mongolian") +#define RID_SUBSETSTR_MISC_MATH_SYMS_A NC_("RID_SUBSETMAP", "Miscellaneous Mathematical Symbols-A") +#define RID_SUBSETSTR_SUPPL_ARROWS_A NC_("RID_SUBSETMAP", "Supplemental Arrows-A") +#define RID_SUBSETSTR_BRAILLE_PATTERNS NC_("RID_SUBSETMAP", "Braille Patterns") +#define RID_SUBSETSTR_SUPPL_ARROWS_B NC_("RID_SUBSETMAP", "Supplemental Arrows-B") +#define RID_SUBSETSTR_MISC_MATH_SYMS_B NC_("RID_SUBSETMAP", "Miscellaneous Mathematical Symbols-B") +#define RID_SUBSETSTR_CJK_RADICAL_SUPPL NC_("RID_SUBSETMAP", "CJK Radical Supplement") +#define RID_SUBSETSTR_KANGXI_RADICALS NC_("RID_SUBSETMAP", "Kangxi Radicals") +#define RID_SUBSETSTR_IDEO_DESC_CHARS NC_("RID_SUBSETMAP", "Ideographic Description Characters") +#define RID_SUBSETSTR_TAGALOG NC_("RID_SUBSETMAP", "Tagalog") +#define RID_SUBSETSTR_HANUNOO NC_("RID_SUBSETMAP", "Hanunoo") +#define RID_SUBSETSTR_TAGBANWA NC_("RID_SUBSETMAP", "Tagbanwa") +#define RID_SUBSETSTR_BUHID NC_("RID_SUBSETMAP", "Buhid") +#define RID_SUBSETSTR_KANBUN NC_("RID_SUBSETMAP", "Kanbun") +#define RID_SUBSETSTR_BOPOMOFO_EXTENDED NC_("RID_SUBSETMAP", "Bopomofo Extended") +#define RID_SUBSETSTR_KATAKANA_PHONETIC NC_("RID_SUBSETMAP", "Katakana Phonetics") +#define RID_SUBSETSTR_CJK_STROKES NC_("RID_SUBSETMAP", "CJK Strokes") +#define RID_SUBSETSTR_CYPRIOT_SYLLABARY NC_("RID_SUBSETMAP", "Cypriot Syllabary") +#define RID_SUBSETSTR_TAI_XUAN_JING_SYMBOLS NC_("RID_SUBSETMAP", "Tai Xuan Jing Symbols") +#define RID_SUBSETSTR_VARIATION_SELECTORS_SUPPLEMENT NC_("RID_SUBSETMAP", "Variation Selectors Supplement") +#define RID_SUBSETSTR_ANCIENT_GREEK_MUSICAL_NOTATION NC_("RID_SUBSETMAP", "Ancient Greek Musical Notation") +#define RID_SUBSETSTR_ANCIENT_GREEK_NUMBERS NC_("RID_SUBSETMAP", "Ancient Greek Numbers") +#define RID_SUBSETSTR_ARABIC_SUPPLEMENT NC_("RID_SUBSETMAP", "Arabic Supplement") +#define RID_SUBSETSTR_BUGINESE NC_("RID_SUBSETMAP", "Buginese") +#define RID_SUBSETSTR_COMBINING_DIACRITICAL_MARKS_SUPPLEMENT NC_("RID_SUBSETMAP", "Combining Diacritical Marks Supplement") +#define RID_SUBSETSTR_COPTIC NC_("RID_SUBSETMAP", "Coptic") +#define RID_SUBSETSTR_ETHIOPIC_EXTENDED NC_("RID_SUBSETMAP", "Ethiopic Extended") +#define RID_SUBSETSTR_ETHIOPIC_SUPPLEMENT NC_("RID_SUBSETMAP", "Ethiopic Supplement") +#define RID_SUBSETSTR_GEORGIAN_SUPPLEMENT NC_("RID_SUBSETMAP", "Georgian Supplement") +#define RID_SUBSETSTR_GLAGOLITIC NC_("RID_SUBSETMAP", "Glagolitic") +#define RID_SUBSETSTR_KHAROSHTHI NC_("RID_SUBSETMAP", "Kharoshthi") +#define RID_SUBSETSTR_MODIFIER_TONE_LETTERS NC_("RID_SUBSETMAP", "Modifier Tone Letters") +#define RID_SUBSETSTR_NEW_TAI_LUE NC_("RID_SUBSETMAP", "New Tai Lue") +#define RID_SUBSETSTR_OLD_PERSIAN NC_("RID_SUBSETMAP", "Old Persian") +#define RID_SUBSETSTR_PHONETIC_EXTENSIONS_SUPPLEMENT NC_("RID_SUBSETMAP", "Phonetic Extensions Supplement") +#define RID_SUBSETSTR_SUPPLEMENTAL_PUNCTUATION NC_("RID_SUBSETMAP", "Supplemental Punctuation") +#define RID_SUBSETSTR_SYLOTI_NAGRI NC_("RID_SUBSETMAP", "Syloti Nagri") +#define RID_SUBSETSTR_TIFINAGH NC_("RID_SUBSETMAP", "Tifinagh") +#define RID_SUBSETSTR_VERTICAL_FORMS NC_("RID_SUBSETMAP", "Vertical Forms") +#define RID_SUBSETSTR_NKO NC_("RID_SUBSETMAP", "Nko") +#define RID_SUBSETSTR_BALINESE NC_("RID_SUBSETMAP", "Balinese") +#define RID_SUBSETSTR_LATIN_EXTENDED_C NC_("RID_SUBSETMAP", "Latin Extended-C") +#define RID_SUBSETSTR_LATIN_EXTENDED_D NC_("RID_SUBSETMAP", "Latin Extended-D") +#define RID_SUBSETSTR_PHAGS_PA NC_("RID_SUBSETMAP", "Phags-Pa") +#define RID_SUBSETSTR_PHOENICIAN NC_("RID_SUBSETMAP", "Phoenician") +#define RID_SUBSETSTR_CUNEIFORM NC_("RID_SUBSETMAP", "Cuneiform") +#define RID_SUBSETSTR_CUNEIFORM_NUMBERS_AND_PUNCTUATION NC_("RID_SUBSETMAP", "Cuneiform Numbers And Punctuation") +#define RID_SUBSETSTR_COUNTING_ROD_NUMERALS NC_("RID_SUBSETMAP", "Counting Rod Numerals") +#define RID_SUBSETSTR_SUNDANESE NC_("RID_SUBSETMAP", "Sundanese") +#define RID_SUBSETSTR_LEPCHA NC_("RID_SUBSETMAP", "Lepcha") +#define RID_SUBSETSTR_OL_CHIKI NC_("RID_SUBSETMAP", "Ol Chiki") +#define RID_SUBSETSTR_CYRILLIC_EXTENDED_A NC_("RID_SUBSETMAP", "Cyrillic Extended-A") +#define RID_SUBSETSTR_VAI NC_("RID_SUBSETMAP", "Vai") +#define RID_SUBSETSTR_CYRILLIC_EXTENDED_B NC_("RID_SUBSETMAP", "Cyrillic Extended-B") +#define RID_SUBSETSTR_SAURASHTRA NC_("RID_SUBSETMAP", "Saurashtra") +#define RID_SUBSETSTR_KAYAH_LI NC_("RID_SUBSETMAP", "Kayah Li") +#define RID_SUBSETSTR_REJANG NC_("RID_SUBSETMAP", "Rejang") +#define RID_SUBSETSTR_CHAM NC_("RID_SUBSETMAP", "Cham") +#define RID_SUBSETSTR_ANCIENT_SYMBOLS NC_("RID_SUBSETMAP", "Ancient Symbols") +#define RID_SUBSETSTR_PHAISTOS_DISC NC_("RID_SUBSETMAP", "Phaistos Disc") +#define RID_SUBSETSTR_LYCIAN NC_("RID_SUBSETMAP", "Lycian") +#define RID_SUBSETSTR_CARIAN NC_("RID_SUBSETMAP", "Carian") +#define RID_SUBSETSTR_LYDIAN NC_("RID_SUBSETMAP", "Lydian") +#define RID_SUBSETSTR_MAHJONG_TILES NC_("RID_SUBSETMAP", "Mahjong Tiles") +#define RID_SUBSETSTR_DOMINO_TILES NC_("RID_SUBSETMAP", "Domino Tiles") +#define RID_SUBSETSTR_SAMARITAN NC_("RID_SUBSETMAP", "Samaritan") +#define RID_SUBSETSTR_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED NC_("RID_SUBSETMAP", "Canadian Aboriginal Syllabics Extended") +#define RID_SUBSETSTR_TAI_THAM NC_("RID_SUBSETMAP", "Tai Tham") +#define RID_SUBSETSTR_VEDIC_EXTENSIONS NC_("RID_SUBSETMAP", "Vedic Extensions") +#define RID_SUBSETSTR_LISU NC_("RID_SUBSETMAP", "Lisu") +#define RID_SUBSETSTR_BAMUM NC_("RID_SUBSETMAP", "Bamum") +#define RID_SUBSETSTR_COMMON_INDIC_NUMBER_FORMS NC_("RID_SUBSETMAP", "Common Indic Number Forms") +#define RID_SUBSETSTR_DEVANAGARI_EXTENDED NC_("RID_SUBSETMAP", "Devanagari Extended") +#define RID_SUBSETSTR_HANGUL_JAMO_EXTENDED_A NC_("RID_SUBSETMAP", "Hangul Jamo Extended-A") +#define RID_SUBSETSTR_JAVANESE NC_("RID_SUBSETMAP", "Javanese") +#define RID_SUBSETSTR_MYANMAR_EXTENDED_A NC_("RID_SUBSETMAP", "Myanmar Extended-A") +#define RID_SUBSETSTR_TAI_VIET NC_("RID_SUBSETMAP", "Tai Viet") +#define RID_SUBSETSTR_MEETEI_MAYEK NC_("RID_SUBSETMAP", "Meetei Mayek") +#define RID_SUBSETSTR_HANGUL_JAMO_EXTENDED_B NC_("RID_SUBSETMAP", "Hangul Jamo Extended-B") +#define RID_SUBSETSTR_IMPERIAL_ARAMAIC NC_("RID_SUBSETMAP", "Imperial Aramaic") +#define RID_SUBSETSTR_OLD_SOUTH_ARABIAN NC_("RID_SUBSETMAP", "Old South Arabian") +#define RID_SUBSETSTR_AVESTAN NC_("RID_SUBSETMAP", "Avestan") +#define RID_SUBSETSTR_INSCRIPTIONAL_PARTHIAN NC_("RID_SUBSETMAP", "Inscriptional Parthian") +#define RID_SUBSETSTR_INSCRIPTIONAL_PAHLAVI NC_("RID_SUBSETMAP", "Inscriptional Pahlavi") +#define RID_SUBSETSTR_OLD_TURKIC NC_("RID_SUBSETMAP", "Old Turkic") +#define RID_SUBSETSTR_RUMI_NUMERAL_SYMBOLS NC_("RID_SUBSETMAP", "Rumi Numeral Symbols") +#define RID_SUBSETSTR_KAITHI NC_("RID_SUBSETMAP", "Kaithi") +#define RID_SUBSETSTR_EGYPTIAN_HIEROGLYPHS NC_("RID_SUBSETMAP", "Egyptian Hieroglyphs") +#define RID_SUBSETSTR_ENCLOSED_ALPHANUMERIC_SUPPLEMENT NC_("RID_SUBSETMAP", "Enclosed Alphanumeric Supplement") +#define RID_SUBSETSTR_ENCLOSED_IDEOGRAPHIC_SUPPLEMENT NC_("RID_SUBSETMAP", "Enclosed Ideographic Supplement") +#define RID_SUBSETSTR_MANDAIC NC_("RID_SUBSETMAP", "Mandaic") +#define RID_SUBSETSTR_BATAK NC_("RID_SUBSETMAP", "Batak") +#define RID_SUBSETSTR_ETHIOPIC_EXTENDED_A NC_("RID_SUBSETMAP", "Ethiopic Extended-A") +#define RID_SUBSETSTR_BRAHMI NC_("RID_SUBSETMAP", "Brahmi") +#define RID_SUBSETSTR_BAMUM_SUPPLEMENT NC_("RID_SUBSETMAP", "Bamum Supplement") +#define RID_SUBSETSTR_KANA_SUPPLEMENT NC_("RID_SUBSETMAP", "Kana Supplement") +#define RID_SUBSETSTR_PLAYING_CARDS NC_("RID_SUBSETMAP", "Playing Cards") +#define RID_SUBSETSTR_MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS NC_("RID_SUBSETMAP", "Miscellaneous Symbols And Pictographs") +#define RID_SUBSETSTR_EMOTICONS NC_("RID_SUBSETMAP", "Emoticons") +#define RID_SUBSETSTR_TRANSPORT_AND_MAP_SYMBOLS NC_("RID_SUBSETMAP", "Transport And Map Symbols") +#define RID_SUBSETSTR_ALCHEMICAL_SYMBOLS NC_("RID_SUBSETMAP", "Alchemical Symbols") +#define RID_SUBSETSTR_ARABIC_EXTENDED_A NC_("RID_SUBSETMAP", "Arabic Extended-A") +#define RID_SUBSETSTR_ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS NC_("RID_SUBSETMAP", "Arabic Mathematical Alphabetic Symbols") +#define RID_SUBSETSTR_CHAKMA NC_("RID_SUBSETMAP", "Chakma") +#define RID_SUBSETSTR_MEETEI_MAYEK_EXTENSIONS NC_("RID_SUBSETMAP", "Meetei Mayek Extensions") +#define RID_SUBSETSTR_MEROITIC_CURSIVE NC_("RID_SUBSETMAP", "Meroitic Cursive") +#define RID_SUBSETSTR_MEROITIC_HIEROGLYPHS NC_("RID_SUBSETMAP", "Meroitic Hieroglyphs") +#define RID_SUBSETSTR_MIAO NC_("RID_SUBSETMAP", "Miao") +#define RID_SUBSETSTR_SHARADA NC_("RID_SUBSETMAP", "Sharada") +#define RID_SUBSETSTR_SORA_SOMPENG NC_("RID_SUBSETMAP", "Sora Sompeng") +#define RID_SUBSETSTR_SUNDANESE_SUPPLEMENT NC_("RID_SUBSETMAP", "Sundanese Supplement") +#define RID_SUBSETSTR_TAKRI NC_("RID_SUBSETMAP", "Takri") +#define RID_SUBSETSTR_BASSA_VAH NC_("RID_SUBSETMAP", "Bassa Vah") +#define RID_SUBSETSTR_CAUCASIAN_ALBANIAN NC_("RID_SUBSETMAP", "Caucasian Albanian") +#define RID_SUBSETSTR_COPTIC_EPACT_NUMBERS NC_("RID_SUBSETMAP", "Coptic Epact Numbers") +#define RID_SUBSETSTR_COMBINING_DIACRITICAL_MARKS_EXTENDED NC_("RID_SUBSETMAP", "Combining Diacritical Marks Extended") +#define RID_SUBSETSTR_DUPLOYAN NC_("RID_SUBSETMAP", "Duployan") +#define RID_SUBSETSTR_ELBASAN NC_("RID_SUBSETMAP", "Elbasan") +#define RID_SUBSETSTR_GEOMETRIC_SHAPES_EXTENDED NC_("RID_SUBSETMAP", "Geometric Shapes Extended") +#define RID_SUBSETSTR_GRANTHA NC_("RID_SUBSETMAP", "Grantha") +#define RID_SUBSETSTR_KHOJKI NC_("RID_SUBSETMAP", "Khojki") +#define RID_SUBSETSTR_KHUDAWADI NC_("RID_SUBSETMAP", "Khudawadi") +#define RID_SUBSETSTR_LATIN_EXTENDED_E NC_("RID_SUBSETMAP", "Latin Extended-E") +#define RID_SUBSETSTR_LINEAR_A NC_("RID_SUBSETMAP", "Linear A") +#define RID_SUBSETSTR_MAHAJANI NC_("RID_SUBSETMAP", "Mahajani") +#define RID_SUBSETSTR_MANICHAEAN NC_("RID_SUBSETMAP", "Manichaean") +#define RID_SUBSETSTR_MENDE_KIKAKUI NC_("RID_SUBSETMAP", "Mende Kikakui") +#define RID_SUBSETSTR_MODI NC_("RID_SUBSETMAP", "Modi") +#define RID_SUBSETSTR_MRO NC_("RID_SUBSETMAP", "Mro") +#define RID_SUBSETSTR_MYANMAR_EXTENDED_B NC_("RID_SUBSETMAP", "Myanmar Extended-B") +#define RID_SUBSETSTR_NABATAEAN NC_("RID_SUBSETMAP", "Nabataean") +#define RID_SUBSETSTR_OLD_NORTH_ARABIAN NC_("RID_SUBSETMAP", "Old North Arabian") +#define RID_SUBSETSTR_OLD_PERMIC NC_("RID_SUBSETMAP", "Old Permic") +#define RID_SUBSETSTR_ORNAMENTAL_DINGBATS NC_("RID_SUBSETMAP", "Ornamental Dingbats") +#define RID_SUBSETSTR_PAHAWH_HMONG NC_("RID_SUBSETMAP", "Pahawh Hmong") +#define RID_SUBSETSTR_PALMYRENE NC_("RID_SUBSETMAP", "Palmyrene") +#define RID_SUBSETSTR_PAU_CIN_HAU NC_("RID_SUBSETMAP", "Pau Cin Hau") +#define RID_SUBSETSTR_PSALTER_PAHLAVI NC_("RID_SUBSETMAP", "Psalter Pahlavi") +#define RID_SUBSETSTR_SHORTHAND_FORMAT_CONTROLS NC_("RID_SUBSETMAP", "Shorthand Format Controls") +#define RID_SUBSETSTR_SIDDHAM NC_("RID_SUBSETMAP", "Siddham") +#define RID_SUBSETSTR_SINHALA_ARCHAIC_NUMBERS NC_("RID_SUBSETMAP", "Sinhala Archaic Numbers") +#define RID_SUBSETSTR_SUPPLEMENTAL_ARROWS_C NC_("RID_SUBSETMAP", "Supplemental Arrows-C") +#define RID_SUBSETSTR_TIRHUTA NC_("RID_SUBSETMAP", "Tirhuta") +#define RID_SUBSETSTR_WARANG_CITI NC_("RID_SUBSETMAP", "Warang Citi") +#define RID_SUBSETSTR_AHOM NC_("RID_SUBSETMAP", "Ahom") +#define RID_SUBSETSTR_ANATOLIAN_HIEROGLYPHS NC_("RID_SUBSETMAP", "Anatolian Hieroglyphs") +#define RID_SUBSETSTR_CHEROKEE_SUPPLEMENT NC_("RID_SUBSETMAP", "Cherokee Supplement") +#define RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E NC_("RID_SUBSETMAP", "CJK Unified Ideographs Extension E") +#define RID_SUBSETSTR_EARLY_DYNASTIC_CUNEIFORM NC_("RID_SUBSETMAP", "Early Dynastic Cuneiform") +#define RID_SUBSETSTR_HATRAN NC_("RID_SUBSETMAP", "Hatran") +#define RID_SUBSETSTR_MULTANI NC_("RID_SUBSETMAP", "Multani") +#define RID_SUBSETSTR_OLD_HUNGARIAN NC_("RID_SUBSETMAP", "Old Hungarian") +#define RID_SUBSETSTR_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS NC_("RID_SUBSETMAP", "Supplemental Symbols And Pictographs") +#define RID_SUBSETSTR_SUTTON_SIGNWRITING NC_("RID_SUBSETMAP", "Sutton Signwriting") +#define RID_SUBSETSTR_ADLAM NC_("RID_SUBSETMAP", "Adlam") +#define RID_SUBSETSTR_BHAIKSUKI NC_("RID_SUBSETMAP", "Bhaiksuki") +#define RID_SUBSETSTR_CYRILLIC_EXTENDED_C NC_("RID_SUBSETMAP", "Cyrillic Extended-C") +#define RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT NC_("RID_SUBSETMAP", "Glagolitic Supplement") +#define RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION NC_("RID_SUBSETMAP", "Ideographic Symbols and Punctuation") +#define RID_SUBSETSTR_MARCHEN NC_("RID_SUBSETMAP", "Marchen") +#define RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT NC_("RID_SUBSETMAP", "Mongolian Supplement") +#define RID_SUBSETSTR_NEWA NC_("RID_SUBSETMAP", "Newa") +#define RID_SUBSETSTR_OSAGE NC_("RID_SUBSETMAP", "Osage") +#define RID_SUBSETSTR_TANGUT NC_("RID_SUBSETMAP", "Tangut") +#define RID_SUBSETSTR_TANGUT_COMPONENTS NC_("RID_SUBSETMAP", "Tangut Components") + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svxerr.hxx b/include/svx/svxerr.hxx index 8ea7fce5b612..ef20f13ada09 100644 --- a/include/svx/svxerr.hxx +++ b/include/svx/svxerr.hxx @@ -76,8 +76,6 @@ // class SvxErrorHandler ------------------------------------------------- -#ifndef __RSC - #include <svtools/ehdl.hxx> #include <svx/svxdllapi.h> @@ -93,6 +91,4 @@ SVX_DLLPUBLIC const ErrMsgCode* getRID_SVXERRCTX(); #endif -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index 6df863bbdf00..4ed5b3ff69e9 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -19,9 +19,8 @@ #ifndef INCLUDED_SVX_SVXIDS_HRC #define INCLUDED_SVX_SVXIDS_HRC -#include <svl/memberid.hrc> +#include <svl/memberid.h> #include <svl/solar.hrc> -#include <sfx2/sfx.hrc> #include <sfx2/sfxsids.hrc> #include <editeng/editids.hrc> #include <svx/unomid.hxx> @@ -112,7 +111,6 @@ #define SID_BASICIDE_ARG_LIBNAME ( SID_BASICIDE_START + 34 ) #define SID_BASICIDE_ARG_MODULENAME ( SID_BASICIDE_START + 35 ) #define SID_BASICIDE_BRKPNTSCHANGED ( SID_BASICIDE_START + 36 ) -#define SID_BASICIDE_STATUSBAR ( SID_BASICIDE_START + 37 ) #define SID_BASICIDE_STAT_POS ( SID_BASICIDE_START + 38 ) #define SID_BASICIDE_STAT_DATE ( SID_BASICIDE_START + 39 ) #define SID_BASICIDE_STAT_TITLE ( SID_BASICIDE_START + 40 ) diff --git a/include/svx/svxitems.hrc b/include/svx/svxitems.hrc index deb55860d82b..01c1fa7465b3 100644 --- a/include/svx/svxitems.hrc +++ b/include/svx/svxitems.hrc @@ -20,11 +20,11 @@ #ifndef INCLUDED_SVX_INC_SVX_ITEMS_HRC #define INCLUDED_SVX_INC_SVX_ITEMS_HRC -#include <utility> - -#include "svx/svxitems.hrc" -#include "svx/svxids.hrc" +#include <sal/types.h> +#include <svx/svxitems.hrc> +#include <svx/svxids.hrc> #include <editeng/editids.hrc> +#include <utility> #define NC_(Context, String) (Context "\004" u8##String) diff --git a/include/svx/ucsubset.hrc b/include/svx/ucsubset.hrc deleted file mode 100644 index e826a84d83bb..000000000000 --- a/include/svx/ucsubset.hrc +++ /dev/null @@ -1,307 +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 . - */ - -#include <svx/dialogs.hrc> - -// strings for unicode range descriptions (used e.g. by Charmap dialog) -// (see the Unicode spec and TrueType::OS2.ulUnicodeRange description) -#define RID_SUBSET_START (RID_SVX_START + 901) - -#define RID_SUBSETSTR_BASIC_LATIN (RID_SUBSET_START + 0) -#define RID_SUBSETSTR_LATIN_1 (RID_SUBSET_START + 1) -#define RID_SUBSETSTR_LATIN_EXTENDED_A (RID_SUBSET_START + 2) -#define RID_SUBSETSTR_LATIN_EXTENDED_B (RID_SUBSET_START + 3) -#define RID_SUBSETSTR_IPA_EXTENSIONS (RID_SUBSET_START + 4) -#define RID_SUBSETSTR_SPACING_MODIFIERS (RID_SUBSET_START + 5) -#define RID_SUBSETSTR_COMB_DIACRITICAL (RID_SUBSET_START + 6) -#define RID_SUBSETSTR_BASIC_GREEK (RID_SUBSET_START + 7) -#define RID_SUBSETSTR_GREEK_SYMS_COPTIC (RID_SUBSET_START + 8) -#define RID_SUBSETSTR_CYRILLIC (RID_SUBSET_START + 9) -#define RID_SUBSETSTR_ARMENIAN (RID_SUBSET_START + 10) -#define RID_SUBSETSTR_HEBREW_EXTENDED (RID_SUBSET_START + 11) -#define RID_SUBSETSTR_BASIC_HEBREW (RID_SUBSET_START + 12) -#define RID_SUBSETSTR_BASIC_ARABIC (RID_SUBSET_START + 13) -#define RID_SUBSETSTR_ARABIC_EXTENDED (RID_SUBSET_START + 14) -#define RID_SUBSETSTR_DEVANAGARI (RID_SUBSET_START + 15) -#define RID_SUBSETSTR_BENGALI (RID_SUBSET_START + 16) -#define RID_SUBSETSTR_GURMUKHI (RID_SUBSET_START + 17) -#define RID_SUBSETSTR_GUJARATI (RID_SUBSET_START + 18) -#define RID_SUBSETSTR_ODIA (RID_SUBSET_START + 19) -#define RID_SUBSETSTR_TAMIL (RID_SUBSET_START + 20) -#define RID_SUBSETSTR_TELUGU (RID_SUBSET_START + 21) -#define RID_SUBSETSTR_KANNADA (RID_SUBSET_START + 22) -#define RID_SUBSETSTR_MALAYALAM (RID_SUBSET_START + 23) -#define RID_SUBSETSTR_THAI (RID_SUBSET_START + 24) -#define RID_SUBSETSTR_LAO (RID_SUBSET_START + 25) -#define RID_SUBSETSTR_BASIC_GEORGIAN (RID_SUBSET_START + 26) -#define RID_SUBSETSTR_GEORGIAN_EXTENDED (RID_SUBSET_START + 27) -#define RID_SUBSETSTR_HANGUL_JAMO (RID_SUBSET_START + 28) -#define RID_SUBSETSTR_LATIN_EXTENDED_ADDS (RID_SUBSET_START + 29) -#define RID_SUBSETSTR_GREEK_EXTENDED (RID_SUBSET_START + 30) -#define RID_SUBSETSTR_GENERAL_PUNCTUATION (RID_SUBSET_START + 31) -#define RID_SUBSETSTR_SUB_SUPER_SCRIPTS (RID_SUBSET_START + 32) -#define RID_SUBSETSTR_CURRENCY_SYMBOLS (RID_SUBSET_START + 33) -#define RID_SUBSETSTR_COMB_DIACRITIC_SYMS (RID_SUBSET_START + 34) -#define RID_SUBSETSTR_LETTERLIKE_SYMBOLS (RID_SUBSET_START + 35) -#define RID_SUBSETSTR_NUMBER_FORMS (RID_SUBSET_START + 36) -#define RID_SUBSETSTR_ARROWS (RID_SUBSET_START + 37) -#define RID_SUBSETSTR_MATH_OPERATORS (RID_SUBSET_START + 38) -#define RID_SUBSETSTR_MISC_TECHNICAL (RID_SUBSET_START + 39) -#define RID_SUBSETSTR_CONTROL_PICTURES (RID_SUBSET_START + 40) -#define RID_SUBSETSTR_OPTICAL_CHAR_REC (RID_SUBSET_START + 41) -#define RID_SUBSETSTR_ENCLOSED_ALPHANUM (RID_SUBSET_START + 42) -#define RID_SUBSETSTR_BOX_DRAWING (RID_SUBSET_START + 43) -#define RID_SUBSETSTR_BLOCK_ELEMENTS (RID_SUBSET_START + 44) -#define RID_SUBSETSTR_GEOMETRIC_SHAPES (RID_SUBSET_START + 45) -#define RID_SUBSETSTR_MISC_DINGBATS (RID_SUBSET_START + 46) -#define RID_SUBSETSTR_DINGBATS (RID_SUBSET_START + 47) -#define RID_SUBSETSTR_CJK_SYMS_PUNCTUATION (RID_SUBSET_START + 48) -#define RID_SUBSETSTR_HIRAGANA (RID_SUBSET_START + 49) -#define RID_SUBSETSTR_KATAKANA (RID_SUBSET_START + 50) -#define RID_SUBSETSTR_BOPOMOFO (RID_SUBSET_START + 51) -#define RID_SUBSETSTR_HANGUL_COMPAT_JAMO (RID_SUBSET_START + 52) -#define RID_SUBSETSTR_CJK_MISC (RID_SUBSET_START + 53) -#define RID_SUBSETSTR_ENCLOSED_CJK_LETTERS (RID_SUBSET_START + 54) -#define RID_SUBSETSTR_CJK_COMPATIBILITY (RID_SUBSET_START + 55) -#define RID_SUBSETSTR_HANGUL (RID_SUBSET_START + 56) - -#define RID_SUBSETSTR_CJK_UNIFIED_IDGRAPH (RID_SUBSET_START + 59) -#define RID_SUBSETSTR_PRIVATE_USE_AREA (RID_SUBSET_START + 60) -#define RID_SUBSETSTR_CJK_COMPAT_IDGRAPHS (RID_SUBSET_START + 61) -#define RID_SUBSETSTR_ALPHA_PRESENTATION (RID_SUBSET_START + 62) -#define RID_SUBSETSTR_ARABIC_PRESENT_A (RID_SUBSET_START + 63) -#define RID_SUBSETSTR_COMBINING_HALF_MARKS (RID_SUBSET_START + 64) -#define RID_SUBSETSTR_CJK_COMPAT_FORMS (RID_SUBSET_START + 65) -#define RID_SUBSETSTR_SMALL_FORM_VARIANTS (RID_SUBSET_START + 66) -#define RID_SUBSETSTR_ARABIC_PRESENT_B (RID_SUBSET_START + 67) -#define RID_SUBSETSTR_HALFW_FULLW_FORMS (RID_SUBSET_START + 68) -#define RID_SUBSETSTR_SPECIALS (RID_SUBSET_START + 69) - -#define RID_SUBSETSTR_YI_SYLLABLES (RID_SUBSET_START + 70) -#define RID_SUBSETSTR_YI_RADICALS (RID_SUBSET_START + 71) -#define RID_SUBSETSTR_OLD_ITALIC (RID_SUBSET_START + 72) -#define RID_SUBSETSTR_GOTHIC (RID_SUBSET_START + 73) -#define RID_SUBSETSTR_DESERET (RID_SUBSET_START + 74) -#define RID_SUBSETSTR_BYZANTINE_MUSICAL_SYMBOLS (RID_SUBSET_START + 75) -#define RID_SUBSETSTR_MUSICAL_SYMBOLS (RID_SUBSET_START + 76) -#define RID_SUBSETSTR_MATHEMATICAL_ALPHANUMERIC_SYMBOLS (RID_SUBSET_START + 77) -#define RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B (RID_SUBSET_START + 78) -#define RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C (RID_SUBSET_START + 79) -#define RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D (RID_SUBSET_START + 80) -#define RID_SUBSETSTR_CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT (RID_SUBSET_START + 81) -#define RID_SUBSETSTR_TAGS (RID_SUBSET_START + 82) -#define RID_SUBSETSTR_CYRILLIC_SUPPLEMENTARY (RID_SUBSET_START + 83) -#define RID_SUBSETSTR_VARIATION_SELECTORS (RID_SUBSET_START + 84) -#define RID_SUBSETSTR_SUPPLEMENTARY_PRIVATE_USE_AREA_A (RID_SUBSET_START + 85) -#define RID_SUBSETSTR_SUPPLEMENTARY_PRIVATE_USE_AREA_B (RID_SUBSET_START + 86) -#define RID_SUBSETSTR_LIMBU (RID_SUBSET_START + 87) -#define RID_SUBSETSTR_TAI_LE (RID_SUBSET_START + 88) -#define RID_SUBSETSTR_KHMER_SYMBOLS (RID_SUBSET_START + 89) -#define RID_SUBSETSTR_PHONETIC_EXTENSIONS (RID_SUBSET_START + 90) -#define RID_SUBSETSTR_MISCELLANEOUS_SYMBOLS_AND_ARROWS (RID_SUBSET_START + 91) -#define RID_SUBSETSTR_YIJING_HEXAGRAM_SYMBOLS (RID_SUBSET_START + 92) -#define RID_SUBSETSTR_LINEAR_B_SYLLABARY (RID_SUBSET_START + 93) -#define RID_SUBSETSTR_LINEAR_B_IDEOGRAMS (RID_SUBSET_START + 94) -#define RID_SUBSETSTR_AEGEAN_NUMBERS (RID_SUBSET_START + 95) -#define RID_SUBSETSTR_UGARITIC (RID_SUBSET_START + 96) -#define RID_SUBSETSTR_SHAVIAN (RID_SUBSET_START + 97) -#define RID_SUBSETSTR_OSMANYA (RID_SUBSET_START + 98) -#define RID_SUBSETSTR_CYPRIOT_SYLLABARY (RID_SUBSET_START + 99) -#define RID_SUBSETSTR_TAI_XUAN_JING_SYMBOLS (RID_SUBSET_START + 100) -#define RID_SUBSETSTR_VARIATION_SELECTORS_SUPPLEMENT (RID_SUBSET_START + 101) -#define RID_SUBSETSTR_ANCIENT_GREEK_MUSICAL_NOTATION (RID_SUBSET_START + 102) -#define RID_SUBSETSTR_ANCIENT_GREEK_NUMBERS (RID_SUBSET_START + 103) -#define RID_SUBSETSTR_ARABIC_SUPPLEMENT (RID_SUBSET_START + 104) -#define RID_SUBSETSTR_BUGINESE (RID_SUBSET_START + 105) -#define RID_SUBSETSTR_CJK_STROKES (RID_SUBSET_START + 106) -#define RID_SUBSETSTR_COMBINING_DIACRITICAL_MARKS_SUPPLEMENT (RID_SUBSET_START + 107) -#define RID_SUBSETSTR_COPTIC (RID_SUBSET_START + 108) -#define RID_SUBSETSTR_ETHIOPIC_EXTENDED (RID_SUBSET_START + 109) -#define RID_SUBSETSTR_ETHIOPIC_SUPPLEMENT (RID_SUBSET_START + 110) -#define RID_SUBSETSTR_GEORGIAN_SUPPLEMENT (RID_SUBSET_START + 111) -#define RID_SUBSETSTR_GLAGOLITIC (RID_SUBSET_START + 112) -#define RID_SUBSETSTR_KHAROSHTHI (RID_SUBSET_START + 113) -#define RID_SUBSETSTR_MODIFIER_TONE_LETTERS (RID_SUBSET_START + 114) -#define RID_SUBSETSTR_NEW_TAI_LUE (RID_SUBSET_START + 115) -#define RID_SUBSETSTR_OLD_PERSIAN (RID_SUBSET_START + 116) -#define RID_SUBSETSTR_PHONETIC_EXTENSIONS_SUPPLEMENT (RID_SUBSET_START + 117) -#define RID_SUBSETSTR_SUPPLEMENTAL_PUNCTUATION (RID_SUBSET_START + 118) -#define RID_SUBSETSTR_SYLOTI_NAGRI (RID_SUBSET_START + 119) -#define RID_SUBSETSTR_TIFINAGH (RID_SUBSET_START + 120) -#define RID_SUBSETSTR_VERTICAL_FORMS (RID_SUBSET_START + 121) -#define RID_SUBSETSTR_NKO (RID_SUBSET_START + 122) -#define RID_SUBSETSTR_BALINESE (RID_SUBSET_START + 123) -#define RID_SUBSETSTR_LATIN_EXTENDED_C (RID_SUBSET_START + 124) -#define RID_SUBSETSTR_LATIN_EXTENDED_D (RID_SUBSET_START + 125) -#define RID_SUBSETSTR_PHAGS_PA (RID_SUBSET_START + 126) -#define RID_SUBSETSTR_PHOENICIAN (RID_SUBSET_START + 127) -#define RID_SUBSETSTR_CUNEIFORM (RID_SUBSET_START + 128) -#define RID_SUBSETSTR_CUNEIFORM_NUMBERS_AND_PUNCTUATION (RID_SUBSET_START + 129) -#define RID_SUBSETSTR_COUNTING_ROD_NUMERALS (RID_SUBSET_START + 130) -#define RID_SUBSETSTR_SUNDANESE (RID_SUBSET_START + 131) -#define RID_SUBSETSTR_LEPCHA (RID_SUBSET_START + 132) -#define RID_SUBSETSTR_OL_CHIKI (RID_SUBSET_START + 133) -#define RID_SUBSETSTR_CYRILLIC_EXTENDED_A (RID_SUBSET_START + 134) -#define RID_SUBSETSTR_VAI (RID_SUBSET_START + 135) -#define RID_SUBSETSTR_CYRILLIC_EXTENDED_B (RID_SUBSET_START + 136) -#define RID_SUBSETSTR_SAURASHTRA (RID_SUBSET_START + 137) -#define RID_SUBSETSTR_KAYAH_LI (RID_SUBSET_START + 138) -#define RID_SUBSETSTR_REJANG (RID_SUBSET_START + 139) -#define RID_SUBSETSTR_CHAM (RID_SUBSET_START + 140) -#define RID_SUBSETSTR_ANCIENT_SYMBOLS (RID_SUBSET_START + 141) -#define RID_SUBSETSTR_PHAISTOS_DISC (RID_SUBSET_START + 142) -#define RID_SUBSETSTR_LYCIAN (RID_SUBSET_START + 143) -#define RID_SUBSETSTR_CARIAN (RID_SUBSET_START + 144) -#define RID_SUBSETSTR_LYDIAN (RID_SUBSET_START + 145) -#define RID_SUBSETSTR_MAHJONG_TILES (RID_SUBSET_START + 146) -#define RID_SUBSETSTR_DOMINO_TILES (RID_SUBSET_START + 147) -#define RID_SUBSETSTR_SAMARITAN (RID_SUBSET_START + 148) -#define RID_SUBSETSTR_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED (RID_SUBSET_START + 149) -#define RID_SUBSETSTR_TAI_THAM (RID_SUBSET_START + 150) -#define RID_SUBSETSTR_VEDIC_EXTENSIONS (RID_SUBSET_START + 151) -#define RID_SUBSETSTR_LISU (RID_SUBSET_START + 152) -#define RID_SUBSETSTR_BAMUM (RID_SUBSET_START + 153) -#define RID_SUBSETSTR_COMMON_INDIC_NUMBER_FORMS (RID_SUBSET_START + 154) -#define RID_SUBSETSTR_DEVANAGARI_EXTENDED (RID_SUBSET_START + 155) -#define RID_SUBSETSTR_HANGUL_JAMO_EXTENDED_A (RID_SUBSET_START + 156) -#define RID_SUBSETSTR_JAVANESE (RID_SUBSET_START + 157) -#define RID_SUBSETSTR_MYANMAR_EXTENDED_A (RID_SUBSET_START + 158) -#define RID_SUBSETSTR_TAI_VIET (RID_SUBSET_START + 159) -#define RID_SUBSETSTR_MEETEI_MAYEK (RID_SUBSET_START + 160) -#define RID_SUBSETSTR_HANGUL_JAMO_EXTENDED_B (RID_SUBSET_START + 161) -#define RID_SUBSETSTR_IMPERIAL_ARAMAIC (RID_SUBSET_START + 162) -#define RID_SUBSETSTR_OLD_SOUTH_ARABIAN (RID_SUBSET_START + 163) -#define RID_SUBSETSTR_AVESTAN (RID_SUBSET_START + 164) -#define RID_SUBSETSTR_INSCRIPTIONAL_PARTHIAN (RID_SUBSET_START + 165) -#define RID_SUBSETSTR_INSCRIPTIONAL_PAHLAVI (RID_SUBSET_START + 166) -#define RID_SUBSETSTR_OLD_TURKIC (RID_SUBSET_START + 167) -#define RID_SUBSETSTR_RUMI_NUMERAL_SYMBOLS (RID_SUBSET_START + 168) -#define RID_SUBSETSTR_KAITHI (RID_SUBSET_START + 169) -#define RID_SUBSETSTR_EGYPTIAN_HIEROGLYPHS (RID_SUBSET_START + 170) -#define RID_SUBSETSTR_ENCLOSED_ALPHANUMERIC_SUPPLEMENT (RID_SUBSET_START + 171) -#define RID_SUBSETSTR_ENCLOSED_IDEOGRAPHIC_SUPPLEMENT (RID_SUBSET_START + 172) -#define RID_SUBSETSTR_MANDAIC (RID_SUBSET_START + 174) -#define RID_SUBSETSTR_BATAK (RID_SUBSET_START + 175) -#define RID_SUBSETSTR_ETHIOPIC_EXTENDED_A (RID_SUBSET_START + 176) -#define RID_SUBSETSTR_BRAHMI (RID_SUBSET_START + 177) -#define RID_SUBSETSTR_BAMUM_SUPPLEMENT (RID_SUBSET_START + 178) -#define RID_SUBSETSTR_KANA_SUPPLEMENT (RID_SUBSET_START + 179) -#define RID_SUBSETSTR_PLAYING_CARDS (RID_SUBSET_START + 180) -#define RID_SUBSETSTR_MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS (RID_SUBSET_START + 181) -#define RID_SUBSETSTR_EMOTICONS (RID_SUBSET_START + 182) -#define RID_SUBSETSTR_TRANSPORT_AND_MAP_SYMBOLS (RID_SUBSET_START + 183) -#define RID_SUBSETSTR_ALCHEMICAL_SYMBOLS (RID_SUBSET_START + 184) -#define RID_SUBSETSTR_CJK_EXT_A_UNIFIED_IDGRAPH (RID_SUBSET_START + 185) -#define RID_SUBSETSTR_ARABIC_EXTENDED_A (RID_SUBSET_START + 186) -#define RID_SUBSETSTR_ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS (RID_SUBSET_START + 187) -#define RID_SUBSETSTR_CHAKMA (RID_SUBSET_START + 188) -#define RID_SUBSETSTR_MEETEI_MAYEK_EXTENSIONS (RID_SUBSET_START + 189) -#define RID_SUBSETSTR_MEROITIC_CURSIVE (RID_SUBSET_START + 190) -#define RID_SUBSETSTR_MEROITIC_HIEROGLYPHS (RID_SUBSET_START + 191) -#define RID_SUBSETSTR_MIAO (RID_SUBSET_START + 192) -#define RID_SUBSETSTR_SHARADA (RID_SUBSET_START + 193) -#define RID_SUBSETSTR_SORA_SOMPENG (RID_SUBSET_START + 194) -#define RID_SUBSETSTR_SUNDANESE_SUPPLEMENT (RID_SUBSET_START + 195) -#define RID_SUBSETSTR_TAKRI (RID_SUBSET_START + 196) -#define RID_SUBSETSTR_SINHALA (RID_SUBSET_START + 197) -#define RID_SUBSETSTR_TIBETAN (RID_SUBSET_START + 198) -#define RID_SUBSETSTR_MYANMAR (RID_SUBSET_START + 199) -#define RID_SUBSETSTR_KHMER (RID_SUBSET_START + 200) -#define RID_SUBSETSTR_OGHAM (RID_SUBSET_START + 201) -#define RID_SUBSETSTR_THAANA (RID_SUBSET_START + 202) -#define RID_SUBSETSTR_CANADIAN_ABORIGINAL (RID_SUBSET_START + 203) - -#define RID_SUBSETSTR_BRAILLE_PATTERNS (RID_SUBSET_START + 204) -#define RID_SUBSETSTR_CJK_RADICAL_SUPPL (RID_SUBSET_START + 205) - -#define RID_SUBSETSTR_TAGBANWA (RID_SUBSET_START + 206) -#define RID_SUBSETSTR_BOPOMOFO_EXTENDED (RID_SUBSET_START + 207) -#define RID_SUBSETSTR_KATAKANA_PHONETIC (RID_SUBSET_START + 208) -#define RID_SUBSETSTR_RUNIC (RID_SUBSET_START + 209) -#define RID_SUBSETSTR_SYRIAC (RID_SUBSET_START + 210) -#define RID_SUBSETSTR_ETHIOPIC (RID_SUBSET_START + 211) -#define RID_SUBSETSTR_CHEROKEE (RID_SUBSET_START + 212) -#define RID_SUBSETSTR_MONGOLIAN (RID_SUBSET_START + 213) -#define RID_SUBSETSTR_MISC_MATH_SYMS_A (RID_SUBSET_START + 214) -#define RID_SUBSETSTR_SUPPL_ARROWS_A (RID_SUBSET_START + 215) -#define RID_SUBSETSTR_SUPPL_ARROWS_B (RID_SUBSET_START + 216) -#define RID_SUBSETSTR_MISC_MATH_SYMS_B (RID_SUBSET_START + 217) -#define RID_SUBSETSTR_KANGXI_RADICALS (RID_SUBSET_START + 218) -#define RID_SUBSETSTR_IDEO_DESC_CHARS (RID_SUBSET_START + 219) -#define RID_SUBSETSTR_TAGALOG (RID_SUBSET_START + 220) -#define RID_SUBSETSTR_HANUNOO (RID_SUBSET_START + 221) -#define RID_SUBSETSTR_KANBUN (RID_SUBSET_START + 222) -#define RID_SUBSETSTR_BUHID (RID_SUBSET_START + 223) -#define RID_SUBSETSTR_BASSA_VAH (RID_SUBSET_START + 224) -#define RID_SUBSETSTR_CAUCASIAN_ALBANIAN (RID_SUBSET_START + 225) -#define RID_SUBSETSTR_COPTIC_EPACT_NUMBERS (RID_SUBSET_START + 226) -#define RID_SUBSETSTR_COMBINING_DIACRITICAL_MARKS_EXTENDED (RID_SUBSET_START + 227) -#define RID_SUBSETSTR_DUPLOYAN (RID_SUBSET_START + 228) -#define RID_SUBSETSTR_ELBASAN (RID_SUBSET_START + 229) -#define RID_SUBSETSTR_GEOMETRIC_SHAPES_EXTENDED (RID_SUBSET_START + 230) -#define RID_SUBSETSTR_GRANTHA (RID_SUBSET_START + 231) -#define RID_SUBSETSTR_KHOJKI (RID_SUBSET_START + 232) -#define RID_SUBSETSTR_KHUDAWADI (RID_SUBSET_START + 233) -#define RID_SUBSETSTR_LATIN_EXTENDED_E (RID_SUBSET_START + 234) -#define RID_SUBSETSTR_LINEAR_A (RID_SUBSET_START + 235) -#define RID_SUBSETSTR_MAHAJANI (RID_SUBSET_START + 236) -#define RID_SUBSETSTR_MANICHAEAN (RID_SUBSET_START + 237) -#define RID_SUBSETSTR_MENDE_KIKAKUI (RID_SUBSET_START + 238) -#define RID_SUBSETSTR_MODI (RID_SUBSET_START + 239) -#define RID_SUBSETSTR_MRO (RID_SUBSET_START + 240) -#define RID_SUBSETSTR_MYANMAR_EXTENDED_B (RID_SUBSET_START + 241) -#define RID_SUBSETSTR_NABATAEAN (RID_SUBSET_START + 242) -#define RID_SUBSETSTR_OLD_NORTH_ARABIAN (RID_SUBSET_START + 243) -#define RID_SUBSETSTR_OLD_PERMIC (RID_SUBSET_START + 244) -#define RID_SUBSETSTR_ORNAMENTAL_DINGBATS (RID_SUBSET_START + 245) -#define RID_SUBSETSTR_PAHAWH_HMONG (RID_SUBSET_START + 246) -#define RID_SUBSETSTR_PALMYRENE (RID_SUBSET_START + 247) -#define RID_SUBSETSTR_PAU_CIN_HAU (RID_SUBSET_START + 248) -#define RID_SUBSETSTR_PSALTER_PAHLAVI (RID_SUBSET_START + 249) -#define RID_SUBSETSTR_SHORTHAND_FORMAT_CONTROLS (RID_SUBSET_START + 250) -#define RID_SUBSETSTR_SIDDHAM (RID_SUBSET_START + 251) -#define RID_SUBSETSTR_SINHALA_ARCHAIC_NUMBERS (RID_SUBSET_START + 252) -#define RID_SUBSETSTR_SUPPLEMENTAL_ARROWS_C (RID_SUBSET_START + 253) -#define RID_SUBSETSTR_TIRHUTA (RID_SUBSET_START + 254) -#define RID_SUBSETSTR_WARANG_CITI (RID_SUBSET_START + 255) -#define RID_SUBSETSTR_AHOM (RID_SUBSET_START + 256) -#define RID_SUBSETSTR_ANATOLIAN_HIEROGLYPHS (RID_SUBSET_START + 257) -#define RID_SUBSETSTR_CHEROKEE_SUPPLEMENT (RID_SUBSET_START + 258) -#define RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E (RID_SUBSET_START + 259) -#define RID_SUBSETSTR_EARLY_DYNASTIC_CUNEIFORM (RID_SUBSET_START + 260) -#define RID_SUBSETSTR_HATRAN (RID_SUBSET_START + 261) -#define RID_SUBSETSTR_MULTANI (RID_SUBSET_START + 262) -#define RID_SUBSETSTR_OLD_HUNGARIAN (RID_SUBSET_START + 263) -#define RID_SUBSETSTR_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS (RID_SUBSET_START + 264) -#define RID_SUBSETSTR_SUTTON_SIGNWRITING (RID_SUBSET_START + 265) -#define RID_SUBSETSTR_ADLAM (RID_SUBSET_START + 266) -#define RID_SUBSETSTR_BHAIKSUKI (RID_SUBSET_START + 267) -#define RID_SUBSETSTR_CYRILLIC_EXTENDED_C (RID_SUBSET_START + 268) -#define RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT (RID_SUBSET_START + 269) -#define RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION (RID_SUBSET_START + 270) -#define RID_SUBSETSTR_MARCHEN (RID_SUBSET_START + 271) -#define RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT (RID_SUBSET_START + 272) -#define RID_SUBSETSTR_NEWA (RID_SUBSET_START + 273) -#define RID_SUBSETSTR_OSAGE (RID_SUBSET_START + 274) -#define RID_SUBSETSTR_TANGUT (RID_SUBSET_START + 275) -#define RID_SUBSETSTR_TANGUT_COMPONENTS (RID_SUBSET_START + 276) - -// RID_SUBSET_END (RID_SUBSET_START + 299) - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/ucsubset.hxx b/include/svx/ucsubset.hxx index f71a454fa469..570913f3bd18 100644 --- a/include/svx/ucsubset.hxx +++ b/include/svx/ucsubset.hxx @@ -22,7 +22,6 @@ #include <svx/svxdllapi.h> -#include <svx/ucsubset.hrc> #include <vcl/metric.hxx> #include <list> diff --git a/include/vcl/errcode.hxx b/include/vcl/errcode.hxx index 05e88a2d94dc..2563c12ab957 100644 --- a/include/vcl/errcode.hxx +++ b/include/vcl/errcode.hxx @@ -20,13 +20,10 @@ #ifndef INCLUDED_VCL_ERRCODE_HXX #define INCLUDED_VCL_ERRCODE_HXX -#ifndef __RSC #include <rtl/ustring.hxx> #include <tools/solar.h> #include <tools/toolsdllapi.h> #include <ostream> -#endif - /* @@ -62,7 +59,6 @@ Warning || || | #define ERRCODE_DYNAMIC_MASK (31UL << ERRCODE_DYNAMIC_SHIFT) /** we get included in contexts that don't have access to config_typesizes.h or C++11 */ -#ifndef __RSC class SAL_WARN_UNUSED ErrCode final { @@ -140,10 +136,6 @@ inline std::ostream& operator<<(std::ostream& os, const ErrCode& err) os << sal_uInt32(err); return os; } -#else -#define ErrCode(X) (X) -#endif - #define ERRCODE_AREA_IO (0 << ERRCODE_AREA_SHIFT) #define ERRCODE_AREA_SV (1 << ERRCODE_AREA_SHIFT) #define ERRCODE_AREA_SFX (2 << ERRCODE_AREA_SHIFT) diff --git a/include/vcl/errinf.hxx b/include/vcl/errinf.hxx index 996afd23f8f1..428a46eb72e4 100644 --- a/include/vcl/errinf.hxx +++ b/include/vcl/errinf.hxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __RSC - #ifndef INCLUDED_VCL_ERRINF_HXX #define INCLUDED_VCL_ERRINF_HXX @@ -221,6 +219,5 @@ private: }; #endif -#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ 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> 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> diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx index 636fc923fdc6..9de5689b8bdc 100644 --- a/scripting/source/dlgprov/dlgevtatt.cxx +++ b/scripting/source/dlgprov/dlgevtatt.cxx @@ -21,7 +21,6 @@ #include "dlgprov.hxx" -#include <sfx2/sfx.hrc> #include <sfx2/strings.hrc> #include <sfx2/app.hxx> #include <sfx2/sfxresid.hxx> diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc index 58f0d0bf7afe..81f83b2a8297 100644 --- a/sd/inc/app.hrc +++ b/sd/inc/app.hrc @@ -20,7 +20,7 @@ #ifndef INCLUDED_SD_INC_APP_HRC #define INCLUDED_SD_INC_APP_HRC -#include <sfx2/sfx.hrc> +#include <svl/solar.hrc> // Helper IDs for templates #define HID_STANDARD_STYLESHEET_NAME (HID_SD_START + 70) diff --git a/sd/inc/errhdl.hrc b/sd/inc/errhdl.hrc index 20fe07e02f34..bcaa2a0a5328 100644 --- a/sd/inc/errhdl.hrc +++ b/sd/inc/errhdl.hrc @@ -22,7 +22,6 @@ #define NC_(Context, String) (Context "\004" u8##String) -#include "glob.hrc" #include "sderror.hxx" #define ERR_CODE( class, err ) ErrCode(class | (sal_uInt32(err) - ERROR_SD_BASE)) diff --git a/sd/inc/family.hrc b/sd/inc/family.hrc index 6e3d7114a8b4..b89c241af0a6 100644 --- a/sd/inc/family.hrc +++ b/sd/inc/family.hrc @@ -20,7 +20,6 @@ #ifndef INCLUDED_SD_INC_FAMILY_HRC #define INCLUDED_SD_INC_FAMILY_HRC -#include <sfx2/sfx.hrc> #include <svl/style.hxx> #define NC_(Context, String) (Context "\004" u8##String) diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc deleted file mode 100644 index 1ad0a198134d..000000000000 --- a/sd/inc/glob.hrc +++ /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_SD_INC_GLOB_HRC -#define INCLUDED_SD_INC_GLOB_HRC - -#include <sfx2/sfx.hrc> - -#define RID_GLOB_START RID_APP_START+1000 - -#define RID_CUSTOMANIMATION_START RID_GLOB_START+120 -// RID_CUSTOMANIMATION_END RID_GLOB_START+199 - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h index daedcf1634db..26bed2967ffd 100644 --- a/sd/inc/helpids.h +++ b/sd/inc/helpids.h @@ -16,6 +16,10 @@ * 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_SD_INC_HELPIDS_H +#define INCLUDED_SD_INC_HELPIDS_H + #include <svx/svxcommands.h> #include "sdcommands.h" @@ -76,4 +80,6 @@ #define HID_MN_SUB_CONVERT "SD_HID_MN_SUB_CONVERT" #define HID_MN_SUB_MIRROR "SD_HID_MN_SUB_MIRROR" +#endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx index f39b7d369332..9582ea377530 100644 --- a/sd/inc/sdabstdlg.hxx +++ b/sd/inc/sdabstdlg.hxx @@ -193,7 +193,7 @@ public: virtual VclPtr<AbstractSdStartPresDlg> CreateSdStartPresentationDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList ) = 0; virtual VclPtr<VclAbstractDialog> CreateRemoteDialog( vcl::Window* pWindow ) = 0; - virtual VclPtr<SfxAbstractTabDialog> CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, sal_uInt16 nDlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) = 0; + virtual VclPtr<SfxAbstractTabDialog> CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, bool bBackgroundDlg, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) = 0; virtual VclPtr<AbstractSdPresLayoutDlg> CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, const SfxItemSet& rInAttrs) = 0; virtual VclPtr<SfxAbstractTabDialog> CreateSdTabTemplateDlg(vcl::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView) = 0; virtual VclPtr<SfxAbstractDialog> CreatSdActionDialog(vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView) = 0; diff --git a/sd/inc/sdattr.hrc b/sd/inc/sdattr.hrc index 791c03121d2e..dc1131a43f40 100644 --- a/sd/inc/sdattr.hrc +++ b/sd/inc/sdattr.hrc @@ -20,7 +20,7 @@ #ifndef INCLUDED_SD_INC_SDATTR_HRC #define INCLUDED_SD_INC_SDATTR_HRC -#include <sfx2/sfx.hrc> +#include <svl/solar.hrc> // Layer attributes #define ATTR_LAYER_START SID_SD_START + 1234 diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx index efa78ac6957e..adbcd403646a 100644 --- a/sd/inc/sdattr.hxx +++ b/sd/inc/sdattr.hxx @@ -23,7 +23,6 @@ #include <svl/intitem.hxx> #include <svl/eitem.hxx> #include <svl/stritem.hxx> -#include <sfx2/sfx.hrc> #include "sdattr.hrc" #include "glob.hxx" diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx index 3901d7e2ce86..685ccf556e30 100644 --- a/sd/qa/unit/dialogs-test.cxx +++ b/sd/qa/unit/dialogs-test.cxx @@ -47,7 +47,6 @@ #include "strings.hrc" #include "sdresid.hxx" #include "sdattr.hxx" -#include "prltempl.hrc" #include <comphelper/servicehelper.hxx> #include <comphelper/processfactory.hxx> @@ -475,7 +474,7 @@ VclPtr<VclAbstractDialog> SdDialogsTest::createDialogByID(sal_uInt32 nID) pRetval = getSdAbstractDialogFactory()->CreateSdPresLayoutTemplateDlg( getDocShell(), Application::GetDefDialogParent(), - TAB_PRES_LAYOUT_TEMPLATE, + false, *pStyleSheet, PO_TITLE, pStyleSheetPool); diff --git a/sd/sdi/sdslots.hrc b/sd/sdi/sdslots.hrc index 0830975613e1..969e8a64c7ec 100644 --- a/sd/sdi/sdslots.hrc +++ b/sd/sdi/sdslots.hrc @@ -16,10 +16,9 @@ * 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 <editeng/editids.hrc> -#include <editeng/memberids.hrc> +#include <editeng/memberids.h> #include <svx/svxids.hrc> #include <app.hrc> #include <sdattr.hrc> diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 62d29944df2c..216c8a871343 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -64,7 +64,6 @@ #include "DrawDocShell.hxx" #include "FrameView.hxx" -#include "cfgids.hxx" #include "strings.hrc" #include "PageListWatcher.hxx" diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index ff6a01e2f406..d82d11b5fc97 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -61,7 +61,6 @@ #include "ViewShell.hxx" #include "View.hxx" #include "ViewShellBase.hxx" -#include "cfgids.hxx" #include "strings.hrc" #include "strings.hxx" diff --git a/sd/source/core/typemap.cxx b/sd/source/core/typemap.cxx index 6a91ddd3c31d..c655aa16bae3 100644 --- a/sd/source/core/typemap.cxx +++ b/sd/source/core/typemap.cxx @@ -60,7 +60,7 @@ #include <editeng/lineitem.hxx> #include "sdattr.hxx" #include <svx/zoomslideritem.hxx> -#include <editeng/memberids.hrc> +#include <editeng/memberids.h> #include <svx/xftstit.hxx> #include <svx/xlnwtit.hxx> #include <svx/xlineit0.hxx> diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index aca85dba64d0..765b9e3a9f4c 100644 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -32,6 +32,7 @@ #include <vcl/layout.hxx> #include <vcl/metaact.hxx> #include <vcl/virdev.hxx> +#include <sfx2/sfxsids.hrc> #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/frame.hxx> diff --git a/sd/source/filter/html/sdhtmlfilter.cxx b/sd/source/filter/html/sdhtmlfilter.cxx index 67782dbae73d..ce21ecafcdce 100644 --- a/sd/source/filter/html/sdhtmlfilter.cxx +++ b/sd/source/filter/html/sdhtmlfilter.cxx @@ -26,6 +26,7 @@ #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/frame.hxx> +#include <sfx2/sfxsids.hrc> #include <svx/svdograf.hxx> #include <svx/svdpagv.hxx> #include <svx/xoutbmp.hxx> diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index 95145459fb67..8bdf2709e922 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -23,13 +23,11 @@ #include <svx/svdmodel.hxx> #include <svx/svxids.hrc> #include <sfx2/app.hxx> -#include <sfx2/sfx.hrc> #include <tools/helpers.hxx> #include <unotools/syslocale.hxx> #include "sdmod.hxx" #include "optsitem.hxx" -#include "cfgids.hxx" #include "FrameView.hxx" #include <sdattr.hrc> @@ -76,10 +74,10 @@ bool SdOptionsItem::PutProperties( const Sequence< OUString >& rNames, const Seq return ConfigItem::PutProperties( rNames, rValues ); } -SdOptionsGeneric::SdOptionsGeneric(sal_uInt16 nConfigId, const OUString& rSubTree) +SdOptionsGeneric::SdOptionsGeneric(bool bImpress, const OUString& rSubTree) : maSubTree(rSubTree) , mpCfgItem( nullptr) - , mnConfigId(nConfigId) + , mbImpress(bImpress) , mbInit(rSubTree.isEmpty()) , mbEnableModify(false) { @@ -94,7 +92,7 @@ SdOptionsGeneric& SdOptionsGeneric::operator=(SdOptionsGeneric const & rSource) { maSubTree = rSource.maSubTree; mpCfgItem.reset(rSource.mpCfgItem ? new SdOptionsItem(*rSource.mpCfgItem) : nullptr ); - mnConfigId = rSource.mnConfigId; + mbImpress = rSource.mbImpress; mbInit = rSource.mbInit; mbEnableModify = rSource.mbEnableModify; return *this; @@ -181,11 +179,11 @@ bool SdOptionsGeneric::isMetricSystem() |* \************************************************************************/ -SdOptionsLayout::SdOptionsLayout( sal_uInt16 nConfigId, bool bUseConfig ) : - SdOptionsGeneric( nConfigId, bUseConfig ? - ( ( SDCFG_DRAW == nConfigId ) ? - OUString( "Office.Draw/Layout" ) : - OUString( "Office.Impress/Layout" ) ) : +SdOptionsLayout::SdOptionsLayout(bool bImpress, bool bUseConfig) : + SdOptionsGeneric( bImpress, bUseConfig ? + ( bImpress ? + OUString( "Office.Impress/Layout" ) : + OUString( "Office.Draw/Layout" ) ) : OUString() ), bRuler( true ), bMoveOutline( true ), @@ -340,11 +338,11 @@ void SdOptionsLayoutItem::SetOptions( SdOptions* pOpts ) const |* \************************************************************************/ -SdOptionsContents::SdOptionsContents( sal_uInt16 nConfigId, bool bUseConfig ) : - SdOptionsGeneric( nConfigId, bUseConfig ? - ( ( SDCFG_DRAW == nConfigId ) ? - OUString( "Office.Draw/Content" ) : - OUString( "Office.Impress/Content" ) ) : +SdOptionsContents::SdOptionsContents(bool bImpress, bool bUseConfig) : + SdOptionsGeneric( bImpress, bUseConfig ? + ( bImpress ? + OUString( "Office.Impress/Content" ) : + OUString( "Office.Draw/Content" ) ) : OUString() ) { EnableModify( true ); @@ -414,11 +412,11 @@ bool SdOptionsContentsItem::operator==( const SfxPoolItem& rAttr ) const |* \************************************************************************/ -SdOptionsMisc::SdOptionsMisc( sal_uInt16 nConfigId, bool bUseConfig ) : - SdOptionsGeneric( nConfigId, bUseConfig ? - ( ( SDCFG_DRAW == nConfigId ) ? - OUString( "Office.Draw/Misc" ) : - OUString( "Office.Impress/Misc" ) ) : +SdOptionsMisc::SdOptionsMisc( bool bImpress, bool bUseConfig ) : + SdOptionsGeneric( bImpress, bUseConfig ? + ( bImpress ? + OUString( "Office.Impress/Misc" ) : + OUString( "Office.Draw/Misc" ) ) : OUString() ), nDefaultObjectSizeWidth(8000), nDefaultObjectSizeHeight(5000), @@ -426,7 +424,7 @@ SdOptionsMisc::SdOptionsMisc( sal_uInt16 nConfigId, bool bUseConfig ) : bMarkedHitMovesAlways( true ), bMoveOnlyDragging( false ), bCrookNoContortion( false ), - bQuickEdit( GetConfigId() != SDCFG_DRAW ), + bQuickEdit( IsImpress() ), bMasterPageCache( true ), bDragWithCopy( false ), bPickThrough( true ), @@ -527,7 +525,7 @@ void SdOptionsMisc::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) "TabBarVisible" }; - rCount = ( ( GetConfigId() == SDCFG_IMPRESS ) ? SAL_N_ELEMENTS(aPropNames) : 14 ); + rCount = ( IsImpress() ? SAL_N_ELEMENTS(aPropNames) : 14 ); ppNames = aPropNames; } @@ -550,7 +548,7 @@ bool SdOptionsMisc::ReadData( const Any* pValues ) SetShowComments( *o3tl::doAccess<bool>(pValues[ 13 ]) ); // just for Impress - if( GetConfigId() == SDCFG_IMPRESS ) + if (IsImpress()) { if( pValues[14].hasValue() ) SetStartWithTemplate( *o3tl::doAccess<bool>(pValues[ 14 ]) ); @@ -613,7 +611,7 @@ bool SdOptionsMisc::WriteData( Any* pValues ) const pValues[ 13 ] <<= IsShowComments(); // just for Impress - if( GetConfigId() == SDCFG_IMPRESS ) + if (IsImpress()) { pValues[ 14 ] <<= IsStartWithTemplate(); pValues[ 15 ] <<= IsSummationOfParagraphs(); @@ -760,11 +758,11 @@ void SdOptionsMiscItem::SetOptions( SdOptions* pOpts ) const |* \************************************************************************/ -SdOptionsSnap::SdOptionsSnap( sal_uInt16 nConfigId, bool bUseConfig ) : - SdOptionsGeneric( nConfigId, bUseConfig ? - ( ( SDCFG_DRAW == nConfigId ) ? - OUString( "Office.Draw/Snap" ) : - OUString( "Office.Impress/Snap" ) ) : +SdOptionsSnap::SdOptionsSnap( bool bImpress, bool bUseConfig ) : + SdOptionsGeneric( bImpress, bUseConfig ? + ( bImpress ? + OUString( "Office.Impress/Snap" ) : + OUString( "Office.Draw/Snap" ) ) : OUString() ), bSnapHelplines( true ), bSnapBorder( true ), @@ -925,10 +923,10 @@ void SdOptionsSnapItem::SetOptions( SdOptions* pOpts ) const |* \************************************************************************/ -SdOptionsZoom::SdOptionsZoom( sal_uInt16 nConfigId ) : - SdOptionsGeneric( nConfigId, ( SDCFG_DRAW == nConfigId ) ? - OUString( "Office.Draw/Zoom" ) : - OUString() ), +SdOptionsZoom::SdOptionsZoom( bool bImpress ) : + SdOptionsGeneric( bImpress, bImpress ? + OUString() : + OUString("Office.Draw/Zoom") ), nX( 1 ), nY( 1 ) @@ -944,7 +942,7 @@ void SdOptionsZoom::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) "ScaleY" }; - rCount = ( GetConfigId() == SDCFG_DRAW ) ? SAL_N_ELEMENTS(aPropNames) : 0; + rCount = !IsImpress() ? SAL_N_ELEMENTS(aPropNames) : 0; ppNames = aPropNames; } @@ -978,11 +976,11 @@ bool SdOptionsZoom::WriteData( Any* pValues ) const |* \************************************************************************/ -SdOptionsGrid::SdOptionsGrid( sal_uInt16 nConfigId ) : - SdOptionsGeneric( nConfigId, - ( SDCFG_DRAW == nConfigId ) ? - OUString( "Office.Draw/Grid" ) : - OUString( "Office.Impress/Grid" ) +SdOptionsGrid::SdOptionsGrid(bool bImpress) : + SdOptionsGeneric( bImpress, + bImpress ? + OUString( "Office.Impress/Grid" ) : + OUString( "Office.Draw/Grid" ) ) { EnableModify( false ); @@ -1135,11 +1133,11 @@ void SdOptionsGridItem::SetOptions( SdOptions* pOpts ) const |* \************************************************************************/ -SdOptionsPrint::SdOptionsPrint( sal_uInt16 nConfigId, bool bUseConfig ) : - SdOptionsGeneric( nConfigId, bUseConfig ? - ( ( SDCFG_DRAW == nConfigId ) ? - OUString( "Office.Draw/Print" ) : - OUString( "Office.Impress/Print" ) ) : +SdOptionsPrint::SdOptionsPrint( bool bImpress, bool bUseConfig ) : + SdOptionsGeneric( bImpress, bUseConfig ? + ( bImpress ? + OUString( "Office.Impress/Print" ) : + OUString( "Office.Draw/Print" ) ) : OUString() ), bDraw( true ), bNotes( false ), @@ -1193,7 +1191,7 @@ bool SdOptionsPrint::operator==( const SdOptionsPrint& rOpt ) const void SdOptionsPrint::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const { - if( GetConfigId() == SDCFG_IMPRESS ) + if (IsImpress()) { static const char* aImpressPropNames[] = { @@ -1264,7 +1262,7 @@ bool SdOptionsPrint::ReadData( const Any* pValues ) if( pValues[11].hasValue() ) SetDraw( *o3tl::doAccess<bool>(pValues[ 11 ]) ); // just for impress - if( GetConfigId() == SDCFG_IMPRESS ) + if (IsImpress()) { if( pValues[12].hasValue() ) SetNotes( *o3tl::doAccess<bool>(pValues[ 12 ]) ); if( pValues[13].hasValue() ) SetHandout( *o3tl::doAccess<bool>(pValues[ 13 ]) ); @@ -1292,7 +1290,7 @@ bool SdOptionsPrint::WriteData( Any* pValues ) const pValues[ 11 ] <<= IsDraw(); // just for impress - if( GetConfigId() == SDCFG_IMPRESS ) + if (IsImpress()) { pValues[ 12 ] <<= IsNotes(); pValues[ 13 ] <<= IsHandout(); @@ -1387,14 +1385,14 @@ void SdOptionsPrintItem::SetOptions( SdOptions* pOpts ) const |* \************************************************************************/ -SdOptions::SdOptions( sal_uInt16 nConfigId ) : - SdOptionsLayout( nConfigId, true ), - SdOptionsContents( nConfigId, true ), - SdOptionsMisc( nConfigId, true ), - SdOptionsSnap( nConfigId, true ), - SdOptionsZoom( nConfigId ), - SdOptionsGrid( nConfigId ), - SdOptionsPrint( nConfigId, true ) +SdOptions::SdOptions(bool bImpress) : + SdOptionsLayout( bImpress, true ), + SdOptionsContents( bImpress, true ), + SdOptionsMisc( bImpress, true ), + SdOptionsSnap( bImpress, true ), + SdOptionsZoom( bImpress ), + SdOptionsGrid( bImpress ), + SdOptionsPrint( bImpress, true ) { } diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx index f1f59ad48f00..60b7a8b4748c 100644 --- a/sd/source/ui/app/sddll.cxx +++ b/sd/source/ui/app/sddll.cxx @@ -52,7 +52,6 @@ #include "PaneChildWindows.hxx" #include "sdresid.hxx" #include "sdobjfac.hxx" -#include "cfgids.hxx" #include "SpellDialogChildWindow.hxx" #include "SlideSorterViewShell.hxx" #include "SlideSorterViewShellBase.hxx" diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index 8719d29aa4e2..1f907bb92325 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -52,10 +52,7 @@ #include "app.hrc" #include "strings.hrc" #include "strings.hrc" - #include "errhdl.hrc" -#include "cfgids.hxx" - #define SdModule #include "sdslots.hxx" @@ -64,7 +61,7 @@ SFX_IMPL_INTERFACE(SdModule, SfxModule) void SdModule::InitInterface_Impl() { - GetStaticInterface()->RegisterStatusBar(RID_DRAW_STATUSBAR); + GetStaticInterface()->RegisterStatusBar(StatusBarId::DrawStatusBar); } // Ctor @@ -136,14 +133,14 @@ SdOptions* SdModule::GetSdOptions(DocumentType eDocType) if (eDocType == DocumentType::Draw) { if (!pDrawOptions) - pDrawOptions = new SdOptions( SDCFG_DRAW ); + pDrawOptions = new SdOptions(false); pOptions = pDrawOptions; } else if (eDocType == DocumentType::Impress) { if (!pImpressOptions) - pImpressOptions = new SdOptions( SDCFG_IMPRESS ); + pImpressOptions = new SdOptions(true); pOptions = pImpressOptions; } diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index a288cd7a117b..681c65880edd 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -38,7 +38,6 @@ #include "strings.hrc" #include "sdresid.hxx" #include "prltempl.hxx" -#include "prltempl.hrc" #include "bulmaper.hxx" #include <svl/intitem.hxx> #include <svx/svxgrahicitem.hxx> @@ -51,7 +50,7 @@ */ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, - sal_uInt16 nDlgId, + bool bBackground, SfxStyleSheetBase& rStyleBase, PresentationObjects _ePO, SfxStyleSheetBasePool* pSSPool ) : @@ -191,7 +190,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, if( !aCJKOptions.IsAsianTypographyEnabled() ) RemoveTabPage( "RID_SVXPAGE_PARA_ASIAN" ); - if (nDlgId == TAB_PRES_LAYOUT_TEMPLATE_BACKGROUND) + if (bBackground) { RemoveTabPage( "RID_SVXPAGE_LINE"); diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index 853d6cbcae7c..fd6cc5276f98 100644 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -381,9 +381,9 @@ VclPtr<VclAbstractDialog> SdAbstractDialogFactory_Impl::CreateRemoteDialog( vcl: return VclPtr<SdVclAbstractDialog_Impl>::Create( VclPtr<::sd::RemoteDialog>::Create( pParent ) ); } -VclPtr<SfxAbstractTabDialog> SdAbstractDialogFactory_Impl::CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, sal_uInt16 nDlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) +VclPtr<SfxAbstractTabDialog> SdAbstractDialogFactory_Impl::CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, bool bBackgroundDlg, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) { - return VclPtr<SdPresLayoutTemplateDlg_Impl>::Create( VclPtr<SdPresLayoutTemplateDlg>::Create( pDocSh, pParent, nDlgId, rStyleBase, ePO, pSSPool ) ); + return VclPtr<SdPresLayoutTemplateDlg_Impl>::Create( VclPtr<SdPresLayoutTemplateDlg>::Create( pDocSh, pParent, bBackgroundDlg, rStyleBase, ePO, pSSPool ) ); } VclPtr<AbstractSdPresLayoutDlg> SdAbstractDialogFactory_Impl::CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, const SfxItemSet& rInAttrs) diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx index 4c1c9332b91c..e778e0bef616 100644 --- a/sd/source/ui/dlg/sddlgfact.hxx +++ b/sd/source/ui/dlg/sddlgfact.hxx @@ -228,7 +228,7 @@ public: virtual VclPtr<AbstractSdStartPresDlg> CreateSdStartPresentationDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList ) override; virtual VclPtr<VclAbstractDialog> CreateRemoteDialog( vcl::Window* pWindow ) override; // ad for RemoteDialog - virtual VclPtr<SfxAbstractTabDialog> CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, sal_uInt16 nDlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) override; + virtual VclPtr<SfxAbstractTabDialog> CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, bool bBackgroundDlg, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) override; virtual VclPtr<AbstractSdPresLayoutDlg> CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, const SfxItemSet& rInAttrs) override; virtual VclPtr<SfxAbstractTabDialog> CreateSdTabTemplateDlg(vcl::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) override; virtual VclPtr<SfxAbstractDialog> CreatSdActionDialog(vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView) override; diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx index 86b104f84c54..0697c0ad1322 100644 --- a/sd/source/ui/func/fuprobjs.cxx +++ b/sd/source/ui/func/fuprobjs.cxx @@ -28,7 +28,6 @@ #include "strings.hrc" #include "strings.hrc" -#include "prltempl.hrc" #include "strings.hxx" #include "sdresid.hxx" @@ -141,7 +140,7 @@ void FuPresentationObjects::DoExecute( SfxRequest& ) if (pFact) { ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateSdPresLayoutTemplateDlg( mpDocSh, mpViewShell->GetActiveWindow(), - TAB_PRES_LAYOUT_TEMPLATE, rStyleSheet, ePO, pStyleSheetPool )); + false, rStyleSheet, ePO, pStyleSheetPool )); if( pDlg->Execute() == RET_OK ) { const SfxItemSet* pOutSet = pDlg->GetOutputItemSet(); diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx index 1ec074ebfd7d..2cb952c5be8a 100644 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -60,7 +60,6 @@ #include "strings.hrc" #include "prlayout.hxx" -#include "prltempl.hrc" #include <svx/xfillit.hxx> #include "sdresid.hxx" #include "OutlineViewShell.hxx" @@ -311,40 +310,34 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) else if (eFamily == SD_STYLE_FAMILY_PSEUDO) { OUString aName(pStyleSheet->GetName()); - sal_uInt16 nDlgId = 0; + bool bBackground = false; if (aName == SdResId(STR_PSEUDOSHEET_TITLE)) { - nDlgId = TAB_PRES_LAYOUT_TEMPLATE; ePO = PO_TITLE; } else if (aName == SdResId(STR_PSEUDOSHEET_SUBTITLE)) { - nDlgId = TAB_PRES_LAYOUT_TEMPLATE; ePO = PO_SUBTITLE; } else if (aName == SdResId(STR_PSEUDOSHEET_BACKGROUND)) { - nDlgId = TAB_PRES_LAYOUT_TEMPLATE_BACKGROUND; + bBackground = true; ePO = PO_BACKGROUND; } else if (aName == SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS)) { - nDlgId = TAB_PRES_LAYOUT_TEMPLATE; ePO = PO_BACKGROUNDOBJECTS; } else if (aName == SdResId(STR_PSEUDOSHEET_NOTES)) { - nDlgId = TAB_PRES_LAYOUT_TEMPLATE; ePO = PO_NOTES; } else if(aName.indexOf(SdResId(STR_PSEUDOSHEET_OUTLINE)) != -1) { - nDlgId = TAB_PRES_LAYOUT_TEMPLATE; - OUString aOutlineStr(SdResId(STR_PSEUDOSHEET_OUTLINE)); // determine number, mind the blank between name and number OUString aNumStr(aName.copy(aOutlineStr.getLength() + 1)); @@ -370,7 +363,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) if( !bOldDocInOtherLanguage ) { - pPresDlg.disposeAndReset(pFact ? pFact->CreateSdPresLayoutTemplateDlg( mpDocSh, mpViewShell->GetActiveWindow(), nDlgId, *pStyleSheet, ePO, pSSPool ) : nullptr); + pPresDlg.disposeAndReset(pFact ? pFact->CreateSdPresLayoutTemplateDlg( mpDocSh, mpViewShell->GetActiveWindow(), bBackground, *pStyleSheet, ePO, pSSPool ) : nullptr); } } else if (eFamily == SD_STYLE_FAMILY_CELL) diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index e736bb1982d9..2d0cddea6b32 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -28,7 +28,6 @@ #include <svtools/transfer.hxx> #include "glob.hxx" #include "pres.hxx" -#include "cfgids.hxx" #include "View.hxx" #include "sddllapi.h" diff --git a/sd/source/ui/inc/cfgids.hxx b/sd/source/ui/inc/cfgids.hxx deleted file mode 100644 index 44ccb06b75e7..000000000000 --- a/sd/source/ui/inc/cfgids.hxx +++ /dev/null @@ -1,34 +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_SD_SOURCE_UI_INC_CFGIDS_HXX -#define INCLUDED_SD_SOURCE_UI_INC_CFGIDS_HXX - -#include <sfx2/sfx.hrc> - -// Item IDs for config items -#define SDCFG_IMPRESS (SFX_ITEMTYPE_SD_BEGIN + 1) -#define SDCFG_DRAW (SFX_ITEMTYPE_SD_BEGIN + 3) - -// Acceleratoren, Menus, ... -#define RID_DRAW_STATUSBAR (SFX_ITEMTYPE_SD_BEGIN + 7) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index 5ff8e4cf7e81..c748a1555520 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -68,7 +68,7 @@ private: OUString maSubTree; std::unique_ptr<SdOptionsItem> mpCfgItem; - sal_uInt16 mnConfigId; + bool mbImpress; bool mbInit : 1; bool mbEnableModify : 1; @@ -88,13 +88,13 @@ protected: public: - SdOptionsGeneric( sal_uInt16 nConfigId, const OUString& rSubTree ); - SdOptionsGeneric( SdOptionsGeneric const & ); + SdOptionsGeneric(bool bImpress, const OUString& rSubTree); + SdOptionsGeneric(SdOptionsGeneric const &); virtual ~SdOptionsGeneric(); SdOptionsGeneric& operator=( SdOptionsGeneric const & ); - sal_uInt16 GetConfigId() const { return mnConfigId; } + bool IsImpress() const { return mbImpress; } void EnableModify( bool bModify ) { mbEnableModify = bModify; } @@ -122,7 +122,7 @@ protected: virtual bool WriteData( css::uno::Any* pValues ) const override; public: - SdOptionsLayout( sal_uInt16 nConfigId, bool bUseConfig ); + SdOptionsLayout(bool bImpress, bool bUseConfig); bool operator==( const SdOptionsLayout& rOpt ) const; @@ -171,7 +171,7 @@ protected: public: - SdOptionsContents( sal_uInt16 nConfigId, bool bUseConfig ); + SdOptionsContents(bool bImpress, bool bUseConfig); bool operator==( const SdOptionsContents& rOpt ) const; }; @@ -242,7 +242,7 @@ protected: public: - SdOptionsMisc( sal_uInt16 nConfigId, bool bUseConfig ); + SdOptionsMisc(bool bImpress, bool bUseConfig); bool operator==( const SdOptionsMisc& rOpt ) const; @@ -362,7 +362,7 @@ protected: public: - SdOptionsSnap( sal_uInt16 nConfigId, bool bUseConfig ); + SdOptionsSnap(bool bImpress, bool bUseConfig); bool operator==( const SdOptionsSnap& rOpt ) const; @@ -421,7 +421,7 @@ protected: public: - explicit SdOptionsZoom(sal_uInt16 nConfigId); + explicit SdOptionsZoom(bool bImpress); void GetScale( sal_Int32& rX, sal_Int32& rY ) const { Init(); rX = nX; rY = nY; } void SetScale( sal_Int32 nInX, sal_Int32 nInY ) { if( nX != nInX || nY != nInY ) { OptionsChanged(); nX = nInX; nY = nInY; } } @@ -437,7 +437,7 @@ protected: public: - explicit SdOptionsGrid(sal_uInt16 nConfigId); + explicit SdOptionsGrid(bool bImpress); virtual ~SdOptionsGrid() override; void SetDefaults(); @@ -508,7 +508,7 @@ protected: public: - SdOptionsPrint( sal_uInt16 nConfigId, bool bUseConfig ); + SdOptionsPrint(bool bImpress, bool bUseConfig); bool operator==( const SdOptionsPrint& rOpt ) const; @@ -582,7 +582,7 @@ class SdOptions : public SdOptionsLayout, public SdOptionsContents, { public: - explicit SdOptions( sal_uInt16 nConfigId ); + explicit SdOptions(bool bImpress); virtual ~SdOptions() override; void StoreConfig(); diff --git a/sd/source/ui/inc/prltempl.hrc b/sd/source/ui/inc/prltempl.hrc deleted file mode 100644 index f5795ab35368..000000000000 --- a/sd/source/ui/inc/prltempl.hrc +++ /dev/null @@ -1,24 +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 . - */ -#include <sfx2/sfx.hrc> -/* #define TAB_PRES_LAYOUT_TEMPLATE RID_APP_START+??? */ -#define TAB_PRES_LAYOUT_TEMPLATE 844 -#define TAB_PRES_LAYOUT_TEMPLATE_BACKGROUND 846 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/prltempl.hxx b/sd/source/ui/inc/prltempl.hxx index 1d86ccaa00aa..e2bf3747c07d 100644 --- a/sd/source/ui/inc/prltempl.hxx +++ b/sd/source/ui/inc/prltempl.hxx @@ -69,7 +69,7 @@ private: using SfxTabDialog::GetOutputItemSet; public: - SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, sal_uInt16 nDlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ); + SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, bool bBackground, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ); virtual ~SdPresLayoutTemplateDlg() override; virtual void dispose() override; diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 7c7f2b911d76..69f5484cd805 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -37,6 +37,7 @@ #include <svtools/unoimap.hxx> #include <svtools/unoevent.hxx> #include <sfx2/bindings.hxx> +#include <sfx2/event.hxx> #include <sfx2/sfxsids.hrc> #include <comphelper/extract.hxx> #include <cppuhelper/implbase.hxx> diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index dd57a075214c..c0994c63fa4f 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -52,7 +52,6 @@ #include "Window.hxx" #include "ViewShellBase.hxx" #include "FormShellManager.hxx" -#include "cfgids.hxx" #include "anminfo.hxx" #include <editeng/lspcitem.hxx> diff --git a/sdext/source/minimizer/optimizerdialog.hrc b/sdext/source/minimizer/optimizerdialog.hrc deleted file mode 100644 index 809e11edd290..000000000000 --- a/sdext/source/minimizer/optimizerdialog.hrc +++ /dev/null @@ -1,30 +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 SDEXT_SOURCE_MINIMIZER_OPTIMIZERDIALOG_HRC -#define SDEXT_SOURCE_MINIMIZER_OPTIMIZERDIALOG_HRC - -#define ITEM_ID_INTRODUCTION 0 -#define ITEM_ID_SLIDES 1 -#define ITEM_ID_GRAPHIC_OPTIMIZATION 2 -#define ITEM_ID_OLE_OPTIMIZATION 3 -#define ITEM_ID_SUMMARY 4 - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/minimizer/optimizerdialog.hxx b/sdext/source/minimizer/optimizerdialog.hxx index 3e33c10f8409..7fa161e3b5f4 100644 --- a/sdext/source/minimizer/optimizerdialog.hxx +++ b/sdext/source/minimizer/optimizerdialog.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SDEXT_SOURCE_MINIMIZER_OPTIMIZERDIALOG_HXX #define INCLUDED_SDEXT_SOURCE_MINIMIZER_OPTIMIZERDIALOG_HXX -#include "optimizerdialog.hrc" #include <vector> #include "unodialog.hxx" #include "optimizationstats.hxx" @@ -51,6 +50,11 @@ #define PAGE_POS_Y 8 #define PAGE_WIDTH OD_DIALOG_WIDTH - PAGE_POS_X +#define ITEM_ID_INTRODUCTION 0 +#define ITEM_ID_SLIDES 1 +#define ITEM_ID_GRAPHIC_OPTIMIZATION 2 +#define ITEM_ID_OLE_OPTIMIZATION 3 +#define ITEM_ID_SUMMARY 4 class OptimizerDialog : public UnoDialog, public ConfigurationAccess { diff --git a/sfx2/sdi/sfxslots.sdi b/sfx2/sdi/sfxslots.sdi index 0f96f2406318..75f2137dd6a2 100644 --- a/sfx2/sdi/sfxslots.sdi +++ b/sfx2/sdi/sfxslots.sdi @@ -19,7 +19,7 @@ module StarApplicationFrame [ -SlotIdFile( "sfx2/sfx.hrc" ) +SlotIdFile( "sfx2/sfxsids.hrc" ) ] { include "sfxitems.sdi" diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index 35a6f2966575..18bc6a73a0ad 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -59,7 +59,6 @@ #include "workwin.hxx" #include <sfx2/fcontnr.hxx> #include "sfx2/strings.hrc" -#include <sfx2/sfx.hrc> #include "sfx2/strings.hrc" #include <sfx2/templdlg.hxx> #include <sfx2/module.hxx> @@ -81,13 +80,11 @@ using namespace ::com::sun::star::container; #define SfxApplication #include "sfxslots.hxx" -#define SFX_ITEMTYPE_STATBAR 4 - SFX_IMPL_INTERFACE(SfxApplication,SfxShell) void SfxApplication::InitInterface_Impl() { - GetStaticInterface()->RegisterStatusBar(SFX_ITEMTYPE_STATBAR); + GetStaticInterface()->RegisterStatusBar(StatusBarId::GenericStatusBar); GetStaticInterface()->RegisterChildWindow(SID_DOCKWIN_0); GetStaticInterface()->RegisterChildWindow(SID_DOCKWIN_1); diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 1c8e1c6fd5c3..0d155e3b29f5 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -102,7 +102,6 @@ #include "sfxtypes.hxx" #include <sfx2/tabdlg.hxx> #include "arrdecl.hxx" -#include <sfx2/sfx.hrc> #include "sfx2/strings.hrc" #include <sfx2/passwd.hxx> #include <sfx2/sfxresid.hxx> @@ -115,7 +114,7 @@ #include "sfxpicklist.hxx" #include "imestatuswindow.hxx" #include <sfx2/sfxdlg.hxx> -#include <sfx2/dialogs.hrc> +#include <sfx2/sfxsids.hrc> #include "sorgitm.hxx" #include <sfx2/sfxhelp.hxx> #include <sfx2/zoomitem.hxx> @@ -604,7 +603,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); if ( pFact ) { - ScopedVclPtr<VclAbstractDialog> pDlg(pFact->CreateVclDialog( nullptr, RID_DEFAULTABOUT )); + ScopedVclPtr<VclAbstractDialog> pDlg(pFact->CreateVclDialog( nullptr, SID_ABOUT )); pDlg->Execute(); bDone = true; } diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index 110a07d129c6..16dbcf563006 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -29,7 +29,6 @@ #include <sfx2/docfac.hxx> #include <sfx2/objface.hxx> #include <sfx2/viewfrm.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/tabdlg.hxx> #include <svl/intitem.hxx> #include <tools/diagnose_ex.h> diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 76e667314656..1e0c55907283 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -32,8 +32,7 @@ #include <svtools/treelistentry.hxx> #include "sfx2/strings.hrc" -#include "newhelp.hrc" -#include "helpid.hrc" +#include "helpids.h" #include "bitmaps.hlst" #include <rtl/ustrbuf.hxx> diff --git a/sfx2/source/appl/newhelp.hrc b/sfx2/source/appl/newhelp.hrc deleted file mode 100644 index 0965e5380357..000000000000 --- a/sfx2/source/appl/newhelp.hrc +++ /dev/null @@ -1,31 +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_SFX2_SOURCE_APPL_NEWHELP_HRC -#define INCLUDED_SFX2_SOURCE_APPL_NEWHELP_HRC - -// context menu ids -#define MID_OPEN 1 -#define MID_RENAME 2 -#define MID_DELETE 3 - -#endif - -// ******************************************************************* EOF - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index c9ee6c2df7e2..c2d752e9c86f 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -38,6 +38,11 @@ #include "srchdlg.hxx" +// context menu ids +#define MID_OPEN 1 +#define MID_RENAME 2 +#define MID_DELETE 3 + namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } } namespace com { namespace sun { namespace star { namespace i18n { class XBreakIterator; } } } } namespace com { namespace sun { namespace star { namespace text { class XTextRange; } } } } diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index c1aceedb3663..4509e7299c91 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -43,7 +43,6 @@ #include "sfxtypes.hxx" #include <sfx2/request.hxx> #include <sfx2/sfxsids.hrc> -#include <sfx2/sfx.hrc> #include <sfx2/event.hxx> #include <sfx2/objsh.hxx> #include <sfx2/bindings.hxx> diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index de328cbbb96f..a1f0823a5b7e 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -21,6 +21,7 @@ #include <comphelper/processfactory.hxx> #include <sfx2/docfile.hxx> +#include <sfx2/objface.hxx> #include <sfx2/objsh.hxx> #include <sfx2/app.hxx> #include "workwin.hxx" @@ -1428,14 +1429,13 @@ void SfxWorkWindow::RemoveChildWin_Impl( SfxChildWin_Impl *pCW ) void SfxWorkWindow::ResetStatusBar_Impl() { - aStatBar.nId = 0; + aStatBar.eId = StatusBarId::None; } - -void SfxWorkWindow::SetStatusBar_Impl( sal_uInt32 nResId ) +void SfxWorkWindow::SetStatusBar_Impl(StatusBarId eId) { - if ( nResId && bShowStatusBar && IsVisible_Impl() ) - aStatBar.nId = sal::static_int_cast<sal_uInt16>(nResId); + if (eId != StatusBarId::None && bShowStatusBar && IsVisible_Impl()) + aStatBar.eId = eId; } void SfxWorkWindow::UpdateStatusBar_Impl() @@ -1448,8 +1448,8 @@ void SfxWorkWindow::UpdateStatusBar_Impl() // No status bar, if no ID is required or when in FullScreenView or // if disabled - if ( aStatBar.nId && IsDockingAllowed() && bInternalDockingAllowed && bShowStatusBar && - !bIsFullScreen ) + if (aStatBar.eId != StatusBarId::None && IsDockingAllowed() && bInternalDockingAllowed && bShowStatusBar && + !bIsFullScreen) { // Id has changed, thus create a suitable Statusbarmanager, this takes // over the current status bar; diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx index f49cbd8e0b5f..4ed8f4755b8b 100644 --- a/sfx2/source/bastyp/frmhtml.cxx +++ b/sfx2/source/bastyp/frmhtml.cxx @@ -21,8 +21,6 @@ #include <svtools/htmltokn.h> #include <svtools/asynclink.hxx> -#include <sfx2/sfx.hrc> - #include <sfx2/frmhtml.hxx> #include <sfx2/docfile.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx index 1469e91ceacc..f25562df5647 100644 --- a/sfx2/source/bastyp/frmhtmlw.cxx +++ b/sfx2/source/bastyp/frmhtmlw.cxx @@ -35,7 +35,6 @@ #include <sfx2/docfile.hxx> #include <sfx2/sfxresid.hxx> #include <sfx2/objsh.hxx> -#include <sfx2/sfx.hrc> #include "sfx2/strings.hrc" #include "strings.hxx" diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 15e1f9151f76..6784846f62c5 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -50,7 +50,6 @@ #include "sfxtypes.hxx" #include "workwin.hxx" #include <sfx2/unoctitm.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/sfxuno.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/objsh.hxx> diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 2437fa49efd5..5e9f12f7fc35 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -1312,7 +1312,7 @@ void SfxDispatcher::Update_Impl_( bool bUIActive, bool bIsMDIApp, bool bIsIPOwne if ( xImp->bQuiet || xImp->bNoUI || (xImp->pFrame && xImp->pFrame->GetObjectShell()->IsPreview()) ) return; - sal_uInt32 nStatBarId=0; + StatusBarId eStatBarId = StatusBarId::None; SfxSlotPool* pSlotPool = &SfxSlotPool::GetSlotPool( GetFrame() ); sal_uInt16 nTotCount = xImp->aStack.size(); @@ -1407,11 +1407,9 @@ void SfxDispatcher::Update_Impl_( bool bUIActive, bool bIsMDIApp, bool bIsIPOwne if ( bIsMDIApp || bIsIPOwner ) { - sal_uInt32 nId = pIFace ? pIFace->GetStatusBarId() : 0; - if ( nId ) - { - nStatBarId = nId; - } + StatusBarId eId = pIFace ? pIFace->GetStatusBarId() : StatusBarId::None; + if (eId != StatusBarId::None) + eStatBarId = eId; } } @@ -1440,10 +1438,10 @@ void SfxDispatcher::Update_Impl_( bool bUIActive, bool bIsMDIApp, bool bIsIPOwne pActDispatcher = pActDispatcher->xImp->pParent; } - if ( bIsTaskActive && nStatBarId && xImp->pFrame ) + if (bIsTaskActive && eStatBarId != StatusBarId::None && xImp->pFrame) { // internal frames also may control statusbar - xImp->pFrame->GetFrame().GetWorkWindow_Impl()->SetStatusBar_Impl( nStatBarId ); + xImp->pFrame->GetFrame().GetWorkWindow_Impl()->SetStatusBar_Impl(eStatBarId); } } } diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx index 59262504626d..e1733d0f71d9 100644 --- a/sfx2/source/control/msgpool.cxx +++ b/sfx2/source/control/msgpool.cxx @@ -31,7 +31,6 @@ #include "arrdecl.hxx" #include <sfx2/module.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/strings.hrc> SfxSlotPool::SfxSlotPool(SfxSlotPool *pParent) diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx index 2a12149cc6b3..d990763f140d 100644 --- a/sfx2/source/control/objface.cxx +++ b/sfx2/source/control/objface.cxx @@ -76,12 +76,12 @@ struct SfxInterface_Impl SfxObjectUIArr_Impl aObjectBars; // registered ObjectBars SfxObjectUIArr_Impl aChildWindows; // registered ChildWindows OUString aPopupName; // registered PopupMenu - sal_uInt32 nStatBarResId; // registered StatusBar + StatusBarId eStatBarResId; // registered StatusBar SfxModule* pModule; bool bRegistered; SfxInterface_Impl() - : nStatBarResId(0) + : eStatBarResId(StatusBarId::None) , pModule(nullptr) , bRegistered(false) { @@ -382,9 +382,9 @@ void SfxInterface::RegisterChildWindow(sal_uInt16 nId, bool bContext, SfxShellFe pImplData->aChildWindows.push_back(pUI); } -void SfxInterface::RegisterStatusBar(sal_uInt32 nResId) +void SfxInterface::RegisterStatusBar(StatusBarId eId) { - pImplData->nStatBarResId = nResId; + pImplData->eStatBarResId = eId; } sal_uInt32 SfxInterface::GetChildWindowId (sal_uInt16 nNo) const @@ -440,12 +440,12 @@ const OUString& SfxInterface::GetPopupMenuName() const return pImplData->aPopupName; } -sal_uInt32 SfxInterface::GetStatusBarId() const +StatusBarId SfxInterface::GetStatusBarId() const { - if (pImplData->nStatBarResId == 0 && pGenoType) + if (pImplData->eStatBarResId == StatusBarId::None && pGenoType) return pGenoType->GetStatusBarId(); else - return pImplData->nStatBarResId; + return pImplData->eStatBarResId; } SfxShellFeature SfxInterface::GetObjectBarFeature ( sal_uInt16 nNo ) const diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index 21bd87a0b5ea..5eb0ba522d0c 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -21,7 +21,6 @@ #include <sfx2/recentdocsview.hxx> #include <sfx2/templatelocalview.hxx> #include <sfx2/app.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/sfxresid.hxx> #include <unotools/historyoptions.hxx> #include <vcl/builderfactory.hxx> diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx index d114c1d46728..ddad76bb09de 100644 --- a/sfx2/source/dialog/backingcomp.cxx +++ b/sfx2/source/dialog/backingcomp.cxx @@ -19,7 +19,7 @@ #include "backingwindow.hxx" -#include <helpid.hrc> +#include <helpids.h> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/util/XURLTransformer.hpp> diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 9602469ad3fa..fb2a4831f326 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -65,7 +65,6 @@ #include <comphelper/storagehelper.hxx> #include "documentfontsdialog.hxx" -#include <sfx2/sfx.hrc> #include "dinfdlg.hrc" #include "sfx2/strings.hrc" #include "strings.hxx" diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 9c046d23ec4d..f4ebace14fbd 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -69,7 +69,7 @@ #include <vcl/graphicfilter.hxx> #include <unotools/viewoptions.hxx> #include <unotools/moduleoptions.hxx> -#include <svtools/helpid.hrc> +#include <svtools/helpids.h> #include <comphelper/docpasswordrequest.hxx> #include <comphelper/docpasswordhelper.hxx> #include <ucbhelper/content.hxx> @@ -88,7 +88,7 @@ #include "filtergrouping.hxx" #include <sfx2/request.hxx> #include "filedlgimpl.hxx" -#include <helpid.hrc> +#include <helpids.h> #include <sfx2/strings.hrc> #include <rtl/strbuf.hxx> #include <comphelper/sequence.hxx> diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx index 7b81b834fb72..d55171a913bf 100644 --- a/sfx2/source/dialog/filtergrouping.cxx +++ b/sfx2/source/dialog/filtergrouping.cxx @@ -20,7 +20,6 @@ #include "filtergrouping.hxx" #include <sfx2/fcontnr.hxx> #include <sfx2/filedlghelper.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/strings.hrc> #include <sfx2/docfac.hxx> #include <sfx2/sfxresid.hxx> diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx index b093718f4e86..ec6814edce9c 100644 --- a/sfx2/source/dialog/infobar.cxx +++ b/sfx2/source/dialog/infobar.cxx @@ -16,8 +16,8 @@ #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/infobar.hxx> +#include <sfx2/objface.hxx> #include <sfx2/objsh.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/viewsh.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index c463872fef36..af5f69ba2f20 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -37,7 +37,6 @@ #include <sfx2/templdlg.hxx> #include "templdgi.hxx" -#include <sfx2/sfx.hrc> #include "sfx2/strings.hrc" #include <svl/style.hxx> diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx index 3ebca4245826..c99aeb6c7c8a 100644 --- a/sfx2/source/dialog/navigat.cxx +++ b/sfx2/source/dialog/navigat.cxx @@ -21,11 +21,10 @@ #include <sfx2/bindings.hxx> #include <sfx2/navigat.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/strings.hrc> #include <sfx2/app.hxx> #include <sfx2/sfxresid.hxx> -#include "helpid.hrc" +#include "helpids.h" SFX_IMPL_DOCKINGWINDOW( SfxNavigatorWrapper , SID_NAVIGATOR ); diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx index 160c6d462c9c..cdac7d87d1ea 100644 --- a/sfx2/source/dialog/securitypage.cxx +++ b/sfx2/source/dialog/securitypage.cxx @@ -22,7 +22,6 @@ #include <sfx2/sfxresid.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/sfxsids.hrc> #include <sfx2/objsh.hxx> #include <sfx2/viewsh.hxx> diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index f9de799edc6b..44f3118c6c6a 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -40,7 +40,7 @@ #include "uitest/sfx_uiobject.hxx" #include "sfx2/strings.hrc" -#include "helpid.hrc" +#include "helpids.h" using namespace ::com::sun::star::uno; diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index ba9985aefa29..152bb1ab2843 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -50,14 +50,13 @@ #include <sfx2/tplpitem.hxx> #include <sfx2/sfxresid.hxx> -#include <sfx2/sfx.hrc> #include "sfx2/strings.hrc" #include "arrdecl.hxx" #include <sfx2/docfilt.hxx> #include <sfx2/docfac.hxx> #include <sfx2/doctempl.hxx> #include <sfx2/module.hxx> -#include "helpid.hrc" +#include "helpids.h" #include "bitmaps.hlst" #include "appdata.hxx" #include <sfx2/viewfrm.hxx> diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx index e016d111a18b..44fd583c81d9 100644 --- a/sfx2/source/dialog/tplcitem.cxx +++ b/sfx2/source/dialog/tplcitem.cxx @@ -26,7 +26,6 @@ #include "tplcitem.hxx" #include "templdgi.hxx" -#include <sfx2/sfx.hrc> #include "sfx2/strings.hrc" // Constructor diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx index ac67301c11eb..54f212ee58f8 100644 --- a/sfx2/source/doc/docfac.cxx +++ b/sfx2/source/doc/docfac.cxx @@ -32,7 +32,6 @@ #include <comphelper/sequenceashashmap.hxx> #include <comphelper/configurationhelper.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/docfilt.hxx> #include <sfx2/docfac.hxx> #include <sfx2/viewfac.hxx> diff --git a/sfx2/source/doc/objembed.cxx b/sfx2/source/doc/objembed.cxx index 422e3ea62842..2d59de087943 100644 --- a/sfx2/source/doc/objembed.cxx +++ b/sfx2/source/doc/objembed.cxx @@ -27,7 +27,6 @@ #include <sfx2/objsh.hxx> #include <sfx2/app.hxx> #include "objshimp.hxx" -#include <sfx2/sfx.hrc> #include <sfx2/event.hxx> #include <comphelper/seqstream.hxx> diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 581ab76a44ec..febf5fbfe728 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -93,7 +93,6 @@ #include <sfx2/objsh.hxx> #include "objshimp.hxx" #include <sfx2/event.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> @@ -104,7 +103,7 @@ #include "helper.hxx" #include "sfx2/strings.hrc" #include "workwin.hxx" -#include "helpid.hrc" +#include "helpids.h" #include "sfx2/strings.hrc" #include <sfx2/sfxdlg.hxx> #include "appbaslib.hxx" diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 929008cd1136..2924a4f43598 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -95,7 +95,7 @@ #include <com/sun/star/util/XCloneable.hpp> #include <com/sun/star/document/XDocumentProperties.hpp> -#include "helpid.hrc" +#include "helpids.h" #include "guisaveas.hxx" #include <sfx2/saveastemplatedlg.hxx> diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 6e3617421b07..8b25c10f7fe1 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -91,7 +91,7 @@ #include <basic/basmgr.hxx> #include <svtools/strings.hrc> #include <sfx2/QuerySaveDocument.hxx> -#include "helpid.hrc" +#include "helpids.h" #include <sfx2/msg.hxx> #include "appbaslib.hxx" #include <sfx2/sfxbasemodel.hxx> diff --git a/sfx2/source/doc/querytemplate.cxx b/sfx2/source/doc/querytemplate.cxx index 7315e98f9344..c21b73ba7f71 100644 --- a/sfx2/source/doc/querytemplate.cxx +++ b/sfx2/source/doc/querytemplate.cxx @@ -21,7 +21,7 @@ #include "querytemplate.hxx" #include <sfx2/sfxresid.hxx> #include "sfx2/strings.hrc" -#include "helpid.hrc" +#include "helpids.h" #include <vcl/svapp.hxx> namespace sfx2 diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index eb07fd640874..5df92d9175d4 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -105,7 +105,6 @@ #include <eventsupplier.hxx> #include <sfx2/evntconf.hxx> #include <sfx2/strings.hrc> -#include <sfx2/sfx.hrc> #include <sfx2/app.hxx> #include "appdata.hxx" #include <sfx2/docfac.hxx> diff --git a/sfx2/source/doc/zoomitem.cxx b/sfx2/source/doc/zoomitem.cxx index c71405547eb1..117d1a7c4635 100644 --- a/sfx2/source/doc/zoomitem.cxx +++ b/sfx2/source/doc/zoomitem.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> #include <osl/diagnose.h> -#include <sfx2/sfx.hrc> SfxPoolItem* SvxZoomItem::CreateDefault() { return new SvxZoomItem; } diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpids.h index 1edcd1da3fdb..96395079b7c9 100644 --- a/sfx2/source/inc/helpid.hrc +++ b/sfx2/source/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 INCLUDED_SFX2_SOURCE_INC_HELPID_HRC -#define INCLUDED_SFX2_SOURCE_INC_HELPID_HRC +#ifndef INCLUDED_SFX2_SOURCE_INC_HELPIDS_H +#define INCLUDED_SFX2_SOURCE_INC_HELPIDS_H #define HID_TEMPLATE_FMT "SFX2_HID_TEMPLATE_FMT" #define HID_TEMPLATE_FILTER "SFX2_HID_TEMPLATE_FILTER" diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index 6f1eb124f1b2..bb4e50db7025 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -31,8 +31,8 @@ #include <rtl/ustring.hxx> #include <o3tl/typed_flags_set.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/childwin.hxx> +#include <sfx2/objface.hxx> #include <sfx2/shell.hxx> #include <sfx2/ctrlitem.hxx> #include <sfx2/toolbarids.hxx> @@ -58,19 +58,17 @@ struct SfxObjectBar_Impl {} }; - // This struct makes all relevant Information available of the status bar struct SfxStatBar_Impl { - sal_uInt16 nId; + StatusBarId eId; SfxStatBar_Impl() : - nId(0) + eId(StatusBarId::None) {} }; - enum class SfxChildVisibility { NOT_VISIBLE = 0, @@ -296,7 +294,7 @@ public: // Methods for StatusBar void ResetStatusBar_Impl(); - void SetStatusBar_Impl(sal_uInt32 nResId); + void SetStatusBar_Impl(StatusBarId eResId); void UpdateStatusBar_Impl(); css::uno::Reference< css::task::XStatusIndicator > GetStatusIndicator(); css::uno::Reference< css::frame::XFrame > GetFrameInterface(); diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index da0820aa208d..784ebd37a3ec 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -39,7 +39,6 @@ #include <comphelper/processfactory.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/objsh.hxx> diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx b/sfx2/source/sidebar/SidebarChildWindow.cxx index 126d304c21f7..c5be03bc17ec 100644 --- a/sfx2/source/sidebar/SidebarChildWindow.cxx +++ b/sfx2/source/sidebar/SidebarChildWindow.cxx @@ -22,7 +22,7 @@ #include <sfx2/sidebar/SidebarChildWindow.hxx> #include <sfx2/sidebar/SidebarDockingWindow.hxx> #include <sfx2/sfxsids.hrc> -#include "helpid.hrc" +#include "helpids.h" #include <sfx2/dockwin.hxx> namespace sfx2 { namespace sidebar { diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index 12c977e8e5b0..aeee94b41201 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -39,7 +39,6 @@ #include <sfx2/dispatch.hxx> #include <sfx2/unoctitm.hxx> #include <sfx2/objsh.hxx> -#include <sfx2/sfx.hrc> #include <comphelper/processfactory.hxx> #include <svl/eitem.hxx> diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 22a2d3e82c5f..0bfcf1bcdff3 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -72,14 +72,13 @@ #include <sfx2/viewfrm.hxx> #include "sfxtypes.hxx" #include <sfx2/sfxresid.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/module.hxx> #include <sfx2/docfile.hxx> #include <sfx2/docfac.hxx> #include <sfx2/frmhtmlw.hxx> #include <sfx2/app.hxx> #include <sfx2/unoctitm.hxx> -#include "helpid.hrc" +#include "helpids.h" #include "workwin.hxx" #include <ctrlfactoryimpl.hxx> diff --git a/sfx2/source/view/classificationcontroller.cxx b/sfx2/source/view/classificationcontroller.cxx index 55ba2249327d..b122fb669d92 100644 --- a/sfx2/source/view/classificationcontroller.cxx +++ b/sfx2/source/view/classificationcontroller.cxx @@ -22,7 +22,6 @@ #include <vcl/fixed.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/classificationhelper.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/strings.hrc> #include <sfx2/sfxresid.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/sfx2/source/view/classificationhelper.cxx b/sfx2/source/view/classificationhelper.cxx index 41759086a5f6..497b4c2ba4f8 100644 --- a/sfx2/source/view/classificationhelper.cxx +++ b/sfx2/source/view/classificationhelper.cxx @@ -28,7 +28,6 @@ #include <unotools/ucbstreamhelper.hxx> #include <unotools/streamwrap.hxx> #include <cppuhelper/implbase.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/strings.hrc> #include <sfx2/sfxresid.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index 93283f639f88..7e699c13c053 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -30,7 +30,6 @@ #include <sfx2/frame.hxx> #include <sfx2/objsh.hxx> #include <sfx2/request.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/sfxsids.hrc> #include <sfx2/sfxuno.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 53a677c71836..c74166027e8d 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -59,7 +59,6 @@ #include <sfx2/unoctitm.hxx> #include <sfx2/childwin.hxx> #include <sfx2/sfxsids.hrc> -#include <sfx2/sfx.hrc> #include <sfx2/sfxresid.hxx> #include <workwin.hxx> #include <sfx2/objface.hxx> diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 5ddcb71e8765..a22aae8818e6 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -124,7 +124,6 @@ using ::com::sun::star::container::XIndexContainer; #include <sfx2/msgpool.hxx> #include "viewimp.hxx" #include <sfx2/sfxbasecontroller.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/frmdescr.hxx> #include <sfx2/sfxuno.hxx> #include <sfx2/progress.hxx> diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index f50f7b8f3cfc..49e5ae6b34d4 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -50,7 +50,7 @@ #include <toolkit/awt/vclxdevice.hxx> -#include "helpid.hrc" +#include "helpids.h" using namespace com::sun::star; using namespace com::sun::star::uno; diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c index cae9bc88e230..602bdf4b7dbf 100644 --- a/solenv/bin/concat-deps.c +++ b/solenv/bin/concat-deps.c @@ -1034,11 +1034,6 @@ off_t size; created_line = generate_phony_line(src_relative, "o"); rc = generate_phony_file(fn, created_line); } - else if(strncmp(fn+work_dir_len+5, "SrsPartTarget/", 14) == 0) - { - created_line = generate_phony_line(src_relative, ""); - rc = generate_phony_file(fn, created_line); - } else if(strncmp(src_relative, "GenCxxObject/", 13) == 0) { created_line = generate_phony_line(src_relative, "o"); diff --git a/solenv/doc/gbuild/solenv/gbuild/types.mk b/solenv/doc/gbuild/solenv/gbuild/types.mk index 7e606bd02731..8798f01050c7 100644 --- a/solenv/doc/gbuild/solenv/gbuild/types.mk +++ b/solenv/doc/gbuild/solenv/gbuild/types.mk @@ -158,14 +158,5 @@ namespace gb { namespace types /// just a few need to be modified. void set_include(List<Path> include); }; - /// A target processing a set of srs files - class HasSrs - { - public: - /// Add a SrsTarget to be processed. - void add_one_srs(SrsTarget srs); - /// Add multiple SrsTarget s to be processed. - void add_srs(List<SrsTarget> srs); - }; }}; /* vim: set filetype=cpp : */ diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 4518b00b5d69..206a88e187ca 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -153,10 +153,6 @@ gb_ScpTarget_get_target = $(WORKDIR)/ScpTarget/$(1).par gb_ScpTemplateTarget_get_dir = $(abspath $(WORKDIR)/ScpTemplateTarget/$(dir $(1))) gb_ScpTemplateTarget_get_target = $(abspath $(WORKDIR)/ScpTemplateTarget/$(dir $(1))$(subst pack,modules,$(subst module_,all,$(notdir $(1)))).inc) gb_SdiTarget_get_target = $(WORKDIR)/SdiTarget/$(1) -gb_SrsPartMergeTarget_get_target = $(WORKDIR)/SrsPartMergeTarget/$(1) -gb_SrsPartTarget_get_target = $(WORKDIR)/SrsPartTarget/$(1) -gb_SrsTarget_get_headers_target = $(WORKDIR)/SrsTarget/$(1).headers -gb_SrsTarget_get_target = $(WORKDIR)/SrsTarget/$(1).srs gb_ThesaurusIndexTarget_get_target = $(WORKDIR)/ThesaurusIndexTarget/$(basename $(1)).idx gb_UIConfig_get_imagelist_target = $(WORKDIR)/UIConfig/$(1).ilst gb_UIConfig_get_target = $(WORKDIR)/UIConfig/$(1).done @@ -277,7 +273,6 @@ $(eval $(call gb_Helper_make_clean_targets,\ ScpTarget \ ScpTemplateTarget \ SdiTarget \ - SrsTarget \ StaticLibrary \ ThesaurusIndexTarget \ CppunitTest \ @@ -316,8 +311,6 @@ $(eval $(call gb_Helper_make_dep_targets,\ GenCObject \ GenCxxObject \ SdiTarget \ - SrsPartTarget \ - SrsTarget \ )) # other getters diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index 7bb58e4d73fc..09db3a19dae6 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -67,18 +67,6 @@ $(call gb_Helper_abbreviate_dirs,\ ) endef -define gb_SrsPartTarget__command_dep -$(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(call gb_SrsPartTarget_get_dep_target,$(1))) && cd $(SRCDIR) && \ - $(gb_GCCP) \ - -MM -MP -MT $(call gb_SrsPartTarget_get_target,$(1)) \ - $(INCLUDE) \ - $(DEFS) \ - -D__RSC \ - -c -x c++-header $(2) \ - -o $(call gb_SrsPartTarget_get_dep_target,$(1))) -endef - # PrecompiledHeader class ifeq ($(COM_IS_CLANG),TRUE) diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 3a04f54a741f..8fadf93bb50c 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -451,27 +451,6 @@ ifeq ($(strip $(CPPUNITTRACE)),TRUE) gb_CppunitTest_GDBTRACE := '$(DEVENV)' /debugexe endif -# SrsPartTarget class - -ifeq ($(gb_FULLDEPS),$(true)) -# FIXME this is used before TargetLocations is read? -gb_SrsPartTarget__command_target = $(WORKDIR)/LinkTarget/Executable/makedepend.exe -define gb_SrsPartTarget__command_dep -$(call gb_Helper_abbreviate_dirs,\ - $(call gb_Executable_get_target,makedepend) \ - $(INCLUDE) \ - $(DEFS) \ - -D__RSC \ - $(2) \ - -o .src \ - -p $(dir $(call gb_SrsPartTarget_get_target,$(1))) \ - -f $(call gb_SrsPartTarget_get_dep_target,$(1))) -endef -else -gb_SrsPartTarget__command_target = -gb_SrsPartTarget__command_dep = -endif - # WinResTarget class gb_WinResTarget_POSTFIX :=.res diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc index b191713a9f79..bbe606badee7 100644 --- a/starmath/inc/starmath.hrc +++ b/starmath/inc/starmath.hrc @@ -22,8 +22,7 @@ #include <svl/solar.hrc> #include <sfx2/sfxsids.hrc> -#include <editeng/memberids.hrc> -#include "helpids.h" +#include <editeng/memberids.h> #define SID_NEXTERR (SID_SMA_START + 1) #define SID_PREVERR (SID_SMA_START + 2) @@ -72,8 +71,6 @@ #define SID_ELEMENTSDOCKINGWINDOW (SID_SMA_START + 126) #define SID_AUTO_CLOSE_BRACKETS (SID_SMA_START + 127) -#define RID_STATUSBAR (RID_APP_START + 816) - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 16d237dcb4b2..031f57c31f2c 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -37,7 +37,6 @@ #include <vcl/wall.hxx> #include <vcl/fontcharmap.hxx> #include <sfx2/dispatch.hxx> -#include <sfx2/sfx.hrc> #include <osl/diagnose.h> #include <svx/ucsubset.hxx> diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index b335e6ee81dc..e010383f0bad 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -70,7 +70,6 @@ #include <vcl/msgbox.hxx> #include <vcl/settings.hxx> -#include <sfx2/sfx.hrc> #include <document.hxx> #include <action.hxx> #include <dialog.hxx> diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx index 0e821d5b9d01..5081050b291a 100644 --- a/starmath/source/smmod.cxx +++ b/starmath/source/smmod.cxx @@ -22,7 +22,6 @@ #include <o3tl/make_unique.hxx> #include <sfx2/objface.hxx> #include <svl/whiter.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/viewsh.hxx> #include <svx/svxids.hrc> #include <tools/resmgr.hxx> @@ -126,7 +125,7 @@ SFX_IMPL_INTERFACE(SmModule, SfxModule) void SmModule::InitInterface_Impl() { - GetStaticInterface()->RegisterStatusBar(RID_STATUSBAR); + GetStaticInterface()->RegisterStatusBar(StatusBarId::MathStatusBar); } SmModule::SmModule(SfxObjectFactory* pObjFact) diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 56e79c66d330..bf387cb2d494 100644 --- a/ |