Resolves fdo#70681: fixincludeguards.pl: all that's left

Change-Id: I3e51a62710bb46c8255fd228d41d9300c90a1fb5
Reviewed-on: https://gerrit.libreoffice.org/9360
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

18 files changed, 37 insertions, 37 deletions

diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx
index 6ea16fd25d06..9fb24fef2414 100644
--- a/chart2/inc/ChartModel.hxx
+++ b/chart2/inc/ChartModel.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_CHART2_SOURCE_MODEL_MAIN_CHARTMODEL_HXX
-#define INCLUDED_CHART2_SOURCE_MODEL_MAIN_CHARTMODEL_HXX
+#ifndef INCLUDED_CHART2_INC_CHARTMODEL_HXX
+#define INCLUDED_CHART2_INC_CHARTMODEL_HXX
 
 #include "LifeTime.hxx"
 #include "ServiceMacros.hxx"
diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index 69f1eedf3313..156bf8a93e87 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.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_CHART2_SOURCE_VIEW_MAIN_CHARTVIEW_HXX
-#define INCLUDED_CHART2_SOURCE_VIEW_MAIN_CHARTVIEW_HXX
+#ifndef INCLUDED_CHART2_INC_CHARTVIEW_HXX
+#define INCLUDED_CHART2_INC_CHARTVIEW_HXX
 
 #include "ChartModel.hxx"
 #include "chartview/ExplicitValueProvider.hxx"
diff --git a/chart2/inc/unonames.hxx b/chart2/inc/unonames.hxx
index 9f9d1cb3cd45..7962249120ce 100644
--- a/chart2/inc/unonames.hxx
+++ b/chart2/inc/unonames.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef CHART2_UNONAMES_HXX
-#define CHART2_UNONAMES_HXX
+#ifndef INCLUDED_CHART2_INC_UNONAMES_HXX
+#define INCLUDED_CHART2_INC_UNONAMES_HXX
 
 #define CHART_UNONAME_SORT_BY_XVALUES       "SortByXValues"
 #define CHART_UNONAME_ROUNDED_EDGE          "RoundedEdge"
diff --git a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.hxx
index 90034a0f5dd7..7671151bdff6 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef CHART2_WRAPPEDGL3DPROPERTIES_HXX
-#define CHART2_WRAPPEDGL3DPROPERTIES_HXX
+#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDGL3DPROPERTIES_HXX
+#define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDGL3DPROPERTIES_HXX
 
 #include <vector>
 #include <boost/shared_ptr.hpp>
diff --git a/chart2/source/controller/dialogs/GL3DBarChartDialogController.hxx b/chart2/source/controller/dialogs/GL3DBarChartDialogController.hxx
index 19b603d2bc11..70eea08e2dd6 100644
--- a/chart2/source/controller/dialogs/GL3DBarChartDialogController.hxx
+++ b/chart2/source/controller/dialogs/GL3DBarChartDialogController.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_CHART2_GL3DBARCHARTDIALOGCONTROLLER_HXX
-#define INCLUDED_CHART2_GL3DBARCHARTDIALOGCONTROLLER_HXX
+#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_GL3DBARCHARTDIALOGCONTROLLER_HXX
+#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_GL3DBARCHARTDIALOGCONTROLLER_HXX
 
 #include "ChartTypeDialogController.hxx"
 
diff --git a/chart2/source/controller/dialogs/dlg_PropertyMapping.hxx b/chart2/source/controller/dialogs/dlg_PropertyMapping.hxx
index 35dc8dee02d8..0358a84dbfe2 100644
--- a/chart2/source/controller/dialogs/dlg_PropertyMapping.hxx
+++ b/chart2/source/controller/dialogs/dlg_PropertyMapping.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef CHART2_PROPERTY_MAPPING_HXX
-#define CHART2_PROPERTY_MAPPING_HXX
+#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_DLG_PROPERTYMAPPING_HXX
+#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_DLG_PROPERTYMAPPING_HXX
 
 #include <vcl/dialog.hxx>
 #include <vcl/button.hxx>
diff --git a/chart2/source/controller/inc/res_LegendPosition.hxx b/chart2/source/controller/inc/res_LegendPosition.hxx
index 3a739ce65ea7..c8292db200af 100644
--- a/chart2/source/controller/inc/res_LegendPosition.hxx
+++ b/chart2/source/controller/inc/res_LegendPosition.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_CHART2_SOURCE_CONTROLLER_DIALOGS_RES_LEGENDPOSITION_HXX
-#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_RES_LEGENDPOSITION_HXX
+#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_RES_LEGENDPOSITION_HXX
+#define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_RES_LEGENDPOSITION_HXX
 
 #include <vcl/builder.hxx>
 #include <vcl/button.hxx>
diff --git a/chart2/source/controller/inc/res_Titles.hxx b/chart2/source/controller/inc/res_Titles.hxx
index dbfb065ee910..fe78e75b92c2 100644
--- a/chart2/source/controller/inc/res_Titles.hxx
+++ b/chart2/source/controller/inc/res_Titles.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_CHART2_SOURCE_CONTROLLER_DIALOGS_RES_TITLES_HXX
-#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_RES_TITLES_HXX
+#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_RES_TITLES_HXX
+#define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_RES_TITLES_HXX
 
 #include "TitleDialogData.hxx"
 #include <vcl/builder.hxx>
diff --git a/chart2/source/inc/GL3DHelper.hxx b/chart2/source/inc/GL3DHelper.hxx
index d7e2464d3c6c..637710515cc9 100644
--- a/chart2/source/inc/GL3DHelper.hxx
+++ b/chart2/source/inc/GL3DHelper.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef CHART2_GL3DHELPER_HXX
-#define CHART2_GL3DHELPER_HXX
+#ifndef INCLUDED_CHART2_SOURCE_INC_GL3DHELPER_HXX
+#define INCLUDED_CHART2_SOURCE_INC_GL3DHELPER_HXX
 
 #include <charttoolsdllapi.hxx>
 
diff --git a/chart2/source/inc/RegressionCalculationHelper.hxx b/chart2/source/inc/RegressionCalculationHelper.hxx
index 523108bebc54..1970c563d3ad 100644
--- a/chart2/source/inc/RegressionCalculationHelper.hxx
+++ b/chart2/source/inc/RegressionCalculationHelper.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_CHART2_SOURCE_TOOLS_REGRESSIONCALCULATIONHELPER_HXX
-#define INCLUDED_CHART2_SOURCE_TOOLS_REGRESSIONCALCULATIONHELPER_HXX
+#ifndef INCLUDED_CHART2_SOURCE_INC_REGRESSIONCALCULATIONHELPER_HXX
+#define INCLUDED_CHART2_SOURCE_INC_REGRESSIONCALCULATIONHELPER_HXX
 
 #include <rtl/math.hxx>
 
@@ -117,7 +117,7 @@ public:
 } //  namespace RegressionCalculationHelper
 } //  namespace chart
 
-// INCLUDED_CHART2_SOURCE_TOOLS_REGRESSIONCALCULATIONHELPER_HXX
+// INCLUDED_CHART2_SOURCE_INC_REGRESSIONCALCULATIONHELPER_HXX
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/GL3DBarChartType.hxx b/chart2/source/model/template/GL3DBarChartType.hxx
index aa5ab6b52de4..f60ba4ac9bbb 100644
--- a/chart2/source/model/template/GL3DBarChartType.hxx
+++ b/chart2/source/model/template/GL3DBarChartType.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_CHART2_GL3DBARCHARTTYPE_HXX
-#define INCLUDED_CHART2_GL3DBARCHARTTYPE_HXX
+#ifndef INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_GL3DBARCHARTTYPE_HXX
+#define INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_GL3DBARCHARTTYPE_HXX
 
 #include "ChartType.hxx"
 #include "ServiceMacros.hxx"
diff --git a/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx b/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx
index 50a21d7a7dd7..f2957536e8c4 100644
--- a/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx
+++ b/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef CHART2_GL3DBARCHARTTYPETEMPLATE_HXX
-#define CHART2_GL3DBARCHARTTYPETEMPLATE_HXX
+#ifndef INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_GL3DBARCHARTTYPETEMPLATE_HXX
+#define INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_GL3DBARCHARTTYPETEMPLATE_HXX
 
 #include <MutexContainer.hxx>
 #include <ChartTypeTemplate.hxx>
diff --git a/chart2/source/view/charttypes/NetChart.hxx b/chart2/source/view/charttypes/NetChart.hxx
index 6f3e42b89669..fd11c6dedd20 100644
--- a/chart2/source/view/charttypes/NetChart.hxx
+++ b/chart2/source/view/charttypes/NetChart.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CHART2_NETCHART_HXX
-#define _CHART2_NETCHART_HXX
+#ifndef INCLUDED_CHART2_SOURCE_VIEW_CHARTTYPES_NETCHART_HXX
+#define INCLUDED_CHART2_SOURCE_VIEW_CHARTTYPES_NETCHART_HXX
 
 #include "VSeriesPlotter.hxx"
 
diff --git a/chart2/source/view/inc/GL3DBarChart.hxx b/chart2/source/view/inc/GL3DBarChart.hxx
index 81e7639a6896..bd09caa0eaf9 100644
--- a/chart2/source/view/inc/GL3DBarChart.hxx
+++ b/chart2/source/view/inc/GL3DBarChart.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef CHART2_GL3DBARCHART_HXX
-#define CHART2_GL3DBARCHART_HXX
+#ifndef INCLUDED_CHART2_SOURCE_VIEW_INC_GL3DBARCHART_HXX
+#define INCLUDED_CHART2_SOURCE_VIEW_INC_GL3DBARCHART_HXX
 
 #include <GL3DPlotterBase.hxx>
 
diff --git a/chart2/source/view/inc/GL3DPlotterBase.hxx b/chart2/source/view/inc/GL3DPlotterBase.hxx
index cd69bf2eccd9..ceea643e8854 100644
--- a/chart2/source/view/inc/GL3DPlotterBase.hxx
+++ b/chart2/source/view/inc/GL3DPlotterBase.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef CHART2_GL3DPLOTTERBASE_HXX
-#define CHART2_GL3DPLOTTERBASE_HXX
+#ifndef INCLUDED_CHART2_SOURCE_VIEW_INC_GL3DPLOTTERBASE_HXX
+#define INCLUDED_CHART2_SOURCE_VIEW_INC_GL3DPLOTTERBASE_HXX
 
 #include <boost/ptr_container/ptr_vector.hpp>
 #include "VDataSeries.hxx"
diff --git a/chart2/source/view/inc/GL3DRenderer.hxx b/chart2/source/view/inc/GL3DRenderer.hxx
index 83008e6c7f83..8628bb8db724 100644
--- a/chart2/source/view/inc/GL3DRenderer.hxx
+++ b/chart2/source/view/inc/GL3DRenderer.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef CHART2_GL3DRENDERER_HXX
-#define CHART2_GL3DRENDERER_HXX
+#ifndef INCLUDED_CHART2_SOURCE_VIEW_INC_GL3DRENDERER_HXX
+#define INCLUDED_CHART2_SOURCE_VIEW_INC_GL3DRENDERER_HXX
 
 #include "glm/glm.hpp"
 #include "glm/gtx/transform.hpp"
diff --git a/chart2/source/view/inc/StaticGeometry.h b/chart2/source/view/inc/StaticGeometry.h
index bdc8fe74a26a..3ff412a3a753 100644
--- a/chart2/source/view/inc/StaticGeometry.h
+++ b/chart2/source/view/inc/StaticGeometry.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_CHART2_STATIC_GEOMETRY_H
-#define INCLUDED_CHART2_STATIC_GEOMETRY_H
+#ifndef INCLUDED_CHART2_SOURCE_VIEW_INC_STATICGEOMETRY_H
+#define INCLUDED_CHART2_SOURCE_VIEW_INC_STATICGEOMETRY_H
 
 #define TOP_SURFACE 0
 #define MIDDLE_SURFACE 1
diff --git a/chart2/source/view/main/DummyXShape.hxx b/chart2/source/view/main/DummyXShape.hxx
index c96165b02112..11aa9fa27cea 100644
--- a/chart2/source/view/main/DummyXShape.hxx
+++ b/chart2/source/view/main/DummyXShape.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef CHART2_DUMMY_XSHAPE_HXX
-#define CHART2_DUMMY_XSHAPE_HXX
+#ifndef INCLUDED_CHART2_SOURCE_VIEW_MAIN_DUMMYXSHAPE_HXX
+#define INCLUDED_CHART2_SOURCE_VIEW_MAIN_DUMMYXSHAPE_HXX
 
 #include <cppuhelper/implbase6.hxx>