windows: warning 4355 is disabled globally in com_MSC_defs.mk

So there is no need to do this locally, too.

Change-Id: I0fa1d0cd3e077ba0985848a9d2cbb061b123e8ad

19 files changed, 0 insertions, 58 deletions

diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
index 58895414e2e4..2eeb6cdba651 100644
--- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
@@ -22,7 +22,6 @@
 #include "ResId.hxx"
 #include "chartview/ChartSfxItemIds.hxx"
 #include "HelpIds.hrc"
-#include "NoWarningThisInCTOR.hxx"
 #include "ObjectNameProvider.hxx"
 
 // header for class SfxBoolItem
diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
index 44d6ab19e7f7..e291771dd614 100644
--- a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
@@ -22,7 +22,6 @@
 #include "res_LegendPosition.hxx"
 #include "ObjectNameProvider.hxx"
 #include "ResId.hxx"
-#include "NoWarningThisInCTOR.hxx"
 
 namespace chart
 {
diff --git a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx
index 334e413f0ac2..7b484ea18478 100644
--- a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx
@@ -21,7 +21,6 @@
 #include "dlg_InsertTitle.hrc"
 #include "res_Titles.hxx"
 #include "ResId.hxx"
-#include "NoWarningThisInCTOR.hxx"
 #include "ObjectNameProvider.hxx"
 
 namespace chart
diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx
index 6d7ee358fe5c..7eda837d5382 100644
--- a/chart2/source/controller/dialogs/dlg_View3D.cxx
+++ b/chart2/source/controller/dialogs/dlg_View3D.cxx
@@ -22,7 +22,6 @@
 #include "Strings.hrc"
 #include "TabPages.hrc"
 #include "ResId.hxx"
-#include "NoWarningThisInCTOR.hxx"
 #include "tp_3D_SceneGeometry.hxx"
 #include "tp_3D_SceneAppearance.hxx"
 #include "tp_3D_SceneIllumination.hxx"
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 48d558971c80..b69a9e36d5ae 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -23,7 +23,6 @@
 #include "Strings.hrc"
 #include "ResId.hxx"
 #include "chartview/ChartSfxItemIds.hxx"
-#include "NoWarningThisInCTOR.hxx"
 #include "dlg_NumberFormat.hxx"
 
 // header for class SvxNumberInfoItem
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
index 0e7804ee922b..dc74f71fe023 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
@@ -21,7 +21,6 @@
 #include "tp_3D_SceneAppearance.hrc"
 #include "ResId.hxx"
 #include "Strings.hrc"
-#include "NoWarningThisInCTOR.hxx"
 #include "ChartModelHelper.hxx"
 #include "ThreeDHelper.hxx"
 #include "macros.hxx"
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
index 3635d507e9fd..b73205f3d7bd 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
@@ -20,7 +20,6 @@
 #include "tp_3D_SceneGeometry.hxx"
 #include "tp_3D_SceneGeometry.hrc"
 #include "ResId.hxx"
-#include "NoWarningThisInCTOR.hxx"
 #include "BaseGFXHelper.hxx"
 #include "macros.hxx"
 #include "DiagramHelper.hxx"
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 65b69b41d0b5..3235fa742e03 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -23,7 +23,6 @@
 #include "Strings.hrc"
 #include "Bitmaps.hrc"
 #include "CommonConverters.hxx"
-#include "NoWarningThisInCTOR.hxx"
 
 #include "svx/dialogs.hrc"
 // header for define SVX_RES
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index 59ad0b521849..f16490fdb04b 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -22,7 +22,6 @@
 #include "ResId.hxx"
 #include "TabPages.hrc"
 #include "chartview/ChartSfxItemIds.hxx"
-#include "NoWarningThisInCTOR.hxx"
 
 // header for SvxChartTextOrientItem / SvxChartTextOrderItem
 #include <svx/chrtitem.hxx>
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index e97bcc89bb08..46b7f7ce458f 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -23,7 +23,6 @@
 #include "TabPages.hrc"
 #include "Strings.hrc"
 #include "chartview/ChartSfxItemIds.hxx"
-#include "NoWarningThisInCTOR.hxx"
 #include "AxisHelper.hxx"
 
 #include <svx/svxids.hrc>
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index cb5311bf939f..bec737d61298 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -23,7 +23,6 @@
 #include "ResId.hxx"
 #include "ChartModelHelper.hxx"
 #include "DiagramHelper.hxx"
-#include "NoWarningThisInCTOR.hxx"
 #include "res_BarGeometry.hxx"
 #include "ControllerLockGuard.hxx"
 #include "macros.hxx"
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
index cdd2db7332de..0de7587bc636 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
@@ -22,7 +22,6 @@
 #include "TabPages.hrc"
 #include "res_LegendPosition.hxx"
 #include "chartview/ChartSfxItemIds.hxx"
-#include "NoWarningThisInCTOR.hxx"
 #include <svx/chrtitem.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/frmdiritem.hxx>
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
index 5ac89c14eab4..6f5ac963b035 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
@@ -21,7 +21,6 @@
 #include "tp_PolarOptions.hrc"
 #include "ResId.hxx"
 #include "chartview/ChartSfxItemIds.hxx"
-#include "NoWarningThisInCTOR.hxx"
 
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 897deb850cc0..2eb5f5e465a8 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -22,7 +22,6 @@
 #include "Strings.hrc"
 #include "ResId.hxx"
 #include "macros.hxx"
-#include "NoWarningThisInCTOR.hxx"
 #include "DataSourceHelper.hxx"
 #include "DiagramHelper.hxx"
 #include "ChartTypeTemplateProvider.hxx"
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index 409cfd8127fc..d0d0c6cc8928 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -23,7 +23,6 @@
 #include "ResId.hxx"
 #include "Strings.hrc"
 #include "chartview/ChartSfxItemIds.hxx"
-#include "NoWarningThisInCTOR.hxx"
 #include "AxisHelper.hxx"
 
 #include <svx/svxids.hrc>
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index efebb436a813..1dfa50d56fcd 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -21,7 +21,6 @@
 
 #include "ResId.hxx"
 #include "chartview/ChartSfxItemIds.hxx"
-#include "NoWarningThisInCTOR.hxx"
 
 // header for class SfxBoolItem
 #include <svl/eitem.hxx>
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
index 515b200dd8c3..1dc6a98a8a8b 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
@@ -28,7 +28,6 @@
 #include "ChartModelHelper.hxx"
 #include "AxisHelper.hxx"
 #include "LegendHelper.hxx"
-#include "NoWarningThisInCTOR.hxx"
 #include "ControllerLockGuard.hxx"
 
 namespace chart
diff --git a/chart2/source/inc/NoWarningThisInCTOR.hxx b/chart2/source/inc/NoWarningThisInCTOR.hxx
deleted file mode 100644
index 7e34066cbeb7..000000000000
--- a/chart2/source/inc/NoWarningThisInCTOR.hxx
+++ /dev/null
@@ -1,40 +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_CHART2_SOURCE_INC_NOWARNINGTHISINCTOR_HXX
-#define INCLUDED_CHART2_SOURCE_INC_NOWARNINGTHISINCTOR_HXX
-
-/** Include this file, if you have to use "this" in the base initializer list of
-    a constructor.
-
-    Include it only, if the usage of this is unavoidable, like in the
-    initialization of controls in a dialog.
-
-    Do not include this header in other header files, because this might result
-    in unintended suppression of the warning via indirect inclusion.
- */
-
-#ifdef _MSC_VER
-// warning C4355: 'this' : used in base member initializer list
-#  pragma warning (disable : 4355)
-#endif
-
-// INCLUDED_CHART2_SOURCE_INC_NOWARNINGTHISINCTOR_HXX
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index ee1c0e23ff36..4741d8c5c052 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -21,7 +21,6 @@
 #include "servicenames.hxx"
 #include "MediaDescriptorHelper.hxx"
 #include "macros.hxx"
-#include "NoWarningThisInCTOR.hxx"
 #include "DataSourceHelper.hxx"
 #include "ChartModelHelper.hxx"
 #include "DiagramHelper.hxx"