de-hrc various things

e.g.  helpid[s].hrc -> helpids.h
and insert include guards where missing

move "ordinary" defines into .hxx files

remove .hrc entries that are used as arguments to dialog factory
when a dedicated method can be added instead

Change-Id: I792fb8eb0adfaa63cf354e6e57401fc943e9196e

29 files changed, 33 insertions, 35 deletions

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"