summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
Diffstat (limited to 'chart2')
-rw-r--r--chart2/inc/ChartView.hxx1
-rw-r--r--chart2/source/controller/accessibility/AccessibleBase.cxx1
-rw-r--r--chart2/source/controller/accessibility/AccessibleChartElement.cxx1
-rw-r--r--chart2/source/controller/accessibility/AccessibleChartView.cxx3
-rw-r--r--chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx1
-rw-r--r--chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx1
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx5
-rw-r--r--chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx1
-rw-r--r--chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx3
-rw-r--r--chart2/source/controller/dialogs/dlg_DataEditor.cxx3
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx1
-rw-r--r--chart2/source/controller/dialogs/dlg_NumberFormat.cxx6
-rw-r--r--chart2/source/controller/dialogs/dlg_View3D.cxx1
-rw-r--r--chart2/source/controller/dialogs/res_DataLabel.cxx7
-rw-r--r--chart2/source/controller/dialogs/res_DataLabel.hxx3
-rw-r--r--chart2/source/controller/dialogs/res_ErrorBar.cxx1
-rw-r--r--chart2/source/controller/dialogs/res_Trendline.hxx3
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx4
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx4
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx6
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx5
-rw-r--r--chart2/source/controller/dialogs/tp_AxisLabel.cxx3
-rw-r--r--chart2/source/controller/dialogs/tp_AxisPositions.cxx8
-rw-r--r--chart2/source/controller/dialogs/tp_AxisPositions.hxx1
-rw-r--r--chart2/source/controller/dialogs/tp_ChartType.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_DataSource.cxx1
-rw-r--r--chart2/source/controller/dialogs/tp_DataSource.hxx6
-rw-r--r--chart2/source/controller/dialogs/tp_DataSourceControls.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_PointGeometry.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_PointGeometry.hxx1
-rw-r--r--chart2/source/controller/dialogs/tp_Scale.cxx8
-rw-r--r--chart2/source/controller/dialogs/tp_Scale.hxx6
-rw-r--r--chart2/source/controller/dialogs/tp_SeriesToAxis.cxx3
-rw-r--r--chart2/source/controller/dialogs/tp_SeriesToAxis.hxx4
-rw-r--r--chart2/source/controller/dialogs/tp_TitleRotation.cxx3
-rw-r--r--chart2/source/controller/dialogs/tp_TitleRotation.hxx1
-rw-r--r--chart2/source/controller/drawinglayer/DrawViewWrapper.cxx7
-rw-r--r--chart2/source/controller/drawinglayer/ViewElementListProvider.cxx17
-rw-r--r--chart2/source/controller/inc/AccessibleChartView.hxx1
-rw-r--r--chart2/source/controller/inc/ConfigurationAccess.hxx1
-rw-r--r--chart2/source/controller/inc/ItemConverter.hxx1
-rw-r--r--chart2/source/controller/inc/dlg_ChartType.hxx3
-rw-r--r--chart2/source/controller/inc/dlg_CreationWizard.hxx1
-rw-r--r--chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx1
-rw-r--r--chart2/source/controller/inc/dlg_DataSource.hxx5
-rw-r--r--chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx3
-rw-r--r--chart2/source/controller/inc/dlg_InsertDataLabel.hxx3
-rw-r--r--chart2/source/controller/inc/dlg_View3D.hxx3
-rw-r--r--chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx3
-rw-r--r--chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx4
-rw-r--r--chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/ItemConverter.cxx1
-rw-r--r--chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx1
-rw-r--r--chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx5
-rw-r--r--chart2/source/controller/main/ChartController.cxx3
-rw-r--r--chart2/source/controller/main/ChartController_EditData.cxx1
-rw-r--r--chart2/source/controller/main/ChartController_Insert.cxx4
-rw-r--r--chart2/source/controller/main/ChartController_Position.cxx1
-rw-r--r--chart2/source/controller/main/ChartController_Properties.cxx3
-rw-r--r--chart2/source/controller/main/ChartController_TextEdit.cxx3
-rw-r--r--chart2/source/controller/main/ChartController_Tools.cxx8
-rw-r--r--chart2/source/controller/main/ChartController_Window.cxx6
-rw-r--r--chart2/source/controller/main/ChartDropTargetHelper.hxx1
-rw-r--r--chart2/source/controller/main/ChartTransferable.cxx2
-rw-r--r--chart2/source/controller/main/ConfigurationAccess.cxx3
-rw-r--r--chart2/source/controller/main/DragMethod_Base.cxx2
-rw-r--r--chart2/source/controller/main/DragMethod_Base.hxx3
-rw-r--r--chart2/source/controller/main/DragMethod_RotateDiagram.cxx1
-rw-r--r--chart2/source/controller/main/DragMethod_RotateDiagram.hxx1
-rw-r--r--chart2/source/controller/main/PositionAndSizeHelper.cxx1
-rw-r--r--chart2/source/controller/main/SelectionHelper.cxx2
-rw-r--r--chart2/source/controller/main/SelectionHelper.hxx1
-rw-r--r--chart2/source/controller/main/UndoCommandDispatch.cxx1
-rw-r--r--chart2/source/inc/LegendHelper.hxx1
-rw-r--r--chart2/source/inc/ModifyListenerCallBack.hxx1
-rw-r--r--chart2/source/inc/ObjectIdentifier.hxx1
-rw-r--r--chart2/source/inc/WrappedPropertySet.hxx2
-rw-r--r--chart2/source/inc/chartview/DrawModelWrapper.hxx3
-rw-r--r--chart2/source/model/filter/XMLFilter.cxx5
-rw-r--r--chart2/source/model/inc/XMLFilter.hxx1
-rw-r--r--chart2/source/model/main/ChartModel.cxx2
-rw-r--r--chart2/source/tools/AxisHelper.cxx1
-rw-r--r--chart2/source/tools/CharacterProperties.cxx1
-rw-r--r--chart2/source/tools/DiagramHelper.cxx1
-rw-r--r--chart2/source/tools/NumberFormatterWrapper.cxx2
-rw-r--r--chart2/source/tools/ObjectIdentifier.cxx1
-rw-r--r--chart2/source/tools/WrappedPropertySet.cxx1
-rw-r--r--chart2/source/view/charttypes/VSeriesPlotter.cxx1
-rw-r--r--chart2/source/view/diagram/VDiagram.cxx2
-rw-r--r--chart2/source/view/main/ChartView.cxx5
-rw-r--r--chart2/source/view/main/DrawModelWrapper.cxx12
91 files changed, 5 insertions, 259 deletions
diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index 4217ca9fd52e..bc458a9785fd 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -25,7 +25,6 @@
#include <cppuhelper/implbase10.hxx>
#include <cppuhelper/interfacecontainer.hxx>
-// header for class SfxListener
#include <svl/lstner.hxx>
#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <com/sun/star/drawing/XDrawPage.hpp>
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index a2b1a694fe75..db5e60331b08 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -32,7 +32,6 @@
#include <com/sun/star/drawing/LineStyle.hpp>
#include <com/sun/star/drawing/FillStyle.hpp>
#include <rtl/ustrbuf.hxx>
-// for SolarMutex
#include <vcl/svapp.hxx>
#include <rtl/uuid.h>
#include <cppuhelper/queryinterface.hxx>
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
index 617ee8e3e436..0f89470e162e 100644
--- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
@@ -30,7 +30,6 @@
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
-// for SolarMutex
#include <vcl/svapp.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx
index 62e23c6fe63a..83bec76014c8 100644
--- a/chart2/source/controller/accessibility/AccessibleChartView.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx
@@ -34,10 +34,7 @@
#include <rtl/ustring.hxx>
#include <vcl/window.hxx>
#include <toolkit/helper/vclunohelper.hxx>
-// for SolarMutex
#include <vcl/svapp.hxx>
-
-// header for typedef MutexGuard
#include <osl/mutex.hxx>
using namespace ::com::sun::star;
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
index 369e212c95bb..ddef4f497d31 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
@@ -26,7 +26,6 @@
#include <com/sun/star/chart2/XDiagram.hpp>
-// header for class OPropertyArrayHelper
#include <cppuhelper/propshlp.hxx>
#include <cppuhelper/implbase6.hxx>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
index c4c003bea4fc..9d6f0f0dd5cc 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
@@ -25,7 +25,6 @@
#include <com/sun/star/chart2/XDiagram.hpp>
-// header for class OPropertyArrayHelper
#include <cppuhelper/propshlp.hxx>
#include <cppuhelper/implbase6.hxx>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
index b8f9a8e1827e..bc71beefb35c 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
@@ -28,16 +28,11 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/chart/ChartSymbolType.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
-
#include <com/sun/star/graphic/GraphicProvider.hpp>
#include <com/sun/star/graphic/XGraphicProvider.hpp>
-// for UNO_NAME_GRAPHOBJ_URLPREFIX
#include <editeng/unoprnms.hxx>
-
-// for Graphic
#include <vcl/graph.hxx>
-// for GraphicObject
#include <svtools/grfmgr.hxx>
#include <vcl/outdev.hxx>
diff --git a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
index f564673cc05d..34aec553d199 100644
--- a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
+++ b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
@@ -19,7 +19,6 @@
#include "TimerTriggeredControllerLock.hxx"
-// header for define EDIT_UPDATEDATA_TIMEOUT
#include <vcl/edit.hxx>
namespace chart
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index dfd24d7647de..45d1e01e1ddf 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -24,12 +24,9 @@
#include "ContainerHelper.hxx"
#include "TimerTriggeredControllerLock.hxx"
#include <osl/mutex.hxx>
-// header for class Application
#include <vcl/svapp.hxx>
#include <toolkit/awt/vclxwindow.hxx>
-// header for define RET_CANCEL
#include <vcl/msgbox.hxx>
-// header for class OImplementationId
#include <cppuhelper/typeprovider.hxx>
#include <comphelper/servicehelper.hxx>
#include <com/sun/star/awt/Point.hpp>
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
index ddba251a56d3..a1ebedc7bafc 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
@@ -27,10 +27,7 @@
#include <vcl/taskpanelist.hxx>
#include <svtools/miscopt.hxx>
#include <unotools/pathoptions.hxx>
-
-// for SfxBoolItem
#include <svl/eitem.hxx>
-
#include <vcl/edit.hxx>
#include <com/sun/star/frame/XStorable.hpp>
diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
index 1dad1d823969..bff841eb8640 100644
--- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
@@ -24,7 +24,6 @@
#include "HelpIds.hrc"
#include "ObjectNameProvider.hxx"
-// header for class SfxBoolItem
#include <svl/eitem.hxx>
namespace chart
diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
index 5d22669b8452..332fcfee6b33 100644
--- a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
+++ b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
@@ -19,17 +19,11 @@
#include "dlg_NumberFormat.hxx"
-// header for class SfxItemSet
#include <svl/itemset.hxx>
-
-// header for class SvxNumberInfoItem
#include <svx/numinf.hxx>
-
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
#include <sfx2/tabdlg.hxx>
-
-// header for SvNumberFormatter
#include <svl/zforlist.hxx>
namespace chart
diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx
index 61f382668247..d15e8b6bb942 100644
--- a/chart2/source/controller/dialogs/dlg_View3D.cxx
+++ b/chart2/source/controller/dialogs/dlg_View3D.cxx
@@ -29,7 +29,6 @@
#include "ControllerLockGuard.hxx"
#include <com/sun/star/beans/XPropertySet.hpp>
-// for RET_OK
#include <vcl/msgbox.hxx>
namespace chart
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 383f4920b8ff..a775e72dca01 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -22,22 +22,15 @@
#include "chartview/ChartSfxItemIds.hxx"
#include "dlg_NumberFormat.hxx"
-// header for class SvxNumberInfoItem
#include <svx/numinf.hxx>
#include <svl/eitem.hxx>
-// for SfxUInt32Item
#include <svl/intitem.hxx>
-// header for class SfxStringItem
#include <svl/stritem.hxx>
-//SfxIntegerListItem
#include <svl/ilstitem.hxx>
#include <editeng/eeitem.hxx>
#include <editeng/frmdiritem.hxx>
-
-// header for define RET_OK
#include <vcl/msgbox.hxx>
#include <svx/svxids.hrc>
-// header for SvNumberFormatter
#include <svl/zforlist.hxx>
#include <svtools/controldims.hrc>
diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx
index 69317e857c36..8875136c6763 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.hxx
@@ -21,13 +21,10 @@
#define NUMBER_SEPARATORS 4
-// header for class CheckBox
#include <vcl/button.hxx>
#include <vcl/layout.hxx>
-// header for class SfxItemSet
#include <svl/itemset.hxx>
#include "TextDirectionListBox.hxx"
-
#include <svx/dialcontrol.hxx>
#include <svx/wrapfield.hxx>
#include <sfx2/tabdlg.hxx>
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 4270b5311110..60b49879521e 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -21,7 +21,6 @@
#include "ResId.hxx"
#include "Bitmaps.hrc"
#include "RangeSelectionHelper.hxx"
-// for RANGE_SELECTION_INVALID_RANGE_BACKGROUND_COLOR
#include "TabPageNotifiable.hxx"
#include "macros.hxx"
diff --git a/chart2/source/controller/dialogs/res_Trendline.hxx b/chart2/source/controller/dialogs/res_Trendline.hxx
index bf26e307389f..8399b61b583f 100644
--- a/chart2/source/controller/dialogs/res_Trendline.hxx
+++ b/chart2/source/controller/dialogs/res_Trendline.hxx
@@ -25,10 +25,9 @@
#include <svl/itemset.hxx>
#include <svx/chrtitem.hxx>
#include <vcl/field.hxx>
-// header for class SvNumberformat
#include <svl/zformat.hxx>
-// header for class FormattedField
#include <svtools/fmtfield.hxx>
+
namespace chart
{
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
index c0ee28746d0b..c08cea186df6 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
@@ -19,13 +19,9 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_3D_SCENEAPPEARANCE_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_3D_SCENEAPPEARANCE_HXX
-// header for class TabPage
#include <vcl/tabpage.hxx>
-// header for class MetricField
#include <vcl/field.hxx>
-// header for class CheckBox
#include <vcl/button.hxx>
-// header for class ListBox
#include <vcl/lstbox.hxx>
#include <com/sun/star/drawing/ShadeMode.hpp>
#include <com/sun/star/frame/XModel.hpp>
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx
index e6dccc54131c..decc521e87fa 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx
@@ -22,13 +22,9 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <basegfx/matrix/b3dhommatrix.hxx>
-// header for class TabPage
#include <vcl/tabpage.hxx>
-// header for class FixedLine
#include <vcl/fixed.hxx>
-// header for class MetricField
#include <vcl/field.hxx>
-// header for class OKButton
#include <vcl/button.hxx>
#include "ControllerLockGuard.hxx"
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 9ab6183885ef..839f200e9172 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -23,16 +23,10 @@
#include "CommonConverters.hxx"
#include "svx/dialogs.hrc"
-// header for define SVX_RES
#include <svx/dialmgr.hxx>
#include <rtl/math.hxx>
-
-// header for class SvColorDialog
#include <svtools/colrdlg.hxx>
-
-// header for define RET_OK
#include <vcl/msgbox.hxx>
-
#include <svx/svx3ditems.hxx>
#include <svx/svddef.hxx>
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
index 09d1725daf9c..f08560be63a5 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
@@ -24,15 +24,10 @@
#include <com/sun/star/beans/XPropertySet.hpp>
-// header for class TabPage
#include <vcl/tabpage.hxx>
-// header for class FixedText
#include <vcl/fixed.hxx>
-// header for class CheckBox
#include <vcl/button.hxx>
-// header for class ColorLB
#include <svx/dlgctrl.hxx>
-// header for class SvxLightCtl3D
#include <svx/dlgctl3d.hxx>
namespace chart
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index eaa6ed5dc8f0..efa7aa405dd5 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -23,10 +23,7 @@
#include "TabPages.hrc"
#include "chartview/ChartSfxItemIds.hxx"
-// header for SvxChartTextOrientItem / SvxChartTextOrderItem
#include <svx/chrtitem.hxx>
-
-// header for SfxInt32Item
#include <svl/intitem.hxx>
#include <editeng/eeitem.hxx>
#include <editeng/frmdiritem.hxx>
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 0108a454fcfc..a0e28ca7ca2f 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -27,19 +27,11 @@
#include <svx/svxids.hrc>
#include <rtl/math.hxx>
-// header for class SvxDoubleItem
#include <svx/chrtitem.hxx>
-// header for class SfxBoolItem
#include <svl/eitem.hxx>
-// header for SfxInt32Item
#include <svl/intitem.hxx>
-
-// header for class WarningBox
#include <vcl/msgbox.hxx>
-
-// header for class SvNumberformat
#include <svl/zformat.hxx>
-
#include <svtools/controldims.hrc>
#include <com/sun/star/chart/ChartAxisPosition.hpp>
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
index b143b44a15b3..21c92f0a331f 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_AXISPOSITIONS_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_AXISPOSITIONS_HXX
-// header for SfxTabPage
#include <sfx2/tabdlg.hxx>
#include <svtools/fmtfield.hxx>
#include <vcl/fixed.hxx>
diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx
index e876d59097e7..4d3229a94096 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.hxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.hxx
@@ -30,9 +30,7 @@
#include <svtools/wizardmachine.hxx>
#include <svtools/valueset.hxx>
#include <vcl/fixed.hxx>
-// header for class MetricField
#include <vcl/field.hxx>
-// header for class ListBox
#include <vcl/lstbox.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 02e386f93a19..8a83c5b8d441 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -36,7 +36,6 @@
#include <com/sun/star/util/XModifiable.hpp>
#include <com/sun/star/chart2/data/XDataSink.hpp>
-// for RET_OK
#include <vcl/msgbox.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx
index de20639b147e..b89d4d4499f3 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.hxx
@@ -24,17 +24,11 @@
#include "DialogModel.hxx"
#include "TabPageNotifiable.hxx"
-// header for class Edit
#include <vcl/edit.hxx>
-// header for class ListBox
#include <vcl/lstbox.hxx>
-// header for class PushButton, OKButton, CancelButton, HelpButton
#include <vcl/button.hxx>
-// header for class FixedText, FixedLine
#include <vcl/fixed.hxx>
-// header for class SvTabListBox
#include <svtools/svtabbx.hxx>
-// header for class SvTreeListBox
#include <svtools/treelistbox.hxx>
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/chart2/XDiagram.hpp>
diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
index 4497135c44a8..82ae7addf888 100644
--- a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
@@ -23,9 +23,7 @@
#include <com/sun/star/chart2/XDataSeries.hpp>
#include <com/sun/star/chart2/data/XLabeledDataSequence.hpp>
-// header for class SvTabListBox
#include <svtools/svtabbx.hxx>
-// header for class SvTreeListBox
#include <svtools/treelistbox.hxx>
#include "svtools/treelistentry.hxx"
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
index b30160cf94d8..68a20d907367 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
@@ -24,9 +24,7 @@
#include "chartview/ChartSfxItemIds.hxx"
-// header for SfxInt32Item
#include <svl/intitem.hxx>
-// header for class Svx3DHorizontalSegmentsItem
#include <svx/svx3ditems.hxx>
namespace chart
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.hxx b/chart2/source/controller/dialogs/tp_PointGeometry.hxx
index a1a3f295b6e8..b4098a7dcc5a 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.hxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_POINTGEOMETRY_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_POINTGEOMETRY_HXX
-// header for SfxTabPage
#include <sfx2/tabdlg.hxx>
namespace chart
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index 6edd87e1f2b6..a3df39f48df7 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -26,19 +26,11 @@
#include <svx/svxids.hrc>
#include <rtl/math.hxx>
-// header for class SvxDoubleItem
#include <svx/chrtitem.hxx>
-// header for class SfxBoolItem
#include <svl/eitem.hxx>
-// header for SfxInt32Item
#include <svl/intitem.hxx>
-
-// header for class WarningBox
#include <vcl/msgbox.hxx>
-
-// header for class SvNumberformat
#include <svl/zformat.hxx>
-
#include <svtools/controldims.hrc>
#include <com/sun/star/chart2/AxisType.hpp>
diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx
index f7203efdbe4a..6839c09ef9a8 100644
--- a/chart2/source/controller/dialogs/tp_Scale.hxx
+++ b/chart2/source/controller/dialogs/tp_Scale.hxx
@@ -19,17 +19,11 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_SCALE_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_SCALE_HXX
-// header for SfxTabPage
#include <sfx2/tabdlg.hxx>
-// header for class FormattedField
#include <svtools/fmtfield.hxx>
-// header for FixedText
#include <vcl/fixed.hxx>
-// header for CheckBox
#include <vcl/button.hxx>
-// header for MetricField
#include <vcl/field.hxx>
-// header for class ListBox
#include <vcl/lstbox.hxx>
namespace chart
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index 4b2fed5c0b5a..683fdc167c3c 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -22,11 +22,8 @@
#include "ResId.hxx"
#include "chartview/ChartSfxItemIds.hxx"
-// header for class SfxBoolItem
#include <svl/eitem.hxx>
-// header for SfxInt32Item
#include <svl/intitem.hxx>
-//SfxIntegerListItem
#include <svl/ilstitem.hxx>
#include <svtools/controldims.hrc>
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
index cabe8370530a..2336eb5c9569 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
@@ -19,13 +19,9 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_SERIESTOAXIS_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_SERIESTOAXIS_HXX
-// header for SfxTabPage
#include <sfx2/tabdlg.hxx>
-// header for FixedText
#include <vcl/fixed.hxx>
-// header for CheckBox
#include <vcl/button.hxx>
-// header for MetricField
#include <vcl/field.hxx>
namespace chart
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index ee5237c41640..ab0dc4c746da 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -23,10 +23,9 @@
#include "TabPages.hrc"
#include "chartview/ChartSfxItemIds.hxx"
#include "HelpIds.hrc"
+
#include <editeng/eeitem.hxx>
#include <editeng/frmdiritem.hxx>
-
-// header for class SfxInt32Item
#include <svl/intitem.hxx>
namespace chart
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
index 9740b9f29dda..14fff7286694 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_TITLEROTATION_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_TITLEROTATION_HXX
-// header for SfxTabPage
#include <sfx2/tabdlg.hxx>
#include <svx/dialcontrol.hxx>
#include <svx/wrapfield.hxx>
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index f97c537a411a..c32ee0141b57 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -24,20 +24,13 @@
#include <unotools/lingucfg.hxx>
#include <editeng/langitem.hxx>
-// header for class SdrPage
#include <svx/svdpage.hxx>
-//header for class SdrPageView
#include <svx/svdpagv.hxx>
-// header for class SdrModel
#include <svx/svdmodel.hxx>
-// header for class E3dScene
#include <svx/scene3d.hxx>
#include <svx/svdetc.hxx>
#include <svx/svdoutl.hxx>
-
#include <svx/svxids.hrc>
-
-// header for class SvxShape
#include <svx/unoshape.hxx>
#include <editeng/fhgtitem.hxx>
diff --git a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
index 8ad08cc8cd09..af648daba2ad 100644
--- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
+++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
@@ -22,39 +22,24 @@
#include "chartview/DataPointSymbolSupplier.hxx"
#include "macros.hxx"
#include "DrawViewWrapper.hxx"
+
#include <svx/xtable.hxx>
#include <svx/XPropertyTable.hxx>
#include <svx/unofill.hxx>
#include <svx/unoapi.hxx>
-
-// header for class NameOrIndex
#include <svx/xit.hxx>
-// header for class XFillBitmapItem
#include <svx/xbtmpit.hxx>
#include <svx/xflftrit.hxx>
#include <svx/xlndsit.hxx>
#include <svx/xflhtit.hxx>
#include <svx/xflgrit.hxx>
-// header for class XLineStartItem
#include <svx/xlnstit.hxx>
-// header for class XLineEndItem
#include <svx/xlnedit.hxx>
-
-//oldChartModelWrapper
-
-// header for class SfxItemPool
#include <svl/itempool.hxx>
-// header for class FontList
#include <svtools/ctrltool.hxx>
-// header for class Application
#include <vcl/svapp.hxx>
-// header for class SdrObject
#include <svx/svdobj.hxx>
-
-//for creation of a symbol Graphic
-// header for class VirtualDevice
#include <vcl/virdev.hxx>
-// header for class SdrView
#include <svx/svdview.hxx>
namespace chart
diff --git a/chart2/source/controller/inc/AccessibleChartView.hxx b/chart2/source/controller/inc/AccessibleChartView.hxx
index 3e5ce2878a07..84dc977966e1 100644
--- a/chart2/source/controller/inc/AccessibleChartView.hxx
+++ b/chart2/source/controller/inc/AccessibleChartView.hxx
@@ -23,7 +23,6 @@
#include "MutexContainer.hxx"
#include "ServiceMacros.hxx"
#include <cppuhelper/implbase2.hxx>
-// header for class WeakReference
#include <cppuhelper/weakref.hxx>
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/frame/XModel.hpp>
diff --git a/chart2/source/controller/inc/ConfigurationAccess.hxx b/chart2/source/controller/inc/ConfigurationAccess.hxx
index 679e7fcd4eba..7ec2c1a71016 100644
--- a/chart2/source/controller/inc/ConfigurationAccess.hxx
+++ b/chart2/source/controller/inc/ConfigurationAccess.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_CONFIGURATIONACCESS_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_CONFIGURATIONACCESS_HXX
-// header for enum FieldUnit
#include <tools/fldunit.hxx>
namespace chart
diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx
index e4143c129a38..ea8850d766ff 100644
--- a/chart2/source/controller/inc/ItemConverter.hxx
+++ b/chart2/source/controller/inc/ItemConverter.hxx
@@ -24,7 +24,6 @@
#include <svl/itemset.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
-// for pair
#include <utility>
namespace comphelper
diff --git a/chart2/source/controller/inc/dlg_ChartType.hxx b/chart2/source/controller/inc/dlg_ChartType.hxx
index 992aa2d4956e..227bf968aea2 100644
--- a/chart2/source/controller/inc/dlg_ChartType.hxx
+++ b/chart2/source/controller/inc/dlg_ChartType.hxx
@@ -19,11 +19,8 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_CHARTTYPE_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_CHARTTYPE_HXX
-// header for class ModalDialog
#include <vcl/dialog.hxx>
-// header for class FixedLine
#include <vcl/fixed.hxx>
-// header for class OKButton
#include <vcl/button.hxx>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx
index fbf64b63b9dc..0b9739b4940d 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx
@@ -28,7 +28,6 @@
#include <svtools/roadmapwizard.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
-// for auto_ptr
#include <memory>
namespace chart
diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
index 5bb42e98720a..4d4b8c0a3037 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
@@ -32,7 +32,6 @@
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-// header for define DECL_LINK
#include <tools/link.hxx>
#include <vcl/vclevent.hxx>
diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx b/chart2/source/controller/inc/dlg_DataSource.hxx
index a960e56169b2..6341fe050094 100644
--- a/chart2/source/controller/inc/dlg_DataSource.hxx
+++ b/chart2/source/controller/inc/dlg_DataSource.hxx
@@ -19,19 +19,14 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_DATASOURCE_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_DATASOURCE_HXX
-// header for class TabDialog
#include <vcl/tabdlg.hxx>
-// header for class TabControl
#include <vcl/tabctrl.hxx>
-// header for class OKButton
#include <vcl/button.hxx>
-
#include "TabPageNotifiable.hxx"
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/chart2/XChartDocument.hpp>
-// for auto_ptr
#include <memory>
namespace chart
diff --git a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx
index 30ae588ffac7..82636bc2090e 100644
--- a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx
+++ b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx
@@ -19,11 +19,8 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_INSERTAXIS_GRID_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_INSERTAXIS_GRID_HXX
-// header for class ModalDialog
#include <vcl/dialog.hxx>
-// header for class FixedLine
#include <vcl/fixed.hxx>
-// header for class CheckBox
#include <vcl/button.hxx>
#include <com/sun/star/uno/Sequence.hxx>
diff --git a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
index 311707509c75..35268d40d1f6 100644
--- a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
+++ b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
@@ -19,11 +19,8 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_INSERTDATALABEL_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_INSERTDATALABEL_HXX
-// header for class ModalDialog
#include <vcl/dialog.hxx>
-// header for class CheckBox
#include <vcl/button.hxx>
-// header for class SfxItemSet
#include <svl/itemset.hxx>
#include <boost/scoped_ptr.hpp>
diff --git a/chart2/source/controller/inc/dlg_View3D.hxx b/chart2/source/controller/inc/dlg_View3D.hxx
index 7ffa768f5ee4..6cc64087df78 100644
--- a/chart2/source/controller/inc/dlg_View3D.hxx
+++ b/chart2/source/controller/inc/dlg_View3D.hxx
@@ -22,11 +22,8 @@
#include <com/sun/star/drawing/ShadeMode.hpp>
#include <com/sun/star/frame/XModel.hpp>
-// header for class TabDialog
#include <vcl/tabdlg.hxx>
-// header for class TabControl
#include <vcl/tabctrl.hxx>
-// header for class XColorList
#include <svx/xtable.hxx>
#include "ControllerLockGuard.hxx"
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index 6a15e71846f7..ee25d44f3d8c 100644
--- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -37,11 +37,8 @@
#include <com/sun/star/chart2/AxisOrientation.hpp>
#include <com/sun/star/chart2/AxisType.hpp>
-// for SfxBoolItem
#include <svl/eitem.hxx>
-// for SvxDoubleItem
#include <svx/chrtitem.hxx>
-// for SfxInt32Item
#include <svl/intitem.hxx>
#include <rtl/math.hxx>
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index 57643b71db85..f03c41075d8d 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -34,19 +34,15 @@
#include <com/sun/star/chart2/DataPointLabel.hpp>
#include <com/sun/star/chart2/Symbol.hpp>
-// header for class XFillColorItem
#include <svx/xflclit.hxx>
#include <svl/intitem.hxx>
#include <editeng/sizeitem.hxx>
-// header for class SfxStringItem
#include <svl/stritem.hxx>
#include <editeng/brushitem.hxx>
-//SfxIntegerListItem
#include <svl/ilstitem.hxx>
#include <vcl/graph.hxx>
#include <com/sun/star/graphic/XGraphic.hpp>
-// for SVX_SYMBOLTYPE_...
#include <svx/tabline.hxx>
#include <functional>
diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
index 65263e1fe37f..f7e03ff9458d 100644
--- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
@@ -36,9 +36,7 @@
#include <svx/xfltrit.hxx>
#include <svx/xlntrit.hxx>
#include <editeng/eeitem.hxx>
-// for SfxBoolItem
#include <svl/eitem.hxx>
-// for XFillGradientStepCountItem
#include <svx/xgrscit.hxx>
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/chart2/FillBitmap.hpp>
diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
index 6c35654e02f1..74bf8a26ac26 100644
--- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
@@ -22,7 +22,6 @@
#include <com/sun/star/lang/XComponent.hpp>
#include <svl/itemprop.hxx>
#include <svl/itemiter.hxx>
-// header for class SfxWhichIter
#include <svl/whiter.hxx>
#include <svx/svxids.hrc>
diff --git a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
index 918186730676..df4b19ba4c4a 100644
--- a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
@@ -26,7 +26,6 @@
#include <com/sun/star/chart2/XRegressionCurve.hpp>
-// for SfxBoolItem
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
#include <svl/stritem.hxx>
diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
index 34042ca23fb8..362f3d9685f3 100644
--- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
@@ -33,14 +33,11 @@
#include <com/sun/star/chart/MissingValueTreatment.hpp>
#include <com/sun/star/chart2/XDataSeries.hpp>
-// for SfxBoolItem
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
-
-//SfxIntegerListItem
#include <svl/ilstitem.hxx>
-
#include <rtl/math.hxx>
+
#include <functional>
#include <algorithm>
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index b711d6b40188..aaf3223ba0b1 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -59,10 +59,7 @@
#include <com/sun/star/document/XUndoManagerSupplier.hpp>
#include <com/sun/star/document/XUndoAction.hpp>
-
-// header for define RET_OK
#include <vcl/msgbox.hxx>
-
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svapp.hxx>
diff --git a/chart2/source/controller/main/ChartController_EditData.cxx b/chart2/source/controller/main/ChartController_EditData.cxx
index ec72c7c912f1..c87f1678318a 100644
--- a/chart2/source/controller/main/ChartController_EditData.cxx
+++ b/chart2/source/controller/main/ChartController_EditData.cxx
@@ -28,7 +28,6 @@
#include "ResId.hxx"
#include "Strings.hrc"
-// for RET_OK
#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx
index ea435b650227..dff59c8d33ee 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -55,13 +55,9 @@
#include <com/sun/star/chart/ErrorBarStyle.hpp>
#include <svx/ActionDescriptionProvider.hxx>
-// header for define RET_OK
#include <vcl/msgbox.hxx>
-// header for class OUStringBuffer
#include <rtl/ustrbuf.hxx>
-// header for class Application
#include <vcl/svapp.hxx>
-// header for class ::vos::OGuard
#include <osl/mutex.hxx>
using namespace ::com::sun::star;
diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx
index e77fa95d5155..f83a149a3a96 100644
--- a/chart2/source/controller/main/ChartController_Position.cxx
+++ b/chart2/source/controller/main/ChartController_Position.cxx
@@ -32,7 +32,6 @@
#include "CommonConverters.hxx"
#include <svx/ActionDescriptionProvider.hxx>
-// header for define RET_OK
#include <vcl/msgbox.hxx>
#include <svx/svxids.hrc>
#include <svx/rectenum.hxx>
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx
index 5c05794cd932..dd2e0fa3070c 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -52,12 +52,9 @@
#include "RegressionCurveHelper.hxx"
#include <com/sun/star/chart2/XChartDocument.hpp>
-//for auto_ptr
#include <memory>
-// header for define RET_OK
#include <vcl/msgbox.hxx>
-// for SolarMutex
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
#include <svx/ActionDescriptionProvider.hxx>
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx
index 729c816116b2..c9ae4572ffb9 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -32,10 +32,7 @@
#include "chartview/DrawModelWrapper.hxx"
#include <svx/svdotext.hxx>
-
-// header for define RET_OK
#include <vcl/msgbox.hxx>
-// header for class SdrOutliner
#include <svx/svdoutl.hxx>
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 1fbd1760b793..ff616975c7e1 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -52,24 +52,16 @@
#include <com/sun/star/chart/ErrorBarStyle.hpp>
#include <svx/ActionDescriptionProvider.hxx>
-// for TransferableDataHelper/TransferableHelper
#include <svtools/transfer.hxx>
-// for SotStorageStreamRef
#include <sot/storage.hxx>
-// for Graphic
#include <vcl/graph.hxx>
-// for SvxDrawingLayerImport/SvxUnoDrawingModel
#include <svx/unomodel.hxx>
-// for SdrModel
#include <svx/svdmodel.hxx>
-// for OInputStreamWrapper
#include <unotools/streamwrap.hxx>
-// for SolarMutex
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
-// for OutlinerView
#include <editeng/outliner.hxx>
#include <svx/svditer.hxx>
#include <svx/svdpage.hxx>
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index aded435f7e4a..a60f172b3018 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -62,19 +62,13 @@
#include <svx/svxids.hrc>
#include <svx/ActionDescriptionProvider.hxx>
-// header for class E3dObject
#include <svx/obj3d.hxx>
-// header for class E3dScene
#include <svx/scene3d.hxx>
-// header for class SdrDragMethod
#include <svx/svddrgmt.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <osl/mutex.hxx>
-
-// for InfoBox
#include <vcl/msgbox.hxx>
-
#include <rtl/math.hxx>
#include <svtools/acceleratorexecute.hxx>
diff --git a/chart2/source/controller/main/ChartDropTargetHelper.hxx b/chart2/source/controller/main/ChartDropTargetHelper.hxx
index fca3b8715c39..cbb99342da53 100644
--- a/chart2/source/controller/main/ChartDropTargetHelper.hxx
+++ b/chart2/source/controller/main/ChartDropTargetHelper.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_CHARTDROPTARGETHELPER_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_CHARTDROPTARGETHELPER_HXX
-// for DropTargetHelper
#include <svtools/transfer.hxx>
namespace com { namespace sun { namespace star {
diff --git a/chart2/source/controller/main/ChartTransferable.cxx b/chart2/source/controller/main/ChartTransferable.cxx
index a04d755655e6..20f46ac7d2ca 100644
--- a/chart2/source/controller/main/ChartTransferable.cxx
+++ b/chart2/source/controller/main/ChartTransferable.cxx
@@ -28,8 +28,6 @@
#include <svx/svdmodel.hxx>
#include <svx/svdpage.hxx>
#include <svx/unomodel.hxx>
-
-// header for class SdrView
#include <svx/svdview.hxx>
#define CHARTTRANSFER_OBJECTTYPE_DRAWMODEL 1
diff --git a/chart2/source/controller/main/ConfigurationAccess.cxx b/chart2/source/controller/main/ConfigurationAccess.cxx
index 96c13df4de27..50f638a31358 100644
--- a/chart2/source/controller/main/ConfigurationAccess.cxx
+++ b/chart2/source/controller/main/ConfigurationAccess.cxx
@@ -20,11 +20,8 @@
#include "ConfigurationAccess.hxx"
#include "macros.hxx"
-// header for class SvtSysLocale
#include <unotools/syslocale.hxx>
-// header for class ConfigItem
#include <unotools/configitem.hxx>
-// header for rtl::Static
#include <rtl/instance.hxx>
namespace chart
diff --git a/chart2/source/controller/main/DragMethod_Base.cxx b/chart2/source/controller/main/DragMethod_Base.cxx
index 6da22f590ab7..f0213a97956a 100644
--- a/chart2/source/controller/main/DragMethod_Base.cxx
+++ b/chart2/source/controller/main/DragMethod_Base.cxx
@@ -24,8 +24,8 @@
#include "macros.hxx"
#include "ObjectNameProvider.hxx"
#include "ObjectIdentifier.hxx"
+
#include <rtl/math.hxx>
-//header for class SdrPageView
#include <svx/svdpagv.hxx>
#include <svx/ActionDescriptionProvider.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/chart2/source/controller/main/DragMethod_Base.hxx b/chart2/source/controller/main/DragMethod_Base.hxx
index dbc33d17b947..a068a0134d82 100644
--- a/chart2/source/controller/main/DragMethod_Base.hxx
+++ b/chart2/source/controller/main/DragMethod_Base.hxx
@@ -21,10 +21,7 @@
#include "DrawViewWrapper.hxx"
#include <svx/ActionDescriptionProvider.hxx>
-// header for class SdrDragMethod
#include <svx/svddrgmt.hxx>
-
-// header for class WeakReference
#include <cppuhelper/weakref.hxx>
namespace chart
diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
index 9daa3dbee01b..eb0ea6053a65 100644
--- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
+++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
@@ -30,7 +30,6 @@
#include <svx/sdr/overlay/overlaypolypolygon.hxx>
#include <svx/sdr/overlay/overlaymanager.hxx>
-// header for class E3dScene
#include <svx/scene3d.hxx>
#include <basegfx/matrix/b3dhommatrix.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx
index 98825dfea7f2..919fec0c8388 100644
--- a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx
+++ b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx
@@ -21,7 +21,6 @@
#include "DragMethod_Base.hxx"
-// header for class ::basegfx::B3DPolyPolygon
#include <basegfx/polygon/b3dpolypolygon.hxx>
namespace chart
diff --git a/chart2/source/controller/main/PositionAndSizeHelper.cxx b/chart2/source/controller/main/PositionAndSizeHelper.cxx
index 7b7f255009f5..5283348379cc 100644
--- a/chart2/source/controller/main/PositionAndSizeHelper.cxx
+++ b/chart2/source/controller/main/PositionAndSizeHelper.cxx
@@ -27,7 +27,6 @@
#include <com/sun/star/chart2/RelativeSize.hpp>
#include "chartview/ExplicitValueProvider.hxx"
-// header for class Rectangle
#include <tools/gen.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx
index cb264ea022dc..486f5a6d4ff4 100644
--- a/chart2/source/controller/main/SelectionHelper.cxx
+++ b/chart2/source/controller/main/SelectionHelper.cxx
@@ -23,11 +23,9 @@
#include "DiagramHelper.hxx"
#include "ChartModelHelper.hxx"
-// header for class SdrObjList
#include <svx/svdpage.hxx>
#include <svx/svditer.hxx>
#include "svx/obj3d.hxx"
-// header for class SdrPathObj
#include <svx/svdopath.hxx>
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
diff --git a/chart2/source/controller/main/SelectionHelper.hxx b/chart2/source/controller/main/SelectionHelper.hxx
index 3a57622a433c..9a5f56534e3f 100644
--- a/chart2/source/controller/main/SelectionHelper.hxx
+++ b/chart2/source/controller/main/SelectionHelper.hxx
@@ -23,7 +23,6 @@
#include "ObjectIdentifier.hxx"
class SdrObject;
-// header for enum SdrDragMode
#include <svx/svdtypes.hxx>
#include <com/sun/star/drawing/XShape.hpp>
diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx
index 09ca819723e5..88e700aaa6c0 100644
--- a/chart2/source/controller/main/UndoCommandDispatch.cxx
+++ b/chart2/source/controller/main/UndoCommandDispatch.cxx
@@ -28,7 +28,6 @@
#include <vcl/svapp.hxx>
#include <tools/diagnose_ex.h>
-// for resource strings STR_UNDO and STR_REDO
#include <svtools/svtools.hrc>
#include <svtools/svtresid.hxx>
diff --git a/chart2/source/inc/LegendHelper.hxx b/chart2/source/inc/LegendHelper.hxx
index e30297c42b6f..daed6775a397 100644
--- a/chart2/source/inc/LegendHelper.hxx
+++ b/chart2/source/inc/LegendHelper.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_CHART2_SOURCE_INC_LEGENDHELPER_HXX
#define INCLUDED_CHART2_SOURCE_INC_LEGENDHELPER_HXX
-// header for class OUString
#include <rtl/ustring.hxx>
#include <com/sun/star/chart2/XLegend.hpp>
#include <com/sun/star/chart2/XDiagram.hpp>
diff --git a/chart2/source/inc/ModifyListenerCallBack.hxx b/chart2/source/inc/ModifyListenerCallBack.hxx
index 8e2b7901f7c6..de6412cd274a 100644
--- a/chart2/source/inc/ModifyListenerCallBack.hxx
+++ b/chart2/source/inc/ModifyListenerCallBack.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_CHART2_SOURCE_INC_MODIFYLISTENERCALLBACK_HXX
#define INCLUDED_CHART2_SOURCE_INC_MODIFYLISTENERCALLBACK_HXX
-// header for class Link
#include <tools/link.hxx>
#include <com/sun/star/util/XModifyBroadcaster.hpp>
#include <com/sun/star/util/XModifyListener.hpp>
diff --git a/chart2/source/inc/ObjectIdentifier.hxx b/chart2/source/inc/ObjectIdentifier.hxx
index 01809de9d128..d30a00df8a2b 100644
--- a/chart2/source/inc/ObjectIdentifier.hxx
+++ b/chart2/source/inc/ObjectIdentifier.hxx
@@ -28,7 +28,6 @@
#include "charttoolsdllapi.hxx"
#include "ChartModel.hxx"
-// header for class OUString
#include <rtl/ustring.hxx>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/chart2/source/inc/WrappedPropertySet.hxx b/chart2/source/inc/WrappedPropertySet.hxx
index 5fa0d634b737..e3b144682f26 100644
--- a/chart2/source/inc/WrappedPropertySet.hxx
+++ b/chart2/source/inc/WrappedPropertySet.hxx
@@ -28,8 +28,6 @@
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/beans/Property.hpp>
#include <cppuhelper/implbase4.hxx>
-
-// header for class OPropertyArrayHelper, OMultiTypeInterfaceContainerHelperInt32
#include <cppuhelper/propshlp.hxx>
#include <vector>
diff --git a/chart2/source/inc/chartview/DrawModelWrapper.hxx b/chart2/source/inc/chartview/DrawModelWrapper.hxx
index 4d13598946f7..986a6b993eb8 100644
--- a/chart2/source/inc/chartview/DrawModelWrapper.hxx
+++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx
@@ -19,12 +19,9 @@
#ifndef INCLUDED_CHART2_SOURCE_INC_CHARTVIEW_DRAWMODELWRAPPER_HXX
#define INCLUDED_CHART2_SOURCE_INC_CHARTVIEW_DRAWMODELWRAPPER_HXX
-
#include <svx/svdmodel.hxx>
-// header for class SdrObject
#include <svx/svdobj.hxx>
-
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/drawing/XDrawPage.hpp>
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index 237c4e8388ca..f459bc938ef5 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -22,17 +22,12 @@
#include "MediaDescriptorHelper.hxx"
#include "ContainerHelper.hxx"
-// for ERRCODE_SFX_GENERAL etc.
-// header contains only macros
#include <svtools/sfxecode.hxx>
-// header for class SvtSaveOptions
#include <unotools/saveopt.hxx>
#include <comphelper/genericpropertyset.hxx>
-// header for struct PropertyMapEntry
#include <comphelper/propertysetinfo.hxx>
#include <comphelper/documentconstants.hxx>
-// header for class SotStorage
#include <sot/storage.hxx>
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx
index 500e6be86dbf..ad316d0c92b6 100644
--- a/chart2/source/model/inc/XMLFilter.hxx
+++ b/chart2/source/model/inc/XMLFilter.hxx
@@ -30,7 +30,6 @@
#include <com/sun/star/xml/sax/XWriter.hpp>
#include <osl/mutex.hxx>
-// for APPHELPER_... macros
#include "ServiceMacros.hxx"
namespace com { namespace sun { namespace star {
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 8468ecf71574..1b725ac05afc 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -38,7 +38,6 @@
#include <comphelper/InlineContainer.hxx>
#include <comphelper/processfactory.hxx>
-// header for class SvNumberFormatsSupplierObj
#include <svl/numuno.hxx>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
@@ -60,7 +59,6 @@
#include <com/sun/star/document/DocumentProperties.hpp>
#include <com/sun/star/chart2/XTimeBased.hpp>
-// header for class SvNumberFormatter
#include <svl/zforlist.hxx>
using ::com::sun::star::uno::Sequence;
diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index 600109454ec7..d5e6db4032a4 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -39,7 +39,6 @@
#include <com/sun/star/chart2/XDataSeriesContainer.hpp>
#include <com/sun/star/chart2/data/XDataSource.hpp>
-// header for class OUStringBuffer
#include <rtl/ustrbuf.hxx>
#include <rtl/math.hxx>
diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx
index 5aac56053fdb..2918d6061f2a 100644
--- a/chart2/source/tools/CharacterProperties.cxx
+++ b/chart2/source/tools/CharacterProperties.cxx
@@ -41,7 +41,6 @@
#include <comphelper/InlineContainer.hxx>
-// header for struct SvtLinguConfig
#include <unotools/lingucfg.hxx>
#include <i18nlangtag/mslangid.hxx>
#include <i18nlangtag/languagetag.hxx>
diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx
index 8d853cc6501b..27d3c7c3fb0b 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -55,7 +55,6 @@
#include <unotools/saveopt.hxx>
#include <rtl/math.hxx>
#include <svl/zformat.hxx>
-// header for class Application
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
diff --git a/chart2/source/tools/NumberFormatterWrapper.cxx b/chart2/source/tools/NumberFormatterWrapper.cxx
index f543f27528b1..cef25c27f133 100644
--- a/chart2/source/tools/NumberFormatterWrapper.cxx
+++ b/chart2/source/tools/NumberFormatterWrapper.cxx
@@ -20,9 +20,7 @@
#include "NumberFormatterWrapper.hxx"
#include "macros.hxx"
#include <comphelper/processfactory.hxx>
-// header for class SvNumberFormatsSupplierObj
#include <svl/numuno.hxx>
-// header for class SvNumberformat
#include <svl/zformat.hxx>
#include <tools/color.hxx>
#include <i18nlangtag/mslangid.hxx>
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index fcad9f0a5e90..c681b86db1c6 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -32,7 +32,6 @@
#include <com/sun/star/chart2/XAxis.hpp>
#include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
-// header for define DBG_ASSERT
#include <tools/debug.hxx>
#include <comphelper/InlineContainer.hxx>
diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx
index 86c4195003e2..4ef8e8738279 100644
--- a/chart2/source/tools/WrappedPropertySet.cxx
+++ b/chart2/source/tools/WrappedPropertySet.cxx
@@ -20,7 +20,6 @@
#include "WrappedPropertySet.hxx"
#include "macros.hxx"
-// header for define DELETEZ
#include <tools/solar.h>
namespace chart
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 0aaf1999c836..c686911ed120 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -59,7 +59,6 @@
#include <com/sun/star/chart2/RelativePosition.hpp>
#include <editeng/unoprnms.hxx>
#include <tools/color.hxx>
-// header for class OUStringBuffer
#include <rtl/ustrbuf.hxx>
#include <rtl/math.hxx>
#include <basegfx/vector/b2dvector.hxx>
diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx
index 966100b25d94..e04418c16092 100644
--- a/chart2/source/view/diagram/VDiagram.cxx
+++ b/chart2/source/view/diagram/VDiagram.cxx
@@ -36,9 +36,7 @@
#include <com/sun/star/drawing/ShadeMode.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
-// header for class SvxShape
#include <svx/unoshape.hxx>
-// header for class E3dScene
#include <svx/scene3d.hxx>
#include <svx/e3dsceneupdater.hxx>
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index c530354a5907..8bb5b2f45dda 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -58,15 +58,10 @@
#include <comphelper/servicehelper.hxx>
#include <boost/bind.hpp>
#include <unotools/streamwrap.hxx>
-// header for class LocaleDataWrapper
#include <unotools/localedatawrapper.hxx>
-// header for class SdrPage
#include <svx/svdpage.hxx>
-// header for class SvxDrawPage
#include <svx/unopage.hxx>
-// header for class SvxShape
#include <svx/unoshape.hxx>
-// header for class Application
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
#include <svx/unofill.hxx>
diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx
index 6d6954cb22ef..7b5d0a1f2417 100644
--- a/chart2/source/view/main/DrawModelWrapper.cxx
+++ b/chart2/source/view/main/DrawModelWrapper.cxx
@@ -24,29 +24,17 @@
#include "ObjectIdentifier.hxx"
#include <svx/unomodel.hxx>
#include <svl/itempool.hxx>
-// header for class SfxBoolItem
#include <svl/eitem.hxx>
-// header for define EE_PARA_HYPHENATE
#include <editeng/eeitem.hxx>
-// header for class Svx3DPercentDiagonalItem
#include <svx/svx3ditems.hxx>
-// header for class SvtPathOptions
#include <unotools/pathoptions.hxx>
-// header E3dObjFactory
#include <svx/objfac3d.hxx>
-// header for class SdrObjList
#include <svx/svdpage.hxx>
-// header for SvxUnoXDashTable_createInstance
#include <svx/XPropertyTable.hxx>
-// header for class XDashList
#include <svx/xtable.hxx>
-// header for class SdrOutliner
#include <svx/svdoutl.hxx>
-// header for class LinguMgr
#include <editeng/unolingu.hxx>
-// header for class Application
#include <vcl/svapp.hxx>
-// header for class VirtualDevice
#include <vcl/virdev.hxx>
#include <com/sun/star/container/XChild.hpp>