chart2/IwyuFilter_chart2.yaml
| 18 +---------
chart2/inc/ChartModel.hxx
| 1
chart2/inc/ChartTypeManager.hxx
| 1
chart2/inc/ChartView.hxx
| 2 -
chart2/source/controller/accessibility/AccessibleBase.cxx
| 2 -
chart2/source/controller/accessibility/AccessibleChartElement.cxx
| 3 -
chart2/source/controller/accessibility/AccessibleChartElement.hxx
| 2 -
chart2/source/controller/accessibility/AccessibleChartShape.cxx
| 2 -
chart2/source/controller/accessibility/AccessibleChartShape.hxx
| 1
chart2/source/controller/accessibility/AccessibleChartView.cxx
| 1
chart2/source/controller/accessibility/AccessibleTextHelper.cxx
| 2 -
chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
| 2 -
chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
| 2 -
chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
| 1
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
| 2 -
chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
| 1
chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
| 1
chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
| 1
chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
| 1
chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx
| 2 -
chart2/source/controller/dialogs/DataBrowser.hxx
| 7 ---
chart2/source/controller/dialogs/DataBrowserModel.cxx
| 1
chart2/source/controller/dialogs/DialogModel.cxx
| 1
chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
| 2 -
chart2/source/controller/dialogs/dlg_ChartType.cxx
| 2 -
chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
| 1
chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
| 1
chart2/source/controller/dialogs/dlg_DataSource.cxx
| 3 -
chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
| 1
chart2/source/controller/dialogs/dlg_NumberFormat.cxx
| 2 -
chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
| 1
chart2/source/controller/dialogs/dlg_ShapeFont.cxx
| 2 -
chart2/source/controller/dialogs/res_ErrorBar.cxx
| 1
chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
| 1
chart2/source/controller/dialogs/tp_ChartType.cxx
| 1
chart2/source/controller/dialogs/tp_ChartType.hxx
| 1
chart2/source/controller/dialogs/tp_DataSource.hxx
| 5 --
chart2/source/controller/dialogs/tp_ErrorBars.cxx
| 2 -
chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
| 1
chart2/source/controller/inc/AccessibleBase.hxx
| 5 --
chart2/source/controller/inc/AccessibleTextHelper.hxx
| 1
chart2/source/controller/inc/AxisItemConverter.hxx
| 2 -
chart2/source/controller/inc/ChartController.hxx
| 7 ---
chart2/source/controller/inc/ChartToolbarController.hxx
| 1
chart2/source/controller/inc/DataPointItemConverter.hxx
| 2 -
chart2/source/controller/inc/DataTableItemConverter.hxx
| 4 --
chart2/source/controller/inc/ErrorBarItemConverter.hxx
| 1
chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
| 2 -
chart2/source/controller/inc/LegendItemConverter.hxx
| 2 -
chart2/source/controller/inc/MultipleChartConverters.hxx
| 1
chart2/source/controller/inc/RegressionCurveItemConverter.hxx
| 2 -
chart2/source/controller/inc/RegressionEquationItemConverter.hxx
| 1
chart2/source/controller/inc/TextLabelItemConverter.hxx
| 2 -
chart2/source/controller/inc/TitleItemConverter.hxx
| 2 -
chart2/source/controller/inc/dlg_ChartType_UNO.hxx
| 2 -
chart2/source/controller/inc/dlg_DataSource.hxx
| 2 -
chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
| 2 -
chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
| 1
chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
| 1
chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
| 1
chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
| 1
chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
| 1
chart2/source/controller/main/ChartController.cxx
| 5 --
chart2/source/controller/main/ChartController_EditData.cxx
| 2 -
chart2/source/controller/main/ChartController_Properties.cxx
| 1
chart2/source/controller/main/ChartController_Window.cxx
| 1
chart2/source/controller/main/ChartFrameloader.cxx
| 1
chart2/source/controller/main/ChartTransferable.cxx
| 1
chart2/source/controller/main/ControllerCommandDispatch.cxx
| 5 --
chart2/source/controller/main/DragMethod_RotateDiagram.cxx
| 1
chart2/source/controller/main/ElementSelector.cxx
| 3 -
chart2/source/controller/main/ObjectHierarchy.cxx
| 1
chart2/source/controller/sidebar/ChartAreaPanel.hxx
| 8 ----
chart2/source/controller/sidebar/ChartColorPaletteControl.cxx
| 4 --
chart2/source/controller/sidebar/ChartColorsPanel.cxx
| 3 -
chart2/source/controller/sidebar/ChartColorsPanel.hxx
| 1
chart2/source/controller/sidebar/ChartElementsPanel.cxx
| 1
chart2/source/controller/sidebar/ChartLinePanel.hxx
| 3 -
chart2/source/controller/sidebar/ChartSeriesPanel.cxx
| 1
chart2/source/inc/AxisHelper.hxx
| 1
chart2/source/inc/BaseGFXHelper.hxx
| 1
chart2/source/inc/ChartColorPaletteHelper.hxx
| 3 -
chart2/source/inc/ChartResourceGroups.hxx
| 2 -
chart2/source/inc/ChartTypeHelper.hxx
| 1
chart2/source/inc/ChartTypeTemplate.hxx
| 3 -
chart2/source/inc/ChartViewHelper.hxx
| 1
chart2/source/inc/ControllerLockGuard.hxx
| 2 -
chart2/source/inc/DataSeries.hxx
| 1
chart2/source/inc/DataSeriesHelper.hxx
| 3 -
chart2/source/inc/DataSource.hxx
| 1
chart2/source/inc/DataSourceHelper.hxx
| 1
chart2/source/inc/Diagram.hxx
| 5 --
chart2/source/inc/DiagramHelper.hxx
| 1
chart2/source/inc/DisposeHelper.hxx
| 1
chart2/source/inc/ErrorBar.hxx
| 3 -
chart2/source/inc/ExplicitCategoriesProvider.hxx
| 2 -
chart2/source/inc/HistogramDataSequence.hxx
| 2 -
chart2/source/inc/InternalDataProvider.hxx
| 2 -
chart2/source/inc/LabeledDataSequence.hxx
| 3 -
chart2/source/inc/LegendHelper.hxx
| 1
chart2/source/inc/LifeTime.hxx
| 1
chart2/source/inc/MediaDescriptorHelper.hxx
| 1
chart2/source/inc/ModifyListenerCallBack.hxx
| 1
chart2/source/inc/ModifyListenerHelper.hxx
| 1
chart2/source/inc/NumberFormatterWrapper.hxx
| 1
chart2/source/inc/OPropertySet.hxx
| 1
chart2/source/inc/PopupRequest.hxx
| 2 -
chart2/source/inc/PropertyHelper.hxx
| 1
chart2/source/inc/ReferenceSizeProvider.hxx
| 1
chart2/source/inc/RegressionCurveCalculator.hxx
| 1
chart2/source/inc/RegressionCurveHelper.hxx
| 5 --
chart2/source/inc/RelativePositionHelper.hxx
| 1
chart2/source/inc/RelativeSizeHelper.hxx
| 2 -
chart2/source/inc/SceneProperties.hxx
| 1
chart2/source/inc/StatisticsHelper.hxx
| 1
chart2/source/inc/ThreeDHelper.hxx
| 1
chart2/source/inc/UncachedDataSequence.hxx
| 3 -
chart2/source/inc/UserDefinedProperties.hxx
| 1
chart2/source/inc/WeakListenerAdapter.hxx
| 1
chart2/source/inc/WrappedProperty.hxx
| 1
chart2/source/inc/WrappedPropertySet.hxx
| 1
chart2/source/inc/chartview/ExplicitScaleValues.hxx
| 1
chart2/source/model/template/FunnelChartTypeTemplate.cxx
| 1
chart2/source/model/template/HistogramChartType.cxx
| 3 -
chart2/source/model/template/HistogramChartTypeTemplate.cxx
| 2 -
chart2/source/model/template/HistogramDataInterpreter.cxx
| 10 -----
chart2/source/model/template/NetChartTypeTemplate.cxx
| 1
chart2/source/model/template/PieChartType.hxx
| 1
chart2/source/tools/CachedDataSequence.cxx
| 2 -
chart2/source/tools/ChartColorPaletteHelper.cxx
| 4 --
chart2/source/tools/ChartColorScheme.cxx
| 2 -
chart2/source/tools/ChartTypeHelper.cxx
| 1
chart2/source/tools/ChartViewHelper.cxx
| 1
chart2/source/tools/ConfigColorScheme.cxx
| 1
chart2/source/tools/ControllerLockGuard.cxx
| 2 -
chart2/source/tools/DataSeriesHelper.cxx
| 6 ---
chart2/source/tools/DiagramHelper.cxx
| 1
chart2/source/tools/ExplicitCategoriesProvider.cxx
| 2 -
chart2/source/tools/FormattedStringHelper.cxx
| 1
chart2/source/tools/HistogramDataSequence.cxx
| 7 ---
chart2/source/tools/RegressionCurveHelper.cxx
| 2 -
chart2/source/tools/SceneProperties.cxx
| 1
chart2/source/tools/ThreeDHelper.cxx
| 4 --
chart2/source/tools/UncachedDataSequence.cxx
| 1
chart2/source/view/axes/VAxisBase.hxx
| 1
chart2/source/view/axes/VAxisOrGridBase.cxx
| 1
chart2/source/view/axes/VAxisOrGridBase.hxx
| 2 -
chart2/source/view/axes/VAxisProperties.hxx
| 2 -
chart2/source/view/axes/VCartesianAxis.cxx
| 2 -
chart2/source/view/axes/VCartesianCoordinateSystem.cxx
| 2 -
chart2/source/view/axes/VCartesianGrid.cxx
| 1
chart2/source/view/axes/VCoordinateSystem.cxx
| 1
chart2/source/view/axes/VPolarAngleAxis.cxx
| 2 -
chart2/source/view/axes/VPolarCoordinateSystem.cxx
| 2 -
chart2/source/view/axes/VPolarGrid.hxx
| 1
chart2/source/view/charttypes/AreaChart.cxx
| 1
chart2/source/view/charttypes/AreaChart.hxx
| 1
chart2/source/view/charttypes/BarChart.hxx
| 1
chart2/source/view/charttypes/BarPositionHelper.cxx
| 2 -
chart2/source/view/charttypes/CandleStickChart.hxx
| 1
chart2/source/view/charttypes/HistogramChart.cxx
| 18 ----------
chart2/source/view/charttypes/HistogramChart.hxx
| 1
chart2/source/view/charttypes/PieChart.hxx
| 1
chart2/source/view/charttypes/VSeriesPlotter.cxx
| 3 -
chart2/source/view/diagram/VDiagram.cxx
| 2 -
chart2/source/view/inc/DataTableView.hxx
| 4 --
chart2/source/view/inc/LegendEntryProvider.hxx
| 8 +---
chart2/source/view/inc/PolarLabelPositionHelper.hxx
| 1
chart2/source/view/inc/VCoordinateSystem.hxx
| 7 ---
chart2/source/view/inc/VDataSeries.hxx
| 1
chart2/source/view/inc/VSeriesPlotter.hxx
| 3 -
chart2/source/view/main/AxisUsage.hxx
| 1
chart2/source/view/main/ChartItemPool.cxx
| 7 ---
chart2/source/view/main/ChartItemPool.hxx
| 2 -
chart2/source/view/main/DataTableView.cxx
| 4 --
chart2/source/view/main/PolarLabelPositionHelper.cxx
| 1
chart2/source/view/main/SeriesPlotterContainer.cxx
| 3 -
chart2/source/view/main/SeriesPlotterContainer.hxx
| 1
chart2/source/view/main/ShapeFactory.cxx
| 1
chart2/source/view/main/VDataSeries.cxx
| 2 -
chart2/source/view/main/VLegend.cxx
| 1
181 files changed, 14 insertions(+), 379 deletions(-)
New commits:
commit 85f88d71967e3ce46be4fa990e7213852eaadd38
Author: Gabor Kelemen <gabor.kele...@collabora.com>
AuthorDate: Wed Jul 30 22:39:00 2025 +0200
Commit: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
CommitDate: Mon Aug 18 20:19:39 2025 +0200
tdf#146619 Run IWYU on chart2/
Change-Id: I2f0920df37ba14918e1325983309f9b77c8792cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188751
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
diff --git a/chart2/IwyuFilter_chart2.yaml b/chart2/IwyuFilter_chart2.yaml
index dfb7404558c2..c7207275d71f 100644
--- a/chart2/IwyuFilter_chart2.yaml
+++ b/chart2/IwyuFilter_chart2.yaml
@@ -347,6 +347,9 @@ excludelist:
chart2/source/tools/WrappedProperty.cxx:
# Actually used
- com/sun/star/beans/XPropertyState.hpp
+ chart2/source/tools/WrappedDefaultProperty.cxx:
+ # Actually used
+ - com/sun/star/beans/XPropertyState.hpp
chart2/source/view/inc/VLineProperties.hxx:
# base class has to be a complete type
- com/sun/star/uno/Reference.h
@@ -449,12 +452,6 @@ excludelist:
chart2/source/controller/inc/ItemPropertyMap.hxx:
# base class has to be a complete type
- map
- chart2/source/controller/inc/RangeSelectionHelper.hxx:
- # base class has to be a complete type
- - com/sun/star/uno/Sequence.h
- chart2/source/controller/inc/RangeSelectionListener.hxx:
- # base class has to be a complete type
- - com/sun/star/sheet/XRangeSelectionListener.hpp
chart2/source/controller/accessibility/AccessibleChartShape.hxx:
# base class has to be a complete type
- AccessibleBase.hxx
@@ -557,15 +554,6 @@ excludelist:
chart2/source/controller/main/ChartFrameloader.cxx:
# Actually used
- com/sun/star/uno/XComponentContext.hpp
- chart2/source/controller/main/CommandDispatch.hxx:
- # base class has to be a complete type
- - com/sun/star/frame/XDispatch.hpp
- - com/sun/star/util/XModifyListener.hpp
- - comphelper/interfacecontainer2.hxx
- chart2/source/controller/main/ControllerCommandDispatch.hxx:
- # base class has to be a complete type
- - CommandDispatch.hxx
- - com/sun/star/view/XSelectionChangeListener.hpp
chart2/source/controller/main/ElementSelector.hxx:
# base class has to be a complete type
- com/sun/star/lang/XServiceInfo.hpp
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx
index 2139367cf85a..0860ed82c26d 100644
--- a/chart2/inc/ChartModel.hxx
+++ b/chart2/inc/ChartModel.hxx
@@ -66,7 +66,6 @@ namespace com::sun::star::document { class XFilter; }
namespace com::sun::star::embed { class XStorage; }
namespace com::sun::star::frame { class XModel; }
namespace com::sun::star::uno { class XComponentContext; }
-namespace com::sun::star::uno { class XAggregation; }
class SvNumberFormatter;
class SvNumberFormatsSupplierObj;
diff --git a/chart2/inc/ChartTypeManager.hxx b/chart2/inc/ChartTypeManager.hxx
index 2970503d3e24..916c8068d305 100644
--- a/chart2/inc/ChartTypeManager.hxx
+++ b/chart2/inc/ChartTypeManager.hxx
@@ -18,7 +18,6 @@
*/
#pragma once
-#include <config_options.h>
#include <cppuhelper/implbase.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index ba00d741cb6a..b266a60f407d 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -43,8 +43,6 @@
#include <vcl/timer.hxx>
-namespace com::sun::star::drawing { class XDrawPage; }
-namespace com::sun::star::drawing { class XShapes; }
namespace com::sun::star::io { class XOutputStream; }
namespace com::sun::star::uno { class XComponentContext; }
namespace com::sun::star::util { class XUpdatable2; }
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx
b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 9add032de702..a301d6f35499 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -33,9 +33,7 @@
#include <sal/log.hxx>
#include <utility>
#include <vcl/svapp.hxx>
-#include <cppuhelper/supportsservice.hxx>
#include <i18nlangtag/languagetag.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/window.hxx>
#include <vcl/settings.hxx>
#include <o3tl/functional.hxx>
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx
b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
index b935193abdb1..57b20f14b12c 100644
--- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
@@ -19,15 +19,12 @@
#include "AccessibleChartElement.hxx"
#include <AccessibleTextHelper.hxx>
-#include <CharacterProperties.hxx>
#include <ChartModel.hxx>
#include <ChartController.hxx>
#include <ObjectIdentifier.hxx>
#include <ObjectNameProvider.hxx>
-#include <com/sun/star/awt/XDevice.hpp>
#include <com/sun/star/chart2/XTitle.hpp>
-#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
using namespace ::com::sun::star;
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.hxx
b/chart2/source/controller/accessibility/AccessibleChartElement.hxx
index 4594a240bcb3..ff4bdeed6655 100644
--- a/chart2/source/controller/accessibility/AccessibleChartElement.hxx
+++ b/chart2/source/controller/accessibility/AccessibleChartElement.hxx
@@ -20,8 +20,6 @@
#include <AccessibleBase.hxx>
-namespace com::sun::star::accessibility { class XAccessible; }
-
namespace chart
{
class AccessibleTextHelper;
diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.cxx
b/chart2/source/controller/accessibility/AccessibleChartShape.cxx
index 7deb39b447e5..9c4b3d531f94 100644
--- a/chart2/source/controller/accessibility/AccessibleChartShape.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartShape.cxx
@@ -19,8 +19,6 @@
#include "AccessibleChartShape.hxx"
-#include <com/sun/star/awt/XWindow.hpp>
-#include <toolkit/helper/vclunohelper.hxx>
#include <svx/ShapeTypeHandler.hxx>
#include <svx/AccessibleShape.hxx>
#include <svx/AccessibleShapeInfo.hxx>
diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.hxx
b/chart2/source/controller/accessibility/AccessibleChartShape.hxx
index db169bd3b5c1..90e1c7bda6f0 100644
--- a/chart2/source/controller/accessibility/AccessibleChartShape.hxx
+++ b/chart2/source/controller/accessibility/AccessibleChartShape.hxx
@@ -20,7 +20,6 @@
#include <AccessibleBase.hxx>
-#include <cppuhelper/implbase.hxx>
#include <svx/AccessibleShapeTreeInfo.hxx>
namespace accessibility
diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx
b/chart2/source/controller/accessibility/AccessibleChartView.cxx
index 7216c6bbc665..d8431b4e55c0 100644
--- a/chart2/source/controller/accessibility/AccessibleChartView.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx
@@ -33,7 +33,6 @@
#include <rtl/ustring.hxx>
#include <vcl/window.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
diff --git a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
index b58cb1c62294..42ae866dc8d4 100644
--- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
+++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
@@ -28,10 +28,8 @@
#include <svx/AccessibleTextHelper.hxx>
#include <svx/unoshtxt.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/window.hxx>
-#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <osl/diagnose.h>
diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
index f7ed5ca5165b..6bd6d71e1481 100644
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
+++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
@@ -21,7 +21,6 @@
#include <Legend.hxx>
#include <LegendHelper.hxx>
#include <CommonConverters.hxx>
-#include <servicenames.hxx>
#include <ObjectIdentifier.hxx>
#include <chartview/DrawModelWrapper.hxx>
#include <Axis.hxx>
@@ -32,7 +31,6 @@
#include <ChartModel.hxx>
-#include <com/sun/star/chart2/XDataSeries.hpp>
#include <comphelper/diagnose_ex.hxx>
using namespace ::com::sun::star;
diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
index 40ef39fd105f..896f161cd4e1 100644
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
+++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
@@ -31,7 +31,6 @@
namespace chart { struct ExplicitIncrementData; }
namespace chart { struct ExplicitScaleData; }
namespace com::sun::star::chart2 { class XAxis; }
-namespace com::sun::star::chart2 { class XDataSeries; }
namespace com::sun::star::chart2 { class XTitle; }
namespace com::sun::star::container { class XNameContainer; }
namespace com::sun::star::uno { class XComponentContext; }
@@ -39,7 +38,6 @@ namespace com::sun::star::uno { class XComponentContext; }
namespace chart
{
-class ExplicitValueProvider;
class ChartModel;
namespace wrapper
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
index 9a44e53b8b12..8338c5eeed5e 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
@@ -26,7 +26,6 @@
#include <com/sun/star/chart/XDateCategories.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/EventObject.hpp>
#include <memory>
diff --git
a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index fe2552f7f5b4..f30e5f7fdd0c 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -20,8 +20,6 @@
#include "DataSeriesPointWrapper.hxx"
#include "Chart2ModelContact.hxx"
#include <ChartType.hxx>
-#include <ChartTypeHelper.hxx>
-#include <DiagramHelper.hxx>
#include <DataSeries.hxx>
#include <DataSeriesProperties.hxx>
#include <LinePropertiesHelper.hxx>
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
index 99fdf7fa02d4..e4b2a7aaae2b 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
@@ -37,7 +37,6 @@
#include <rtl/ref.hxx>
#include <memory>
-namespace com::sun::star::chart2 { class XDiagram; }
namespace com::sun::star::lang { class XEventListener; }
namespace chart { class Diagram; }
diff --git
a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
index 1208ad539d3e..573c85601cae 100644
---
a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
+++
b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
@@ -22,7 +22,6 @@
#include <string_view>
#include "WrappedAxisAndGridExistenceProperties.hxx"
-#include <com/sun/star/beans/XPropertySet.hpp>
#include <Axis.hxx>
#include <AxisHelper.hxx>
#include <WrappedProperty.hxx>
diff --git
a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
index f40b9edd7fb2..5cbf491f6494 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
@@ -28,7 +28,6 @@
#include <com/sun/star/chart2/CurveStyle.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
#include <utility>
using namespace ::com::sun::star;
diff --git
a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
index 19c05e5274bc..8c60b611adff 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
@@ -21,7 +21,6 @@
#include "WrappedSeriesOrDiagramProperty.hxx"
#include <FastPropertyIdRanges.hxx>
#include <ChartType.hxx>
-#include <ChartTypeHelper.hxx>
#include <com/sun/star/chart2/Symbol.hpp>
#include <com/sun/star/chart2/SymbolStyle.hpp>
#include <com/sun/star/awt/Size.hpp>
diff --git
a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx
b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx
index 850e916eaf0f..e4e91c0ac3b4 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx
@@ -19,8 +19,6 @@
#include "WrappedTextRotationProperty.hxx"
-namespace com::sun::star::beans { class XPropertyState; }
-
using namespace ::com::sun::star;
using ::com::sun::star::uno::Any;
diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx
b/chart2/source/controller/dialogs/DataBrowser.hxx
index 86acc86ccef7..f582aec4fb61 100644
--- a/chart2/source/controller/dialogs/DataBrowser.hxx
+++ b/chart2/source/controller/dialogs/DataBrowser.hxx
@@ -29,15 +29,8 @@ namespace com::sun::star {
namespace awt {
class XWindow;
}
- namespace chart2 {
- class XChartDocument;
- }
}
-namespace com::sun::star::uno { class XComponentContext; }
-
-class OutputDevice;
-
namespace chart
{
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx
b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index e3c4d35a685e..86c835ecda90 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -21,7 +21,6 @@
#include <DataBrowserModel.hxx>
#include <ChartType.hxx>
#include <ChartTypeManager.hxx>
-#include <ChartView.hxx>
#include <Diagram.hxx>
#include <DataSeries.hxx>
#include <DataSeriesHelper.hxx>
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx
b/chart2/source/controller/dialogs/DialogModel.cxx
index 1ea7ddfe56d1..74468cc422a6 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -28,7 +28,6 @@
#include <ResId.hxx>
#include <ControllerLockGuard.hxx>
#include <ChartType.hxx>
-#include <ChartTypeHelper.hxx>
#include <ChartTypeTemplate.hxx>
#include <ThreeDHelper.hxx>
#include <ChartModel.hxx>
diff --git a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
index cee4af1fb013..5c2b5633c969 100644
--- a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
+++ b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
@@ -24,8 +24,6 @@
namespace chart
{
-using namespace ::com::sun::star;
-
TimerTriggeredControllerLock::TimerTriggeredControllerLock(
rtl::Reference<::chart::ChartModel> xModel)
: m_xModel(std::move(xModel))
diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx
b/chart2/source/controller/dialogs/dlg_ChartType.cxx
index 837f3f3acc25..ccdc5b0fbdc2 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx
@@ -24,8 +24,6 @@
namespace chart
{
-using namespace ::com::sun::star;
-
ChartTypeDialog::ChartTypeDialog(weld::Window* pParent,
rtl::Reference<::chart::ChartModel>
xChartModel)
: GenericDialogController(pParent,
u"modules/schart/ui/charttypedialog.ui"_ustr,
diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
index c92148b036c0..0aa0f78b1667 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
@@ -20,7 +20,6 @@
#include <dlg_ChartType_UNO.hxx>
#include <dlg_ChartType.hxx>
#include <ChartModel.hxx>
-#include <servicenames.hxx>
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index 694397a83b5f..f166e653d626 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -20,7 +20,6 @@
#include <dlg_CreationWizard_UNO.hxx>
#include <dlg_CreationWizard.hxx>
#include <ChartModel.hxx>
-#include <servicenames.hxx>
#include <TimerTriggeredControllerLock.hxx>
#include <utility>
#include <vcl/svapp.hxx>
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx
b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index c00698fef60d..70bebd8a950f 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <com/sun/star/chart2/XChartDocument.hpp>
-
#include <dlg_DataSource.hxx>
#include <ChartTypeTemplateProvider.hxx>
#include <ChartTypeTemplate.hxx>
@@ -29,7 +27,6 @@
#include "tp_RangeChooser.hxx"
#include "tp_DataSource.hxx"
-using namespace ::com::sun::star;
using namespace ::chart;
namespace chart
diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
index 9b098feb1b09..4e5c3e453c7f 100644
--- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
@@ -30,7 +30,6 @@
#include <DataSeries.hxx>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::chart2;
namespace chart
{
diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
index 968c437c049e..6e673bdb798e 100644
--- a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
+++ b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
@@ -27,8 +27,6 @@
namespace chart
{
-using namespace ::com::sun::star;
-
NumberFormatDialog::NumberFormatDialog(weld::Window* pParent, const
SfxItemSet& rSet)
: SfxSingleTabDialogController(pParent, &rSet,
u"cui/ui/formatnumberdialog.ui"_ustr, u"FormatNumberDialog"_ustr)
, m_xContent( m_xBuilder->weld_container(u"content"_ustr) )
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index d88bb0f81334..7d73cbedae35 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -53,7 +53,6 @@
#include <BaseCoordinateSystem.hxx>
#include <com/sun/star/chart2/AxisType.hpp>
-#include <com/sun/star/chart2/XAxis.hpp>
#include <svl/intitem.hxx>
#include <svl/ctloptions.hxx>
diff --git a/chart2/source/controller/dialogs/dlg_ShapeFont.cxx
b/chart2/source/controller/dialogs/dlg_ShapeFont.cxx
index 515c260167a3..1cfc051ee70d 100644
--- a/chart2/source/controller/dialogs/dlg_ShapeFont.cxx
+++ b/chart2/source/controller/dialogs/dlg_ShapeFont.cxx
@@ -28,8 +28,6 @@
#include <vcl/tabs.hrc>
-using namespace ::com::sun::star;
-
namespace chart
{
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx
b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 1e30311ae28b..9b2c4e4ae7c9 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -24,7 +24,6 @@
#include <chartview/ChartSfxItemIds.hxx>
#include <vcl/weld.hxx>
#include <ChartModel.hxx>
-#include "DialogModel.hxx"
#include <rtl/math.hxx>
#include <comphelper/diagnose_ex.hxx>
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
index 99755db26f9e..1875ec9a98ab 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
@@ -21,7 +21,6 @@
#include <Diagram.hxx>
#include <ChartType.hxx>
-#include <ChartTypeHelper.hxx>
#include <ThreeDHelper.hxx>
#include <ControllerLockGuard.hxx>
#include <com/sun/star/drawing/ProjectionMode.hpp>
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx
b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 45f5b277ef7e..67a6a80417c2 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -37,7 +37,6 @@
namespace chart
{
using namespace ::com::sun::star;
-using namespace ::com::sun::star::chart2;
ChartTypeTabPage::ChartTypeTabPage(weld::Container* pPage,
weld::DialogController* pController, rtl::Reference<::chart::ChartModel>
xChartModel,
bool bShowDescription)
diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx
b/chart2/source/controller/dialogs/tp_ChartType.hxx
index c01b599f58d5..946beb836e1a 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.hxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.hxx
@@ -27,7 +27,6 @@
#include <vcl/wizardmachine.hxx>
-namespace com::sun::star::chart2 { class XChartDocument; }
namespace weld { class CustomWeld; }
class ValueSet;
diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx
b/chart2/source/controller/dialogs/tp_DataSource.hxx
index 40219d917f9c..d1d54296681b 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.hxx
@@ -25,16 +25,11 @@
#include <RangeSelectionListener.hxx>
-namespace com::sun::star::chart2 { class XChartType; }
-namespace com::sun::star::chart2 { class XDataSeries; }
-
namespace chart { class TabPageNotifiable; }
namespace chart
{
-class ChartType;
class ChartTypeTemplateProvider;
-class DataSeries;
class DialogModel;
class SeriesEntry
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.cxx
b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
index 8c63332e5e7d..9716f4054eb1 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
@@ -19,8 +19,6 @@
#include "tp_ErrorBars.hxx"
-using namespace ::com::sun::star;
-
namespace chart
{
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
index 480bf3fe20b6..f43fca973622 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
@@ -29,7 +29,6 @@
namespace chart
{
using namespace ::com::sun::star;
-using namespace ::com::sun::star::chart2;
TitlesAndObjectsTabPage::TitlesAndObjectsTabPage(weld::Container* pPage,
weld::DialogController* pController,
rtl::Reference<::chart::ChartModel> xChartModel,
diff --git a/chart2/source/controller/inc/AccessibleBase.hxx
b/chart2/source/controller/inc/AccessibleBase.hxx
index 011bdfa48b88..58f0abf3012e 100644
--- a/chart2/source/controller/inc/AccessibleBase.hxx
+++ b/chart2/source/controller/inc/AccessibleBase.hxx
@@ -24,8 +24,6 @@
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
#include <comphelper/OAccessible.hxx>
-#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase.hxx>
#include <tools/color.hxx>
#include <unotools/weakref.hxx>
#include <vcl/window.hxx>
@@ -34,9 +32,6 @@
#include <vector>
#include <memory>
-namespace com::sun::star::awt { class XWindow; }
-
-
class SdrView;
namespace accessibility
diff --git a/chart2/source/controller/inc/AccessibleTextHelper.hxx
b/chart2/source/controller/inc/AccessibleTextHelper.hxx
index ccdf1ed6bd61..8c2b6396ff36 100644
--- a/chart2/source/controller/inc/AccessibleTextHelper.hxx
+++ b/chart2/source/controller/inc/AccessibleTextHelper.hxx
@@ -23,7 +23,6 @@
#include <svx/AccessibleTextHelper.hxx>
#include <vcl/window.hxx>
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
namespace chart
diff --git a/chart2/source/controller/inc/AxisItemConverter.hxx
b/chart2/source/controller/inc/AxisItemConverter.hxx
index c14ef82bd595..ee4ba2a16085 100644
--- a/chart2/source/controller/inc/AxisItemConverter.hxx
+++ b/chart2/source/controller/inc/AxisItemConverter.hxx
@@ -26,8 +26,6 @@
#include <vector>
namespace com::sun::star::beans { class XPropertySet; }
-namespace com::sun::star::chart2 { class XAxis; }
-namespace com::sun::star::chart2 { class XChartDocument; }
namespace chart { class Axis; }
namespace chart { struct ExplicitIncrementData; }
namespace chart { struct ExplicitScaleData; }
diff --git a/chart2/source/controller/inc/ChartController.hxx
b/chart2/source/controller/inc/ChartController.hxx
index 5a33adb1e64e..16538f97a50c 100644
--- a/chart2/source/controller/inc/ChartController.hxx
+++ b/chart2/source/controller/inc/ChartController.hxx
@@ -43,14 +43,7 @@
#include <memory>
#include <string_view>
-namespace com::sun::star::accessibility { class XAccessible; }
-namespace com::sun::star::awt { class XFocusListener; }
-namespace com::sun::star::awt { class XKeyListener; }
-namespace com::sun::star::awt { class XMouseListener; }
-namespace com::sun::star::awt { class XMouseMotionListener; }
-namespace com::sun::star::awt { class XPaintListener; }
namespace com::sun::star::awt { class XWindow; }
-namespace com::sun::star::awt { class XWindowListener; }
namespace com::sun::star::awt { struct Point; }
namespace com::sun::star::document { class XUndoManager; }
namespace com::sun::star::frame { class XDispatch; }
diff --git a/chart2/source/controller/inc/ChartToolbarController.hxx
b/chart2/source/controller/inc/ChartToolbarController.hxx
index ce493bba674b..a6941af59005 100644
--- a/chart2/source/controller/inc/ChartToolbarController.hxx
+++ b/chart2/source/controller/inc/ChartToolbarController.hxx
@@ -17,7 +17,6 @@
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-namespace com::sun::star::awt { class XWindow; }
namespace com::sun::star::frame { class XFramesSupplier; }
namespace chart {
diff --git a/chart2/source/controller/inc/DataPointItemConverter.hxx
b/chart2/source/controller/inc/DataPointItemConverter.hxx
index 5d75b3057cfd..6d87c29378df 100644
--- a/chart2/source/controller/inc/DataPointItemConverter.hxx
+++ b/chart2/source/controller/inc/DataPointItemConverter.hxx
@@ -28,8 +28,6 @@
#include <optional>
#include <vector>
-namespace com::sun::star::chart2 { class XDataSeries; }
-namespace com::sun::star::frame { class XModel; }
namespace com::sun::star::uno { class XComponentContext; }
namespace chart { class ChartModel; }
namespace chart { class DataSeries; }
diff --git a/chart2/source/controller/inc/DataTableItemConverter.hxx
b/chart2/source/controller/inc/DataTableItemConverter.hxx
index f3809632f8a5..298fd02adb01 100644
--- a/chart2/source/controller/inc/DataTableItemConverter.hxx
+++ b/chart2/source/controller/inc/DataTableItemConverter.hxx
@@ -13,10 +13,6 @@
#include <rtl/ref.hxx>
#include <vector>
-namespace com::sun::star::awt
-{
-struct Size;
-}
namespace com::sun::star::beans
{
class XPropertySet;
diff --git a/chart2/source/controller/inc/ErrorBarItemConverter.hxx
b/chart2/source/controller/inc/ErrorBarItemConverter.hxx
index 50b2fbe3f73b..251cc036508a 100644
--- a/chart2/source/controller/inc/ErrorBarItemConverter.hxx
+++ b/chart2/source/controller/inc/ErrorBarItemConverter.hxx
@@ -23,7 +23,6 @@
#include <rtl/ref.hxx>
namespace com::sun::star::frame { class XModel; }
-namespace com::sun::star::lang { class XMultiServiceFactory; }
class SdrModel;
namespace chart { class ChartModel; }
diff --git a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
index afb9dd0a0c40..52aa5bc4db6c 100644
--- a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
+++ b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
@@ -22,8 +22,6 @@
#include <rtl/ref.hxx>
-namespace com::sun::star::lang { class XMultiServiceFactory; }
-
class SdrModel;
namespace chart { class ChartModel; }
diff --git a/chart2/source/controller/inc/LegendItemConverter.hxx
b/chart2/source/controller/inc/LegendItemConverter.hxx
index 4d3d8fd87e59..70b9c5aa3718 100644
--- a/chart2/source/controller/inc/LegendItemConverter.hxx
+++ b/chart2/source/controller/inc/LegendItemConverter.hxx
@@ -24,8 +24,6 @@
#include <optional>
#include <vector>
-namespace com::sun::star::lang { class XMultiServiceFactory; }
-
class SdrModel;
namespace chart { class ChartModel; }
diff --git a/chart2/source/controller/inc/MultipleChartConverters.hxx
b/chart2/source/controller/inc/MultipleChartConverters.hxx
index ce24aba49309..951aa34a3b47 100644
--- a/chart2/source/controller/inc/MultipleChartConverters.hxx
+++ b/chart2/source/controller/inc/MultipleChartConverters.hxx
@@ -23,7 +23,6 @@
#include <rtl/ref.hxx>
#include <optional>
-namespace com::sun::star::lang { class XMultiServiceFactory; }
namespace chart { class ChartModel; }
class SdrModel;
diff --git a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx
b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx
index 3849a2179387..04b403e3cb06 100644
--- a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx
+++ b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx
@@ -21,7 +21,7 @@
#include "ItemConverter.hxx"
#include <rtl/ref.hxx>
-namespace com::sun::star::lang { class XMultiServiceFactory; }
+namespace chart { class ChartModel; }
namespace chart { class DataSeries; }
class SdrModel;
diff --git a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx
b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx
index e0b0bac2bae9..47ecf2c55b36 100644
--- a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx
+++ b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx
@@ -25,7 +25,6 @@
#include <vector>
namespace com::sun::star::beans { class XPropertySet; }
-namespace com::sun::star::lang { class XMultiServiceFactory; }
class SdrModel;
namespace chart { class ChartModel; }
diff --git a/chart2/source/controller/inc/TextLabelItemConverter.hxx
b/chart2/source/controller/inc/TextLabelItemConverter.hxx
index cb5406cf6a01..24ed944f2511 100644
--- a/chart2/source/controller/inc/TextLabelItemConverter.hxx
+++ b/chart2/source/controller/inc/TextLabelItemConverter.hxx
@@ -26,8 +26,6 @@
#include <optional>
#include <vector>
-namespace com::sun::star::chart2 { class XDataSeries; }
-namespace com::sun::star::frame { class XModel; }
namespace chart { class ChartModel; }
namespace chart { class DataSeries; }
diff --git a/chart2/source/controller/inc/TitleItemConverter.hxx
b/chart2/source/controller/inc/TitleItemConverter.hxx
index 917db7ef9cb6..e295186ecc1f 100644
--- a/chart2/source/controller/inc/TitleItemConverter.hxx
+++ b/chart2/source/controller/inc/TitleItemConverter.hxx
@@ -25,8 +25,6 @@
#include <optional>
#include <vector>
-namespace com::sun::star::lang { class XMultiServiceFactory; }
-
class SdrModel;
namespace chart { class ChartModel; }
diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
index ca79b25367de..a2b0b76ed792 100644
--- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
+++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
@@ -22,8 +22,6 @@
#include <comphelper/proparrhlp.hxx>
#include <svtools/genericunodialog.hxx>
-namespace com::sun::star::beans { class XPropertySetInfo; }
-
namespace chart
{
class ChartModel;
diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx
b/chart2/source/controller/inc/dlg_DataSource.hxx
index 9da88e8de0ba..32dae6f5de8c 100644
--- a/chart2/source/controller/inc/dlg_DataSource.hxx
+++ b/chart2/source/controller/inc/dlg_DataSource.hxx
@@ -22,8 +22,6 @@
#include <vcl/weld.hxx>
#include <memory>
-class BuilderPage;
-
namespace chart
{
class ChartModel;
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index a5880942aad9..f6a7fc528140 100644
--- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -29,7 +29,6 @@
#include <AxisHelper.hxx>
#include <CommonConverters.hxx>
#include <ChartType.hxx>
-#include <ChartTypeHelper.hxx>
#include <Diagram.hxx>
#include <unonames.hxx>
#include <BaseCoordinateSystem.hxx>
@@ -40,7 +39,6 @@
#include <com/sun/star/chart/ChartAxisMarkPosition.hpp>
#include <com/sun/star/chart/ChartAxisPosition.hpp>
#include <com/sun/star/chart/TimeInterval.hpp>
-#include <com/sun/star/chart2/XAxis.hpp>
#include <com/sun/star/chart2/AxisOrientation.hpp>
#include <com/sun/star/chart2/AxisType.hpp>
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index aa8f21231120..ae4ac1033f64 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -26,7 +26,6 @@
#include <StatisticsItemConverter.hxx>
#include <SeriesOptionsItemConverter.hxx>
#include <DataSeries.hxx>
-#include <DataSeriesHelper.hxx>
#include <DataSeriesProperties.hxx>
#include <Diagram.hxx>
#include <ChartModel.hxx>
diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
index f97ae631ee02..26b1a537e1f9 100644
--- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
@@ -31,7 +31,6 @@
#include <com/sun/star/chart2/XInternalDataProvider.hpp>
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/chart/ErrorBarStyle.hpp>
-#include <utility>
#include <comphelper/diagnose_ex.hxx>
using namespace ::com::sun::star;
diff --git
a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
index a6dbf6d2faac..d8875bb58317 100644
--- a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
+++ b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
@@ -35,7 +35,6 @@
#include <ChartView.hxx>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
namespace chart::wrapper {
diff --git
a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
index 96c27372090a..6884b8a71ce1 100644
--- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
@@ -23,7 +23,6 @@
#include <ChartType.hxx>
#include <Axis.hxx>
#include <AxisHelper.hxx>
-#include <DiagramHelper.hxx>
#include <Diagram.hxx>
#include <ChartTypeHelper.hxx>
#include <DataSeriesHelper.hxx>
diff --git a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
index de12adcc9739..8d0c1c83e76d 100644
--- a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
@@ -23,7 +23,6 @@
#include <ChartType.hxx>
#include <ChartTypeHelper.hxx>
#include <DataSeries.hxx>
-#include <DataSeriesHelper.hxx>
#include <DataSeriesProperties.hxx>
#include <Diagram.hxx>
#include <ItemPropertyMap.hxx>
diff --git a/chart2/source/controller/main/ChartController.cxx
b/chart2/source/controller/main/ChartController.cxx
index 5f013d759351..99bc0c55b94b 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -23,7 +23,6 @@
#include <config_wasm_strip.h>
#include <ChartController.hxx>
#include <ChartView.hxx>
-#include <servicenames.hxx>
#include <ResId.hxx>
#include <dlg_DataSource.hxx>
#include <ChartModel.hxx>
@@ -51,7 +50,6 @@
#include "UndoActions.hxx"
#include <ViewElementListProvider.hxx>
-#include <comphelper/dispatchcommand.hxx>
#include <BaseCoordinateSystem.hxx>
#include <com/sun/star/frame/XController2.hpp>
@@ -74,7 +72,6 @@
#include <comphelper/lok.hxx>
#include <sfx2/sidebar/SidebarController.hxx>
-#include <com/sun/star/awt/XVclWindowPeer.hpp>
#include <com/sun/star/frame/XLayoutManager.hpp>
// this is needed to properly destroy the unique_ptr to the AcceleratorExecute
@@ -83,8 +80,6 @@
#include <svx/ActionDescriptionProvider.hxx>
#include <comphelper/diagnose_ex.hxx>
-#include <editeng/fontitem.hxx>
-
// enable the following define to let the controller listen to model changes
and
// react on this by rebuilding the view
#define TEST_ENABLE_MODIFY_LISTENER
diff --git a/chart2/source/controller/main/ChartController_EditData.cxx
b/chart2/source/controller/main/ChartController_EditData.cxx
index 1e0c8c3dc96f..b31691dc928d 100644
--- a/chart2/source/controller/main/ChartController_EditData.cxx
+++ b/chart2/source/controller/main/ChartController_EditData.cxx
@@ -27,8 +27,6 @@
#include <vcl/svapp.hxx>
-using namespace ::com::sun::star;
-
namespace chart
{
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx
b/chart2/source/controller/main/ChartController_Properties.cxx
index 7a8b0b2c6646..d1c635b3c747 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -41,7 +41,6 @@
#include <AxisHelper.hxx>
#include <TitleHelper.hxx>
#include <ChartType.hxx>
-#include <ChartTypeHelper.hxx>
#include <ChartModel.hxx>
#include <DataSeries.hxx>
#include <DataSeriesProperties.hxx>
diff --git a/chart2/source/controller/main/ChartController_Window.cxx
b/chart2/source/controller/main/ChartController_Window.cxx
index 99b5b97ddeff..f418f121eb66 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -45,7 +45,6 @@
#include <RegressionCurveModel.hxx>
#include <StatisticsHelper.hxx>
#include <DataSeries.hxx>
-#include <DataSeriesHelper.hxx>
#include <DataSeriesProperties.hxx>
#include <Axis.hxx>
#include <AxisHelper.hxx>
diff --git a/chart2/source/controller/main/ChartFrameloader.cxx
b/chart2/source/controller/main/ChartFrameloader.cxx
index cbaec55db9e0..91e18a982cbe 100644
--- a/chart2/source/controller/main/ChartFrameloader.cxx
+++ b/chart2/source/controller/main/ChartFrameloader.cxx
@@ -18,7 +18,6 @@
*/
#include "ChartFrameloader.hxx"
-#include <servicenames.hxx>
#include <MediaDescriptorHelper.hxx>
#include <ChartController.hxx>
#include <ChartModel.hxx>
diff --git a/chart2/source/controller/main/ChartTransferable.cxx
b/chart2/source/controller/main/ChartTransferable.cxx
index 5fbf1812be92..a32e4513598f 100644
--- a/chart2/source/controller/main/ChartTransferable.cxx
+++ b/chart2/source/controller/main/ChartTransferable.cxx
@@ -24,7 +24,6 @@
#include "ChartTransferable.hxx"
#include <sot/exchange.hxx>
-#include <sot/storage.hxx>
#include <unotools/streamwrap.hxx>
#include <vcl/graph.hxx>
#include <svl/itempool.hxx>
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx
b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index 384f6f166b7b..ca5ff1e6c8d6 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -28,7 +28,6 @@
#include <LegendHelper.hxx>
#include <ObjectIdentifier.hxx>
#include <ChartType.hxx>
-#include <ChartTypeHelper.hxx>
#include <ChartController.hxx>
#include <RegressionCurveHelper.hxx>
#include <DataSeries.hxx>
@@ -46,13 +45,9 @@
#include <sfx2/viewsh.hxx>
#include <sfx2/objsh.hxx>
-#include <com/sun/star/chart2/XRegressionCurve.hpp>
#include <com/sun/star/chart2/XDataProviderAccess.hpp>
#include <com/sun/star/frame/status/FontHeight.hpp>
-// only needed until #i68864# is fixed
-#include <com/sun/star/frame/XLayoutManager.hpp>
-
using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
index 68698f195bae..e6e755ff3528 100644
--- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
+++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
@@ -24,7 +24,6 @@
#include <ChartModel.hxx>
#include <Diagram.hxx>
#include <ChartType.hxx>
-#include <ChartTypeHelper.hxx>
#include <ThreeDHelper.hxx>
#include <defines.hxx>
#include <svx/sdr/overlay/overlaypolypolygon.hxx>
diff --git a/chart2/source/controller/main/ElementSelector.cxx
b/chart2/source/controller/main/ElementSelector.cxx
index 36ea5dabfc18..993674e75b7d 100644
--- a/chart2/source/controller/main/ElementSelector.cxx
+++ b/chart2/source/controller/main/ElementSelector.cxx
@@ -20,7 +20,6 @@
#include "ElementSelector.hxx"
#include <ObjectNameProvider.hxx>
#include <ObjectHierarchy.hxx>
-#include <servicenames.hxx>
#include <DrawViewWrapper.hxx>
#include <ResId.hxx>
#include <strings.hrc>
@@ -34,8 +33,6 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svapp.hxx>
-namespace chart { class ExplicitValueProvider; }
-
namespace chart
{
diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx
b/chart2/source/controller/main/ObjectHierarchy.cxx
index c82d1c15bacb..2e517602328e 100644
--- a/chart2/source/controller/main/ObjectHierarchy.cxx
+++ b/chart2/source/controller/main/ObjectHierarchy.cxx
@@ -29,7 +29,6 @@
#include <ChartTypeHelper.hxx>
#include <ChartModel.hxx>
#include <DataSeries.hxx>
-#include <DataSeriesHelper.hxx>
#include <GridProperties.hxx>
#include <LegendHelper.hxx>
#include <chartview/DrawModelWrapper.hxx>
diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.hxx
b/chart2/source/controller/sidebar/ChartAreaPanel.hxx
index 24f0d85912b1..d5c884f2d6b4 100644
--- a/chart2/source/controller/sidebar/ChartAreaPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartAreaPanel.hxx
@@ -10,10 +10,6 @@
#pragma once
#include <sfx2/sidebar/SidebarModelUpdate.hxx>
-#include <svx/xfillit0.hxx>
-#include <svx/xflgrit.hxx>
-#include <svx/xflhtit.hxx>
-#include <svx/xbtmpit.hxx>
#include <svx/sidebar/AreaPropertyPanelBase.hxx>
@@ -21,10 +17,6 @@
#include "ChartSidebarSelectionListener.hxx"
#include "ChartColorWrapper.hxx"
-class XFillFloatTransparenceItem;
-class XFillTransparenceItem;
-class XFillColorItem;
-
namespace chart {
class ChartController;
diff --git a/chart2/source/controller/sidebar/ChartColorPaletteControl.cxx
b/chart2/source/controller/sidebar/ChartColorPaletteControl.cxx
index dc03d6568ece..7c9a28348b2a 100644
--- a/chart2/source/controller/sidebar/ChartColorPaletteControl.cxx
+++ b/chart2/source/controller/sidebar/ChartColorPaletteControl.cxx
@@ -17,10 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <com/sun/star/drawing/FillStyle.hpp>
-
#include <memory>
-#include <utility>
#include <vcl/svapp.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/virdev.hxx>
@@ -28,7 +25,6 @@
#include <ChartColorPaletteHelper.hxx>
#include "ChartColorPaletteControl.hxx"
-#include <vcl/gdimtf.hxx>
#include <vcl/graph.hxx>
using namespace css;
diff --git a/chart2/source/controller/sidebar/ChartColorsPanel.cxx
b/chart2/source/controller/sidebar/ChartColorsPanel.cxx
index 259365a28adb..89e42f631ceb 100644
--- a/chart2/source/controller/sidebar/ChartColorsPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartColorsPanel.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <sal/log.hxx>
#include <vcl/svapp.hxx>
#include "ChartColorsPanel.hxx"
@@ -26,12 +25,10 @@
#include <ChartColorPaletteHelper.hxx>
#include <ChartController.hxx>
#include <ChartModel.hxx>
-#include <DataSeries.hxx>
#include <com/sun/star/drawing/FillStyle.hpp>
#include <sfx2/weldutils.hxx>
-#include <svtools/toolbarmenu.hxx>
#include <algorithm>
diff --git a/chart2/source/controller/sidebar/ChartColorsPanel.hxx
b/chart2/source/controller/sidebar/ChartColorsPanel.hxx
index 3180f7660f58..ccaf5c0c642e 100644
--- a/chart2/source/controller/sidebar/ChartColorsPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartColorsPanel.hxx
@@ -18,7 +18,6 @@
#include <sfx2/sidebar/PanelLayout.hxx>
#include "ChartSidebarModifyListener.hxx"
#include "ChartSidebarSelectionListener.hxx"
-#include <ChartColorPalettes.hxx>
class ToolbarUnoDispatcher;
diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx
b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
index 89dd339f9a48..e12d942477e6 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
@@ -31,7 +31,6 @@
#include <AxisHelper.hxx>
#include <Diagram.hxx>
#include <ChartType.hxx>
-#include <ChartTypeHelper.hxx>
#include <ChartModel.hxx>
#include <BaseCoordinateSystem.hxx>
diff --git a/chart2/source/controller/sidebar/ChartLinePanel.hxx
b/chart2/source/controller/sidebar/ChartLinePanel.hxx
index 4449f3678fb6..986003989865 100644
--- a/chart2/source/controller/sidebar/ChartLinePanel.hxx
+++ b/chart2/source/controller/sidebar/ChartLinePanel.hxx
@@ -16,9 +16,6 @@
#include "ChartSidebarSelectionListener.hxx"
#include "ChartColorWrapper.hxx"
-class XLineTransparenceItem;
-class XLineWidthItem;
-
namespace chart {
class ChartController;
diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
index 8795e691fbd7..0d68bd75ffd4 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
@@ -28,7 +28,6 @@
#include <ChartModel.hxx>
#include <ChartType.hxx>
#include <DataSeries.hxx>
-#include <DataSeriesHelper.hxx>
#include <Diagram.hxx>
#include <RegressionCurveHelper.hxx>
#include <RegressionCurveModel.hxx>
diff --git a/chart2/source/inc/AxisHelper.hxx b/chart2/source/inc/AxisHelper.hxx
index eff1bb4e28c4..288b9a0d2026 100644
--- a/chart2/source/inc/AxisHelper.hxx
+++ b/chart2/source/inc/AxisHelper.hxx
@@ -18,7 +18,6 @@
*/
#pragma once
-#include <config_options.h>
#include <com/sun/star/chart2/ScaleData.hpp>
#include <rtl/ref.hxx>
#include "GridProperties.hxx"
diff --git a/chart2/source/inc/BaseGFXHelper.hxx
b/chart2/source/inc/BaseGFXHelper.hxx
index 54f26896339a..2b973c698860 100644
--- a/chart2/source/inc/BaseGFXHelper.hxx
+++ b/chart2/source/inc/BaseGFXHelper.hxx
@@ -18,7 +18,6 @@
*/
#pragma once
-#include <config_options.h>
#include <basegfx/matrix/b3dhommatrix.hxx>
#include <basegfx/range/b2irectangle.hxx>
#include <basegfx/tuple/b3dtuple.hxx>
diff --git a/chart2/source/inc/ChartColorPaletteHelper.hxx
b/chart2/source/inc/ChartColorPaletteHelper.hxx
index a580f6744a07..073559a77332 100644
--- a/chart2/source/inc/ChartColorPaletteHelper.hxx
+++ b/chart2/source/inc/ChartColorPaletteHelper.hxx
@@ -9,13 +9,10 @@
#pragma once
-#include <svx/svxdllapi.h>
#include <svx/ChartColorPaletteType.hxx>
#include <docmodel/theme/Theme.hxx>
#include <tools/gen.hxx>
-#include <array>
-
class OutputDevice;
namespace chart
diff --git a/chart2/source/inc/ChartResourceGroups.hxx
b/chart2/source/inc/ChartResourceGroups.hxx
index 9b6d5ee267f7..de3d86707a6b 100644
--- a/chart2/source/inc/ChartResourceGroups.hxx
+++ b/chart2/source/inc/ChartResourceGroups.hxx
@@ -26,8 +26,6 @@
namespace chart
{
-using namespace ::com::sun::star;
-
class SplinePropertiesDialog;
class SteppedPropertiesDialog;
diff --git a/chart2/source/inc/ChartTypeHelper.hxx
b/chart2/source/inc/ChartTypeHelper.hxx
index 0addc73790db..b7ef2ca31da6 100644
--- a/chart2/source/inc/ChartTypeHelper.hxx
+++ b/chart2/source/inc/ChartTypeHelper.hxx
@@ -19,7 +19,6 @@
#pragma once
-#include <config_options.h>
#include <com/sun/star/drawing/Direction3D.hpp>
#include "ChartType.hxx"
#include <rtl/ref.hxx>
diff --git a/chart2/source/inc/ChartTypeTemplate.hxx
b/chart2/source/inc/ChartTypeTemplate.hxx
index 9e641eeaea1e..e90f7c306f4b 100644
--- a/chart2/source/inc/ChartTypeTemplate.hxx
+++ b/chart2/source/inc/ChartTypeTemplate.hxx
@@ -27,9 +27,6 @@
#include <vector>
namespace com::sun::star::beans { struct PropertyValue; }
-namespace com::sun::star::chart2 { class XChartType; }
-namespace com::sun::star::chart2 { class XDataSeries; }
-namespace com::sun::star::chart2 { class XDiagram; }
namespace com::sun::star::chart2::data { class XDataSource; }
namespace com::sun::star::chart2::data { class XLabeledDataSequence; }
namespace com::sun::star::uno { class XComponentContext; }
diff --git a/chart2/source/inc/ChartViewHelper.hxx
b/chart2/source/inc/ChartViewHelper.hxx
index 1a6425ffae55..411d89069c4d 100644
--- a/chart2/source/inc/ChartViewHelper.hxx
+++ b/chart2/source/inc/ChartViewHelper.hxx
@@ -18,7 +18,6 @@
*/
#pragma once
-#include <config_options.h>
#include <rtl/ref.hxx>
#include <com/sun/star/uno/Reference.hxx>
diff --git a/chart2/source/inc/ControllerLockGuard.hxx
b/chart2/source/inc/ControllerLockGuard.hxx
index 41fc545c4681..f9658002dac2 100644
--- a/chart2/source/inc/ControllerLockGuard.hxx
+++ b/chart2/source/inc/ControllerLockGuard.hxx
@@ -18,8 +18,6 @@
*/
#pragma once
-#include <config_options.h>
-
#include <rtl/ref.hxx>
namespace chart
diff --git a/chart2/source/inc/DataSeries.hxx b/chart2/source/inc/DataSeries.hxx
index 10dfb0e45840..b6ac352e308b 100644
--- a/chart2/source/inc/DataSeries.hxx
+++ b/chart2/source/inc/DataSeries.hxx
@@ -42,7 +42,6 @@ namespace com::sun::star::beans { class XPropertySet; }
namespace chart
{
-class LabeledDataSequence;
class RegressionCurveModel;
namespace impl
diff --git a/chart2/source/inc/DataSeriesHelper.hxx
b/chart2/source/inc/DataSeriesHelper.hxx
index 1bde79c29fdb..f05566951632 100644
--- a/chart2/source/inc/DataSeriesHelper.hxx
+++ b/chart2/source/inc/DataSeriesHelper.hxx
@@ -18,7 +18,6 @@
*/
#pragma once
-#include <config_options.h>
#include "StackMode.hxx"
#include <com/sun/star/uno/Reference.h>
#include <rtl/ustring.hxx>
@@ -30,14 +29,12 @@ namespace com::sun::star::beans { class XPropertySet; }
namespace com::sun::star::chart2::data { class XDataSequence; }
namespace com::sun::star::chart2::data { class XDataSource; }
namespace com::sun::star::chart2::data { class XLabeledDataSequence; }
-namespace com::sun::star::uno { class Any; }
namespace com::sun::star::uno { template <class E> class Sequence; }
namespace chart { class BaseCoordinateSystem; }
namespace chart { class ChartType; }
namespace chart { class DataSource; }
namespace chart { class Diagram; }
namespace chart { class DataSeries; }
-namespace chart { class ChartModel; }
namespace chart::DataSeriesHelper
{
diff --git a/chart2/source/inc/DataSource.hxx b/chart2/source/inc/DataSource.hxx
index f7f837d90b17..a56baee78c9c 100644
--- a/chart2/source/inc/DataSource.hxx
+++ b/chart2/source/inc/DataSource.hxx
@@ -18,7 +18,6 @@
*/
#pragma once
-#include <config_options.h>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/chart2/data/XDataSource.hpp>
#include <com/sun/star/chart2/data/XDataSink.hpp>
diff --git a/chart2/source/inc/DataSourceHelper.hxx
b/chart2/source/inc/DataSourceHelper.hxx
index a683c6a1c4b6..0247f083dbba 100644
--- a/chart2/source/inc/DataSourceHelper.hxx
+++ b/chart2/source/inc/DataSourceHelper.hxx
@@ -19,7 +19,6 @@
#pragma once
-#include <config_options.h>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Sequence.h>
#include <rtl/ref.hxx>
diff --git a/chart2/source/inc/Diagram.hxx b/chart2/source/inc/Diagram.hxx
index 4945c7bde95b..246aab1e431b 100644
--- a/chart2/source/inc/Diagram.hxx
+++ b/chart2/source/inc/Diagram.hxx
@@ -19,6 +19,7 @@
#pragma once
#include "OPropertySet.hxx"
+#include "ChartTypeTemplate.hxx"
#include <cppuhelper/implbase.hxx>
#include <comphelper/uno3.hxx>
#include <com/sun/star/chart2/XDiagram.hpp>
@@ -31,9 +32,6 @@
#include <vector>
-namespace com::sun::star::beans { struct PropertyValue; }
-namespace com::sun::star::chart2 { class XDataSeries; }
-namespace com::sun::star::chart2::data { class XDataSource; }
namespace com::sun::star::uno { class XComponentContext; }
namespace chart
@@ -42,7 +40,6 @@ class Axis;
class BaseCoordinateSystem;
class ChartType;
class ChartTypeManager;
-class ChartTypeTemplate;
class DataSeries;
class Legend;
class DataTable;
diff --git a/chart2/source/inc/DiagramHelper.hxx
b/chart2/source/inc/DiagramHelper.hxx
index 10c9e6de5b2e..61f4dadbcf3d 100644
--- a/chart2/source/inc/DiagramHelper.hxx
+++ b/chart2/source/inc/DiagramHelper.hxx
@@ -31,7 +31,6 @@ namespace chart
{
class BaseCoordinateSystem;
class ChartType;
-class DataSeries;
class DiagramHelper
{
diff --git a/chart2/source/inc/DisposeHelper.hxx
b/chart2/source/inc/DisposeHelper.hxx
index e39c88760dcc..41195e271576 100644
--- a/chart2/source/inc/DisposeHelper.hxx
+++ b/chart2/source/inc/DisposeHelper.hxx
@@ -20,6 +20,7 @@
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/lang/XComponent.hpp>
+#include <rtl/ref.hxx>
namespace chart::DisposeHelper
{
diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx
index 869b3e306fdc..e710bfc75c5c 100644
--- a/chart2/source/inc/ErrorBar.hxx
+++ b/chart2/source/inc/ErrorBar.hxx
@@ -18,8 +18,6 @@
*/
#pragma once
-#include <config_options.h>
-
#include <cppuhelper/implbase.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -30,7 +28,6 @@
#include <com/sun/star/drawing/LineJoint.hpp>
#include <com/sun/star/drawing/LineDash.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/Any.h>
#include <com/sun/star/util/XCloneable.hpp>
#include <com/sun/star/util/Color.hpp>
#include <com/sun/star/util/XModifyListener.hpp>
diff --git a/chart2/source/inc/ExplicitCategoriesProvider.hxx
b/chart2/source/inc/ExplicitCategoriesProvider.hxx
index 9e43abfc268e..210285d6a7e6 100644
--- a/chart2/source/inc/ExplicitCategoriesProvider.hxx
+++ b/chart2/source/inc/ExplicitCategoriesProvider.hxx
@@ -18,7 +18,6 @@
*/
#pragma once
-#include <config_options.h>
#include <unotools/weakref.hxx>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Sequence.h>
@@ -27,7 +26,6 @@
#include <vector>
namespace chart { class ChartModel; }
-namespace com::sun::star::chart2::data { class XDataProvider; }
namespace com::sun::star::chart2::data { class XDataSequence; }
namespace com::sun::star::chart2::data { class XLabeledDataSequence; }
namespace com::sun::star::uno { class Any; }
diff --git a/chart2/source/inc/HistogramDataSequence.hxx
b/chart2/source/inc/HistogramDataSequence.hxx
index 3a8ac0233476..58d88c28af91 100644
--- a/chart2/source/inc/HistogramDataSequence.hxx
+++ b/chart2/source/inc/HistogramDataSequence.hxx
@@ -12,7 +12,6 @@
// helper classes
#include <comphelper/compbase.hxx>
#include <comphelper/uno3.hxx>
-#include <comphelper/broadcasthelper.hxx>
#include <comphelper/propertycontainer2.hxx>
#include <comphelper/proparrhlp.hxx>
#include <rtl/ref.hxx>
@@ -25,7 +24,6 @@
#include <com/sun/star/chart2/data/XNumericalDataSequence.hpp>
#include <com/sun/star/chart2/data/XTextualDataSequence.hpp>
#include <com/sun/star/util/XCloneable.hpp>
-#include <com/sun/star/util/XModifiable.hpp>
namespace chart
{
diff --git a/chart2/source/inc/InternalDataProvider.hxx
b/chart2/source/inc/InternalDataProvider.hxx
index 26a759c56865..e779cae2fc38 100644
--- a/chart2/source/inc/InternalDataProvider.hxx
+++ b/chart2/source/inc/InternalDataProvider.hxx
@@ -35,8 +35,6 @@
#include <map>
-namespace com::sun::star::chart2 { class XChartDocument; }
-
namespace chart
{
class ChartModel;
diff --git a/chart2/source/inc/LabeledDataSequence.hxx
b/chart2/source/inc/LabeledDataSequence.hxx
index c36f1918cfa5..6fccb3a1c510 100644
--- a/chart2/source/inc/LabeledDataSequence.hxx
+++ b/chart2/source/inc/LabeledDataSequence.hxx
@@ -18,7 +18,6 @@
*/
#pragma once
-#include <config_options.h>
#include <cppuhelper/implbase.hxx>
#include <com/sun/star/chart2/data/XLabeledDataSequence2.hpp>
@@ -26,8 +25,6 @@
#include "ModifyListenerHelper.hxx"
namespace com::sun::star::chart2::data { class XDataSequence; }
-namespace com::sun::star::util { class XCloneable; }
-namespace com::sun::star::util { class XModifyListener; }
namespace chart
{
diff --git a/chart2/source/inc/LegendHelper.hxx
b/chart2/source/inc/LegendHelper.hxx
index 577047888ee8..94ac9b5efe1d 100644
--- a/chart2/source/inc/LegendHelper.hxx
+++ b/chart2/source/inc/LegendHelper.hxx
@@ -18,7 +18,6 @@
*/
#pragma once
-#include <config_options.h>
#include <com/sun/star/uno/Reference.hxx>
#include <rtl/ref.hxx>
diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx
index 1e3e2cee26ab..acf4fbdafa7b 100644
--- a/chart2/source/inc/LifeTime.hxx
+++ b/chart2/source/inc/LifeTime.hxx
@@ -18,7 +18,6 @@
*/
#pragma once
-#include <config_options.h>
#include <mutex>
#include <osl/conditn.hxx>
#include <comphelper/interfacecontainer4.hxx>
diff --git a/chart2/source/inc/MediaDescriptorHelper.hxx
b/chart2/source/inc/MediaDescriptorHelper.hxx
index 49893e543241..4497b03d86a0 100644
--- a/chart2/source/inc/MediaDescriptorHelper.hxx
+++ b/chart2/source/inc/MediaDescriptorHelper.hxx
@@ -18,7 +18,6 @@
*/
#pragma once
-#include <config_options.h>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/chart2/source/inc/ModifyListenerCallBack.hxx
b/chart2/source/inc/ModifyListenerCallBack.hxx
index 433512bb8244..c1f34619318b 100644
--- a/chart2/source/inc/ModifyListenerCallBack.hxx
+++ b/chart2/source/inc/ModifyListenerCallBack.hxx
@@ -19,7 +19,6 @@
#pragma once
-#include <config_options.h>
#include <tools/link.hxx>
#include <com/sun/star/util/XModifyBroadcaster.hpp>
#include <com/sun/star/util/XModifyListener.hpp>
diff --git a/chart2/source/inc/ModifyListenerHelper.hxx
b/chart2/source/inc/ModifyListenerHelper.hxx
index ee90d407a66f..f631b4c95cc0 100644
--- a/chart2/source/inc/ModifyListenerHelper.hxx
+++ b/chart2/source/inc/ModifyListenerHelper.hxx
@@ -24,7 +24,6 @@
#include <comphelper/compbase.hxx>
#include <rtl/ref.hxx>
-#include <mutex>
#include <algorithm>
#include <utility>
diff --git a/chart2/source/inc/NumberFormatterWrapper.hxx
b/chart2/source/inc/NumberFormatterWrapper.hxx
index a229beafcda2..e39d34aa8685 100644
--- a/chart2/source/inc/NumberFormatterWrapper.hxx
+++ b/chart2/source/inc/NumberFormatterWrapper.hxx
@@ -18,7 +18,6 @@
*/
#pragma once
-#include <config_options.h>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <tools/date.hxx>
diff --git a/chart2/source/inc/OPropertySet.hxx
b/chart2/source/inc/OPropertySet.hxx
index 037d626fcf83..5a1676addcfa 100644
--- a/chart2/source/inc/OPropertySet.hxx
+++ b/chart2/source/inc/OPropertySet.hxx
@@ -19,7 +19,6 @@
#pragma once
-#include <config_options.h>
// helper classes
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/propshlp.hxx>
diff --git a/chart2/source/inc/PopupRequest.hxx
b/chart2/source/inc/PopupRequest.hxx
index 3caeffc0d98a..7f15602edcfa 100644
--- a/chart2/source/inc/PopupRequest.hxx
+++ b/chart2/source/inc/PopupRequest.hxx
@@ -9,8 +9,6 @@
#pragma once
-#include <config_options.h>
-
#include <comphelper/compbase.hxx>
#include <com/sun/star/awt/XRequestCallback.hpp>
diff --git a/chart2/source/inc/PropertyHelper.hxx
b/chart2/source/inc/PropertyHelper.hxx
index 26f395fa1b06..3b4a281dbbc7 100644
--- a/chart2/source/inc/PropertyHelper.hxx
+++ b/chart2/source/inc/PropertyHelper.hxx
@@ -18,7 +18,6 @@
*/
#pragma once
-#include <config_options.h>
#include <com/sun/star/beans/Property.hpp>
#include <com/sun/star/uno/Any.hxx>
diff --git a/chart2/source/inc/ReferenceSizeProvider.hxx
b/chart2/source/inc/ReferenceSizeProvider.hxx
index 006618dd5dba..2df3167b1e2b 100644
--- a/chart2/source/inc/ReferenceSizeProvider.hxx
+++ b/chart2/source/inc/ReferenceSizeProvider.hxx
@@ -18,7 +18,6 @@
*/
#pragma once
-#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/awt/Size.hpp>
#include <rtl/ref.hxx>
#include <ChartModel.hxx>
diff --git a/chart2/source/inc/RegressionCurveCalculator.hxx
b/chart2/source/inc/RegressionCurveCalculator.hxx
index ebb3ad40f616..9e2472de4eb9 100644
--- a/chart2/source/inc/RegressionCurveCalculator.hxx
+++ b/chart2/source/inc/RegressionCurveCalculator.hxx
@@ -23,7 +23,6 @@
#include <com/sun/star/chart2/XRegressionCurveCalculator.hpp>
-namespace com::sun::star::util { class XNumberFormatsSupplier; }
namespace com::sun::star::util { class XNumberFormatter; }
namespace chart
diff --git a/chart2/source/inc/RegressionCurveHelper.hxx
b/chart2/source/inc/RegressionCurveHelper.hxx
index a730b91d900d..b309fe1cd392 100644
--- a/chart2/source/inc/RegressionCurveHelper.hxx
+++ b/chart2/source/inc/RegressionCurveHelper.hxx
@@ -18,17 +18,12 @@
*/
#pragma once
-#include <config_options.h>
#include <svx/chrtitem.hxx>
#include <rtl/ref.hxx>
-#include <vector>
-
namespace com::sun::star::beans { class XPropertySet; }
namespace com::sun::star::chart2 { class XRegressionCurve; }
-namespace com::sun::star::chart2 { class XRegressionCurveCalculator; }
namespace com::sun::star::chart2 { class XRegressionCurveContainer; }
-namespace com::sun::star::chart2::data { class XDataSource; }
namespace chart { class ChartModel; }
namespace chart { class DataSeries; }
namespace chart { class RegressionCurveModel; }
diff --git a/chart2/source/inc/RelativePositionHelper.hxx
b/chart2/source/inc/RelativePositionHelper.hxx
index 71b25fc153b1..d89ab7d3c1a9 100644
--- a/chart2/source/inc/RelativePositionHelper.hxx
+++ b/chart2/source/inc/RelativePositionHelper.hxx
@@ -19,7 +19,6 @@
#pragma once
-#include <config_options.h>
#include <com/sun/star/chart2/RelativePosition.hpp>
#include <com/sun/star/drawing/Alignment.hpp>
#include <com/sun/star/awt/Point.hpp>
diff --git a/chart2/source/inc/RelativeSizeHelper.hxx
b/chart2/source/inc/RelativeSizeHelper.hxx
index 753d4deabe83..0be83c029485 100644
--- a/chart2/source/inc/RelativeSizeHelper.hxx
+++ b/chart2/source/inc/RelativeSizeHelper.hxx
@@ -18,8 +18,6 @@
*/
#pragma once
-#include <config_options.h>
-
namespace com::sun::star::awt { struct Size; }
namespace com::sun::star::beans { class XPropertySet; }
namespace com::sun::star::uno { template <class interface_type> class
Reference; }
diff --git a/chart2/source/inc/SceneProperties.hxx
b/chart2/source/inc/SceneProperties.hxx
index 69eaec2b4c16..bf0462dc063e 100644
--- a/chart2/source/inc/SceneProperties.hxx
+++ b/chart2/source/inc/SceneProperties.hxx
@@ -18,7 +18,6 @@
*/
#pragma once
-#include <config_options.h>
#include "PropertyHelper.hxx"
#include "FastPropertyIdRanges.hxx"
diff --git a/chart2/source/inc/StatisticsHelper.hxx
b/chart2/source/inc/StatisticsHelper.hxx
index 44fcb600d38c..b060a5856555 100644
--- a/chart2/source/inc/StatisticsHelper.hxx
+++ b/chart2/source/inc/StatisticsHelper.hxx
@@ -18,7 +18,6 @@
*/
#pragma once
-#include <config_options.h>
#include <com/sun/star/uno/Reference.h>
#include <rtl/ustring.hxx>
#include <rtl/ref.hxx>
diff --git a/chart2/source/inc/ThreeDHelper.hxx
b/chart2/source/inc/ThreeDHelper.hxx
index 04df1f8a22a3..6dc8a5dc62f0 100644
--- a/chart2/source/inc/ThreeDHelper.hxx
+++ b/chart2/source/inc/ThreeDHelper.hxx
@@ -19,7 +19,6 @@
#pragma once
-#include <config_options.h>
#include <com/sun/star/drawing/CameraGeometry.hpp>
#include <rtl/ref.hxx>
diff --git a/chart2/source/inc/UncachedDataSequence.hxx
b/chart2/source/inc/UncachedDataSequence.hxx
index 5691413af528..b2f6930faaaf 100644
--- a/chart2/source/inc/UncachedDataSequence.hxx
+++ b/chart2/source/inc/UncachedDataSequence.hxx
@@ -21,7 +21,6 @@
// helper classes
#include <comphelper/compbase.hxx>
#include <comphelper/uno3.hxx>
-#include <comphelper/broadcasthelper.hxx>
#include <comphelper/propertycontainer2.hxx>
#include <comphelper/proparrhlp.hxx>
#include <rtl/ref.hxx>
@@ -36,8 +35,6 @@
#include <com/sun/star/util/XCloneable.hpp>
#include <com/sun/star/util/XModifiable.hpp>
-namespace com::sun::star::beans { class XPropertySetInfo; }
-
namespace chart
{
class InternalDataProvider;
diff --git a/chart2/source/inc/UserDefinedProperties.hxx
b/chart2/source/inc/UserDefinedProperties.hxx
index 0254cafe7035..7f9c5a1e306d 100644
--- a/chart2/source/inc/UserDefinedProperties.hxx
+++ b/chart2/source/inc/UserDefinedProperties.hxx
@@ -18,7 +18,6 @@
*/
#pragma once
-#include <config_options.h>
#include "FastPropertyIdRanges.hxx"
#include <vector>
diff --git a/chart2/source/inc/WeakListenerAdapter.hxx
b/chart2/source/inc/WeakListenerAdapter.hxx
index e312f7bee56f..b0a3bc4c6d0c 100644
--- a/chart2/source/inc/WeakListenerAdapter.hxx
+++ b/chart2/source/inc/WeakListenerAdapter.hxx
@@ -18,7 +18,6 @@
*/
#pragma once
-#include <com/sun/star/lang/XEventListener.hpp>
#include <com/sun/star/view/XSelectionChangeListener.hpp>
#include <cppuhelper/weakref.hxx>
#include <cppuhelper/implbase.hxx>
diff --git a/chart2/source/inc/WrappedProperty.hxx
b/chart2/source/inc/WrappedProperty.hxx
index d2560cfa783d..cc8f30b1bd26 100644
--- a/chart2/source/inc/WrappedProperty.hxx
+++ b/chart2/source/inc/WrappedProperty.hxx
@@ -18,7 +18,6 @@
*/
#pragma once
-#include <config_options.h>
#include <com/sun/star/beans/PropertyState.hpp>
#include <com/sun/star/uno/Any.hxx>
#include <rtl/ustring.hxx>
diff --git a/chart2/source/inc/WrappedPropertySet.hxx
b/chart2/source/inc/WrappedPropertySet.hxx
index 88dd8248d6e9..a9bf9878cbf2 100644
--- a/chart2/source/inc/WrappedPropertySet.hxx
+++ b/chart2/source/inc/WrappedPropertySet.hxx
@@ -18,7 +18,6 @@
*/
#pragma once
-#include <config_options.h>
#include "WrappedProperty.hxx"
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/beans/XMultiPropertyStates.hpp>
diff --git a/chart2/source/inc/chartview/ExplicitScaleValues.hxx
b/chart2/source/inc/chartview/ExplicitScaleValues.hxx
index 350d6e35ef67..504ff4481e1b 100644
--- a/chart2/source/inc/chartview/ExplicitScaleValues.hxx
+++ b/chart2/source/inc/chartview/ExplicitScaleValues.hxx
@@ -18,7 +18,6 @@
*/
#pragma once
-#include <config_options.h>
#include <com/sun/star/chart/TimeInterval.hpp>
#include <com/sun/star/chart2/AxisOrientation.hpp>
#include <com/sun/star/chart2/XScaling.hpp>
diff --git a/chart2/source/model/template/FunnelChartTypeTemplate.cxx
b/chart2/source/model/template/FunnelChartTypeTemplate.cxx
index 40b3897f8ad1..3e6d95b5be51 100644
--- a/chart2/source/model/template/FunnelChartTypeTemplate.cxx
+++ b/chart2/source/model/template/FunnelChartTypeTemplate.cxx
@@ -10,7 +10,6 @@
#include "FunnelChartTypeTemplate.hxx"
#include "ColumnChartType.hxx"
#include <Diagram.hxx>
-#include <DiagramHelper.hxx>
#include <DataSeries.hxx>
#include <DataSeriesHelper.hxx>
#include <PropertyHelper.hxx>
diff --git a/chart2/source/model/template/HistogramChartType.cxx
b/chart2/source/model/template/HistogramChartType.cxx
index 2f202de39945..42a53851ee25 100644
--- a/chart2/source/model/template/HistogramChartType.cxx
+++ b/chart2/source/model/template/HistogramChartType.cxx
@@ -23,8 +23,7 @@
#include <cppuhelper/supportsservice.hxx>
#include <algorithm>
-#include <cmath>
-#include <iostream>
+
namespace com::sun::star::uno
{
class XComponentContext;
diff --git a/chart2/source/model/template/HistogramChartTypeTemplate.cxx
b/chart2/source/model/template/HistogramChartTypeTemplate.cxx
index b30d1205c429..40bd8e48008a 100644
--- a/chart2/source/model/template/HistogramChartTypeTemplate.cxx
+++ b/chart2/source/model/template/HistogramChartTypeTemplate.cxx
@@ -16,9 +16,7 @@
#include <PropertyHelper.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
-#include <com/sun/star/chart2/DataPointGeometry3D.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <comphelper/diagnose_ex.hxx>
#include <algorithm>
diff --git a/chart2/source/model/template/HistogramDataInterpreter.cxx
b/chart2/source/model/template/HistogramDataInterpreter.cxx
index c78f3b298b33..e40d30b228ed 100644
--- a/chart2/source/model/template/HistogramDataInterpreter.cxx
+++ b/chart2/source/model/template/HistogramDataInterpreter.cxx
@@ -10,16 +10,6 @@
#include <sal/config.h>
#include "HistogramDataInterpreter.hxx"
-#include <HistogramDataSequence.hxx>
-#include "HistogramCalculator.hxx"
-#include <LabeledDataSequence.hxx>
-
-#include <DataSeries.hxx>
-#include <DataSeriesHelper.hxx>
-#include <CommonConverters.hxx>
-#include <com/sun/star/util/XCloneable.hpp>
-#include <comphelper/diagnose_ex.hxx>
-#include <sal/log.hxx>
using namespace css;
diff --git a/chart2/source/model/template/NetChartTypeTemplate.cxx
b/chart2/source/model/template/NetChartTypeTemplate.cxx
index 07537c66b1df..18186f25e573 100644
--- a/chart2/source/model/template/NetChartTypeTemplate.cxx
+++ b/chart2/source/model/template/NetChartTypeTemplate.cxx
@@ -22,7 +22,6 @@
#include "NetChartType.hxx"
#include <Diagram.hxx>
#include <DataSeries.hxx>
-#include <DataSeriesHelper.hxx>
#include <ChartType.hxx>
#include <com/sun/star/chart2/SymbolStyle.hpp>
#include <com/sun/star/chart2/Symbol.hpp>
diff --git a/chart2/source/model/template/PieChartType.hxx
b/chart2/source/model/template/PieChartType.hxx
index 083bd78facd3..5a1e46f43d88 100644
--- a/chart2/source/model/template/PieChartType.hxx
+++ b/chart2/source/model/template/PieChartType.hxx
@@ -19,7 +19,6 @@
#pragma once
#include <ChartType.hxx>
-#include <com/sun/star/chart2/PieChartSubType.hpp>
namespace chart
{
diff --git a/chart2/source/tools/CachedDataSequence.cxx
b/chart2/source/tools/CachedDataSequence.cxx
index 13755af2c7b3..5aa39175c327 100644
--- a/chart2/source/tools/CachedDataSequence.cxx
+++ b/chart2/source/tools/CachedDataSequence.cxx
@@ -24,8 +24,6 @@
#include <comphelper/sequenceashashmap.hxx>
#include <cppuhelper/supportsservice.hxx>
-#include <algorithm>
-
using namespace ::com::sun::star;
using ::com::sun::star::uno::Sequence;
diff --git a/chart2/source/tools/ChartColorPaletteHelper.cxx
b/chart2/source/tools/ChartColorPaletteHelper.cxx
index 9373bf242b70..109143ce851f 100644
--- a/chart2/source/tools/ChartColorPaletteHelper.cxx
+++ b/chart2/source/tools/ChartColorPaletteHelper.cxx
@@ -8,11 +8,9 @@
*/
#include <ChartColorPaletteHelper.hxx>
-#include <ChartModel.hxx>
#include <sal/log.hxx>
-#include <docmodel/uno/UnoTheme.hxx>
+#include <vcl/outdev.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/virdev.hxx>
namespace chart
{
diff --git a/chart2/source/tools/ChartColorScheme.cxx
b/chart2/source/tools/ChartColorScheme.cxx
index 816ecb422423..5fbea2aa5b40 100644
--- a/chart2/source/tools/ChartColorScheme.cxx
+++ b/chart2/source/tools/ChartColorScheme.cxx
@@ -19,8 +19,6 @@
#include <ChartColorScheme.hxx>
-#include <cppuhelper/supportsservice.hxx>
-
namespace chart
{
// explicit
diff --git a/chart2/source/tools/ChartTypeHelper.cxx
b/chart2/source/tools/ChartTypeHelper.cxx
index 8582611360f9..578c166465d4 100644
--- a/chart2/source/tools/ChartTypeHelper.cxx
+++ b/chart2/source/tools/ChartTypeHelper.cxx
@@ -26,7 +26,6 @@
#include <com/sun/star/chart/DataLabelPlacement.hpp>
#include <com/sun/star/chart/MissingValueTreatment.hpp>
-#include <com/sun/star/chart2/AxisType.hpp>
#include <com/sun/star/chart2/StackingDirection.hpp>
#include <comphelper/diagnose_ex.hxx>
diff --git a/chart2/source/tools/ChartViewHelper.cxx
b/chart2/source/tools/ChartViewHelper.cxx
index dc91c4361493..fe720151767d 100644
--- a/chart2/source/tools/ChartViewHelper.cxx
+++ b/chart2/source/tools/ChartViewHelper.cxx
@@ -20,7 +20,6 @@
#include <ChartViewHelper.hxx>
#include <ChartModel.hxx>
#include <ChartView.hxx>
-#include <servicenames.hxx>
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/util/XModifyListener.hpp>
diff --git a/chart2/source/tools/ConfigColorScheme.cxx
b/chart2/source/tools/ConfigColorScheme.cxx
index b4bbd8dfa369..e060f4be189e 100644
--- a/chart2/source/tools/ConfigColorScheme.cxx
+++ b/chart2/source/tools/ConfigColorScheme.cxx
@@ -20,7 +20,6 @@
#include <ConfigColorScheme.hxx>
#include <unotools/configitem.hxx>
-#include <cppuhelper/supportsservice.hxx>
using namespace ::com::sun::star;
diff --git a/chart2/source/tools/ControllerLockGuard.cxx
b/chart2/source/tools/ControllerLockGuard.cxx
index 6bfe8e4a95d2..5373d44f4090 100644
--- a/chart2/source/tools/ControllerLockGuard.cxx
+++ b/chart2/source/tools/ControllerLockGuard.cxx
@@ -21,8 +21,6 @@
#include <ChartModel.hxx>
#include <utility>
-using namespace ::com::sun::star;
-
namespace chart
{
diff --git a/chart2/source/tools/DataSeriesHelper.cxx
b/chart2/source/tools/DataSeriesHelper.cxx
index d3343d8dbcf3..a9a5e15f904d 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -19,7 +19,6 @@
#include <DataSeriesHelper.hxx>
#include <DataSeries.hxx>
-#include <DataSeriesProperties.hxx>
#include <DataSource.hxx>
#include <ChartType.hxx>
#include <unonames.hxx>
@@ -31,10 +30,6 @@
#include <com/sun/star/chart2/DataPointLabel.hpp>
#include <com/sun/star/chart2/StackingDirection.hpp>
#include <com/sun/star/chart2/AxisType.hpp>
-#include <com/sun/star/chart2/SymbolStyle.hpp>
-#include <com/sun/star/chart2/Symbol.hpp>
-#include <com/sun/star/chart2/XDiagram.hpp>
-#include <com/sun/star/drawing/LineStyle.hpp>
#include <comphelper/sequence.hxx>
#include <comphelper/diagnose_ex.hxx>
@@ -47,7 +42,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
-using namespace ::chart::DataSeriesProperties;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
diff --git a/chart2/source/tools/DiagramHelper.cxx
b/chart2/source/tools/DiagramHelper.cxx
index c6b8984a49a5..f10a176e0cc6 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -44,7 +44,6 @@
#include <unotools/saveopt.hxx>
#include <svl/numformat.hxx>
#include <svl/zforlist.hxx>
-#include <svl/zformat.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <comphelper/sequence.hxx>
diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx
b/chart2/source/tools/ExplicitCategoriesProvider.cxx
index 4fdb742da390..a8c055c4f3ba 100644
--- a/chart2/source/tools/ExplicitCategoriesProvider.cxx
+++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx
@@ -20,7 +20,6 @@
#include <ExplicitCategoriesProvider.hxx>
#include <DiagramHelper.hxx>
#include <ChartType.hxx>
-#include <ChartTypeHelper.hxx>
#include <Axis.hxx>
#include <AxisHelper.hxx>
#include <DataSourceHelper.hxx>
@@ -36,7 +35,6 @@
#include <o3tl/safeint.hxx>
#include <rtl/ustrbuf.hxx>
#include <comphelper/diagnose_ex.hxx>
-#include <svl/numuno.hxx>
#include <limits>
diff --git a/chart2/source/tools/FormattedStringHelper.cxx
b/chart2/source/tools/FormattedStringHelper.cxx
index 6b881160670f..8426a64c667f 100644
--- a/chart2/source/tools/FormattedStringHelper.cxx
+++ b/chart2/source/tools/FormattedStringHelper.cxx
@@ -26,7 +26,6 @@ namespace chart
{
using namespace ::com::sun::star;
-using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
rtl::Reference< ::chart::FormattedString >
diff --git a/chart2/source/tools/HistogramDataSequence.cxx
b/chart2/source/tools/HistogramDataSequence.cxx
index c98a6c92fd33..fda1edaef433 100644
--- a/chart2/source/tools/HistogramDataSequence.cxx
+++ b/chart2/source/tools/HistogramDataSequence.cxx
@@ -9,17 +9,10 @@
#include <HistogramDataSequence.hxx>
-#include <CommonFunctors.hxx>
#include <ModifyListenerHelper.hxx>
-#include <comphelper/sequenceashashmap.hxx>
#include <cppuhelper/supportsservice.hxx>
-#include <algorithm>
-#include <strings.hrc>
-#include <ResId.hxx>
-#include <utility>
-
using namespace css;
namespace
diff --git a/chart2/source/tools/RegressionCurveHelper.cxx
b/chart2/source/tools/RegressionCurveHelper.cxx
index f7a773e5a0c8..8315fbed21b8 100644
--- a/chart2/source/tools/RegressionCurveHelper.cxx
+++ b/chart2/source/tools/RegressionCurveHelper.cxx
@@ -31,7 +31,6 @@
#include <PotentialRegressionCurveCalculator.hxx>
#include <CommonConverters.hxx>
#include <RegressionCurveModel.hxx>
-#include <ChartTypeHelper.hxx>
#include <ChartType.hxx>
#include <ChartModel.hxx>
#include <DataSeries.hxx>
@@ -40,7 +39,6 @@
#include <com/sun/star/chart2/AxisType.hpp>
#include <com/sun/star/chart2/XRegressionCurveCalculator.hpp>
#include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
-#include <com/sun/star/chart2/data/XDataSource.hpp>
#include <o3tl/safeint.hxx>
#include <comphelper/diagnose_ex.hxx>
#include <comphelper/property.hxx>
diff --git a/chart2/source/tools/SceneProperties.cxx
b/chart2/source/tools/SceneProperties.cxx
index eb65d81c94db..5e382bfe9a0e 100644
--- a/chart2/source/tools/SceneProperties.cxx
+++ b/chart2/source/tools/SceneProperties.cxx
@@ -18,7 +18,6 @@
*/
#include <SceneProperties.hxx>
-#include <ChartType.hxx>
#include <ChartTypeHelper.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/drawing/HomogenMatrix.hpp>
diff --git a/chart2/source/tools/ThreeDHelper.cxx
b/chart2/source/tools/ThreeDHelper.cxx
index 5db264e3505d..4bbe0e3f2a78 100644
--- a/chart2/source/tools/ThreeDHelper.cxx
+++ b/chart2/source/tools/ThreeDHelper.cxx
@@ -20,9 +20,8 @@
#include <basegfx/numeric/ftools.hxx>
#include <ThreeDHelper.hxx>
#include <Diagram.hxx>
-#include <ChartTypeHelper.hxx>
+#include <ChartType.hxx>
#include <DataSeries.hxx>
-#include <DataSeriesHelper.hxx>
#include <defines.hxx>
#include <com/sun/star/drawing/LineStyle.hpp>
@@ -33,7 +32,6 @@
namespace chart
{
using namespace ::com::sun::star;
-using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
using ::rtl::math::cos;
diff --git a/chart2/source/tools/UncachedDataSequence.cxx
b/chart2/source/tools/UncachedDataSequence.cxx
index 917135bef8aa..c1377266080a 100644
--- a/chart2/source/tools/UncachedDataSequence.cxx
+++ b/chart2/source/tools/UncachedDataSequence.cxx
@@ -23,7 +23,6 @@
#include <InternalDataProvider.hxx>
#include <cppuhelper/supportsservice.hxx>
-#include <algorithm>
#include <strings.hrc>
#include <ResId.hxx>
#include <utility>
diff --git a/chart2/source/view/axes/VAxisBase.hxx
b/chart2/source/view/axes/VAxisBase.hxx
index 4b1a8de92750..ee5748e48370 100644
--- a/chart2/source/view/axes/VAxisBase.hxx
+++ b/chart2/source/view/axes/VAxisBase.hxx
@@ -31,7 +31,6 @@ namespace chart
class VSeriesPlotter;
class DataTableView;
class ChartModel;
-class LegendEntryProvider;
class VAxisBase : public VAxisOrGridBase
{
diff --git a/chart2/source/view/axes/VAxisOrGridBase.cxx
b/chart2/source/view/axes/VAxisOrGridBase.cxx
index 290f3a36887e..edfedba2922d 100644
--- a/chart2/source/view/axes/VAxisOrGridBase.cxx
+++ b/chart2/source/view/axes/VAxisOrGridBase.cxx
@@ -24,7 +24,6 @@
namespace chart
{
using namespace ::com::sun::star;
-using namespace ::com::sun::star::chart2;
VAxisOrGridBase::VAxisOrGridBase( sal_Int32 nDimensionIndex, sal_Int32
nDimensionCount )
: PlotterBase( nDimensionCount )
diff --git a/chart2/source/view/axes/VAxisOrGridBase.hxx
b/chart2/source/view/axes/VAxisOrGridBase.hxx
index 1defc154a809..d66a9064111e 100644
--- a/chart2/source/view/axes/VAxisOrGridBase.hxx
+++ b/chart2/source/view/axes/VAxisOrGridBase.hxx
@@ -24,8 +24,6 @@
#include <basegfx/matrix/b3dhommatrix.hxx>
-namespace com::sun::star::drawing { struct HomogenMatrix; }
-
namespace chart
{
diff --git a/chart2/source/view/axes/VAxisProperties.hxx
b/chart2/source/view/axes/VAxisProperties.hxx
index 0cc23602b541..d29127882a04 100644
--- a/chart2/source/view/axes/VAxisProperties.hxx
+++ b/chart2/source/view/axes/VAxisProperties.hxx
@@ -28,7 +28,6 @@
#include <com/sun/star/chart/ChartAxisPosition.hpp>
#include <com/sun/star/awt/Rectangle.hpp>
#include <com/sun/star/awt/Size.hpp>
-#include <com/sun/star/uno/Any.hxx>
#include <rtl/ref.hxx>
#include <vector>
@@ -36,7 +35,6 @@
namespace chart { class ExplicitCategoriesProvider; }
namespace com::sun::star::beans { class XPropertySet; }
-namespace com::sun::star::chart2 { class XAxis; }
namespace com::sun::star::chart2::data { class XTextualDataSequence; }
namespace chart
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx
b/chart2/source/view/axes/VCartesianAxis.cxx
index a1bb2855b11d..c4d418f0517c 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -35,9 +35,7 @@
#include <tools/color.hxx>
#include <svx/unoshape.hxx>
#include <svx/unoshtxt.hxx>
-#include <VSeriesPlotter.hxx>
#include <DataTableView.hxx>
-#include <ChartModel.hxx>
#include <comphelper/scopeguard.hxx>
diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
index dbaeee1788ca..88d48496a858 100644
--- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
@@ -23,12 +23,10 @@
#include <BaseCoordinateSystem.hxx>
#include <AxisIndexDefines.hxx>
#include <Axis.hxx>
-#include <DataTable.hxx>
#include <Diagram.hxx>
#include <AxisHelper.hxx>
#include <cppuhelper/implbase.hxx>
#include <ChartModel.hxx>
-#include <GridProperties.hxx>
#include <com/sun/star/chart2/data/XTextualDataSequence.hpp>
#include <com/sun/star/chart2/AxisType.hpp>
diff --git a/chart2/source/view/axes/VCartesianGrid.cxx
b/chart2/source/view/axes/VCartesianGrid.cxx
index ef00c97f14b5..cd5305716383 100644
--- a/chart2/source/view/axes/VCartesianGrid.cxx
+++ b/chart2/source/view/axes/VCartesianGrid.cxx
@@ -35,7 +35,6 @@
namespace chart
{
using namespace ::com::sun::star;
-using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx
b/chart2/source/view/axes/VCoordinateSystem.cxx
index ff8b6dd0be13..271f3b6a26dd 100644
--- a/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -30,7 +30,6 @@
#include <ShapeFactory.hxx>
#include <servicenames_coosystems.hxx>
#include <ObjectIdentifier.hxx>
-#include <ExplicitCategoriesProvider.hxx>
#include <Axis.hxx>
#include "VAxisBase.hxx"
#include <defines.hxx>
diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx
b/chart2/source/view/axes/VPolarAngleAxis.cxx
index 91fec413dbcc..1196ee502fdd 100644
--- a/chart2/source/view/axes/VPolarAngleAxis.cxx
+++ b/chart2/source/view/axes/VPolarAngleAxis.cxx
@@ -28,8 +28,6 @@
#include <PlottingPositionHelper.hxx>
#include <tools/color.hxx>
-#include <memory>
-
namespace chart
{
using namespace ::com::sun::star;
diff --git a/chart2/source/view/axes/VPolarCoordinateSystem.cxx
b/chart2/source/view/axes/VPolarCoordinateSystem.cxx
index 99cb69430703..b330bf820a32 100644
--- a/chart2/source/view/axes/VPolarCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VPolarCoordinateSystem.cxx
@@ -25,9 +25,7 @@
#include <Axis.hxx>
#include <AxisHelper.hxx>
#include <Diagram.hxx>
-#include <DataTable.hxx>
#include <ChartModel.hxx>
-#include <GridProperties.hxx>
namespace chart
{
diff --git a/chart2/source/view/axes/VPolarGrid.hxx
b/chart2/source/view/axes/VPolarGrid.hxx
index 5c0a21bb4733..cc4ecbaa7277 100644
--- a/chart2/source/view/axes/VPolarGrid.hxx
+++ b/chart2/source/view/axes/VPolarGrid.hxx
@@ -22,7 +22,6 @@
#include "Tickmarks.hxx"
#include <PlottingPositionHelper.hxx>
#include <com/sun/star/drawing/PointSequenceSequence.hpp>
-#include <memory>
namespace chart { struct VLineProperties; }
diff --git a/chart2/source/view/charttypes/AreaChart.cxx
b/chart2/source/view/charttypes/AreaChart.cxx
index 65b3c8721f5f..ff923b46ec4c 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -25,7 +25,6 @@
#include <ObjectIdentifier.hxx>
#include "Splines.hxx"
#include <ChartType.hxx>
-#include <ChartTypeHelper.hxx>
#include <LabelPositionHelper.hxx>
#include <Clipping.hxx>
#include <Stripe.hxx>
diff --git a/chart2/source/view/charttypes/AreaChart.hxx
b/chart2/source/view/charttypes/AreaChart.hxx
index 411b9d6642aa..044d04679013 100644
--- a/chart2/source/view/charttypes/AreaChart.hxx
+++ b/chart2/source/view/charttypes/AreaChart.hxx
@@ -19,7 +19,6 @@
#pragma once
-#include <memory>
#include <VSeriesPlotter.hxx>
#include <PlottingPositionHelper.hxx>
#include <com/sun/star/chart2/CurveStyle.hpp>
diff --git a/chart2/source/view/charttypes/BarChart.hxx
b/chart2/source/view/charttypes/BarChart.hxx
index ff46786afcbb..ca13872a2baf 100644
--- a/chart2/source/view/charttypes/BarChart.hxx
+++ b/chart2/source/view/charttypes/BarChart.hxx
@@ -19,7 +19,6 @@
#pragma once
-#include <memory>
#include <VSeriesPlotter.hxx>
#include "BarPositionHelper.hxx"
diff --git a/chart2/source/view/charttypes/BarPositionHelper.cxx
b/chart2/source/view/charttypes/BarPositionHelper.cxx
index 279d998a02e4..b5fd92525740 100644
--- a/chart2/source/view/charttypes/BarPositionHelper.cxx
+++ b/chart2/source/view/charttypes/BarPositionHelper.cxx
@@ -22,8 +22,6 @@
namespace chart
{
-using namespace ::com::sun::star;
-
BarPositionHelper::BarPositionHelper()
: CategoryPositionHelper( 1 )
{
diff --git a/chart2/source/view/charttypes/CandleStickChart.hxx
b/chart2/source/view/charttypes/CandleStickChart.hxx
index 3202cf0d7eaf..88a31709fc8a 100644
--- a/chart2/source/view/charttypes/CandleStickChart.hxx
+++ b/chart2/source/view/charttypes/CandleStickChart.hxx
@@ -19,7 +19,6 @@
#pragma once
-#include <memory>
#include "BarPositionHelper.hxx"
#include <VSeriesPlotter.hxx>
diff --git a/chart2/source/view/charttypes/HistogramChart.cxx
b/chart2/source/view/charttypes/HistogramChart.cxx
index 3324d61a3f82..4f22e94e997d 100644
--- a/chart2/source/view/charttypes/HistogramChart.cxx
+++ b/chart2/source/view/charttypes/HistogramChart.cxx
@@ -10,28 +10,12 @@
#include "HistogramChart.hxx"
#include <ChartType.hxx>
-#include <../chart2/inc/ChartModel.hxx>
-#include <ShapeFactory.hxx>
-#include <CommonConverters.hxx>
-#include <ObjectIdentifier.hxx>
-#include <LabelPositionHelper.hxx>
-#include <AxisIndexDefines.hxx>
-#include <Clipping.hxx>
-#include <DateHelper.hxx>
-#include <svx/scene3d.hxx>
-#include <comphelper/scopeguard.hxx>
-
-#include <com/sun/star/chart/DataLabelPlacement.hpp>
-
-#include <com/sun/star/chart2/DataPointGeometry3D.hpp>
-#include <rtl/math.hxx>
+
#include <comphelper/diagnose_ex.hxx>
namespace chart
{
using namespace ::com::sun::star;
-using namespace ::rtl::math;
-using namespace ::com::sun::star::chart2;
HistogramChart::HistogramChart(const rtl::Reference<ChartType>&
xChartTypeModel,
sal_Int32 nDimensionCount)
diff --git a/chart2/source/view/charttypes/HistogramChart.hxx
b/chart2/source/view/charttypes/HistogramChart.hxx
index 907d1e08f45b..c1ecf10f778c 100644
--- a/chart2/source/view/charttypes/HistogramChart.hxx
+++ b/chart2/source/view/charttypes/HistogramChart.hxx
@@ -11,7 +11,6 @@
#include "BarChart.hxx"
#include "BarPositionHelper.hxx"
-#include <memory>
namespace chart
{
diff --git a/chart2/source/view/charttypes/PieChart.hxx
b/chart2/source/view/charttypes/PieChart.hxx
index a4d92f68fc52..1ba9aff81098 100644
--- a/chart2/source/view/charttypes/PieChart.hxx
+++ b/chart2/source/view/charttypes/PieChart.hxx
@@ -19,7 +19,6 @@
#pragma once
-#include <memory>
#include <VSeriesPlotter.hxx>
#include <PlottingPositionHelper.hxx>
#include <basegfx/vector/b2ivector.hxx>
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx
b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 94d5a55bec32..9fd7ae459e3b 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -37,7 +37,6 @@
#include <PlottingPositionHelper.hxx>
#include <LabelPositionHelper.hxx>
#include <ChartType.hxx>
-#include <ChartTypeHelper.hxx>
#include <Clipping.hxx>
#include <servicenames_charttypes.hxx>
#include <NumberFormatterWrapper.hxx>
@@ -87,9 +86,7 @@
#include <comphelper/diagnose_ex.hxx>
#include <sal/log.hxx>
-#include <functional>
#include <map>
-#include <unordered_map>
namespace chart {
diff --git a/chart2/source/view/diagram/VDiagram.cxx
b/chart2/source/view/diagram/VDiagram.cxx
index 1806483ff598..3b94c0cc86b2 100644
--- a/chart2/source/view/diagram/VDiagram.cxx
+++ b/chart2/source/view/diagram/VDiagram.cxx
@@ -24,10 +24,8 @@
#include <ViewDefines.hxx>
#include <Stripe.hxx>
#include <ObjectIdentifier.hxx>
-#include <DiagramHelper.hxx>
#include <ChartType.hxx>
#include <BaseGFXHelper.hxx>
-#include <ChartTypeHelper.hxx>
#include <ThreeDHelper.hxx>
#include <defines.hxx>
#include <editeng/unoprnms.hxx>
diff --git a/chart2/source/view/inc/DataTableView.hxx
b/chart2/source/view/inc/DataTableView.hxx
index f6a1ab2c97b6..d95f5fd7f6e1 100644
--- a/chart2/source/view/inc/DataTableView.hxx
+++ b/chart2/source/view/inc/DataTableView.hxx
@@ -11,17 +11,15 @@
#include <svx/unoshape.hxx>
#include <svx/unodraw/SvxTableShape.hxx>
-#include <com/sun/star/awt/Rectangle.hpp>
#include <com/sun/star/table/XTable.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
+#include <ChartModel.hxx>
#include <DataTable.hxx>
#include "VLineProperties.hxx"
namespace chart
{
class VSeriesPlotter;
-class ChartModel;
-class LegendEntryProvider;
/**
* DataTableView is responsible to create the table object, set the cell
diff --git a/chart2/source/view/inc/LegendEntryProvider.hxx
b/chart2/source/view/inc/LegendEntryProvider.hxx
index ce7722b0edfd..b9f4106c043c 100644
--- a/chart2/source/view/inc/LegendEntryProvider.hxx
+++ b/chart2/source/view/inc/LegendEntryProvider.hxx
@@ -18,25 +18,21 @@
*/
#pragma once
+#include <FormattedString.hxx>
+
#include <com/sun/star/chart2/LegendPosition.hpp>
-#include <com/sun/star/chart2/XFormattedString2.hpp>
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/uno/Sequence.h>
#include <rtl/ref.hxx>
#include <svx/unoshape.hxx>
#include <vector>
namespace chart { class ChartModel; }
namespace com::sun::star::beans { class XPropertySet; }
-namespace com::sun::star::drawing { class XShape; }
-namespace com::sun::star::drawing { class XShapes; }
-namespace com::sun::star::lang { class XMultiServiceFactory; }
namespace com::sun::star::uno { class XComponentContext; }
namespace chart
{
-class FormattedString;
enum class LegendSymbolStyle
{
diff --git a/chart2/source/view/inc/PolarLabelPositionHelper.hxx
b/chart2/source/view/inc/PolarLabelPositionHelper.hxx
index c980495f68c8..7d4640e76ca3 100644
--- a/chart2/source/view/inc/PolarLabelPositionHelper.hxx
+++ b/chart2/source/view/inc/PolarLabelPositionHelper.hxx
@@ -21,6 +21,7 @@
#include "LabelPositionHelper.hxx"
#include <com/sun/star/awt/Point.hpp>
+#include <basegfx/vector/b3dvector.hxx>
namespace chart
{
diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx
b/chart2/source/view/inc/VCoordinateSystem.hxx
index 381f137d4c09..22fac4dac966 100644
--- a/chart2/source/view/inc/VCoordinateSystem.hxx
+++ b/chart2/source/view/inc/VCoordinateSystem.hxx
@@ -33,17 +33,10 @@
namespace com::sun::star::awt { struct Rectangle; }
namespace com::sun::star::awt { struct Size; }
-namespace com::sun::star::beans { class XPropertySet; }
-namespace com::sun::star::chart2 { class XAxis; }
-namespace com::sun::star::chart2 { class XChartDocument; }
-namespace com::sun::star::chart2 { class XCoordinateSystem; }
-namespace com::sun::star::drawing { class XShapes; }
-namespace com::sun::star::lang { class XMultiServiceFactory; }
namespace com::sun::star::uno { class XComponentContext; }
namespace chart
{
-class ExplicitCategoriesProvider;
class ScaleAutomatism;
class ChartModel;
class Axis;
diff --git a/chart2/source/view/inc/VDataSeries.hxx
b/chart2/source/view/inc/VDataSeries.hxx
index aeb7bd01cfc6..572645565e5e 100644
--- a/chart2/source/view/inc/VDataSeries.hxx
+++ b/chart2/source/view/inc/VDataSeries.hxx
@@ -29,7 +29,6 @@
#include <rtl/ref.hxx>
#include <svx/unoshape.hxx>
-#include <memory>
#include <map>
namespace com::sun::star::beans { class XPropertySet; }
diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx
b/chart2/source/view/inc/VSeriesPlotter.hxx
index 57e5ee3db3f4..8c993f4e17ed 100644
--- a/chart2/source/view/inc/VSeriesPlotter.hxx
+++ b/chart2/source/view/inc/VSeriesPlotter.hxx
@@ -30,12 +30,9 @@
#include <svx/unoshape.hxx>
namespace com::sun::star::awt { struct Point; }
-namespace com::sun::star::chart2 { class XChartType; }
-
namespace chart { class ExplicitCategoriesProvider; }
namespace chart { struct ExplicitScaleData; }
-namespace chart { class ChartModel; }
namespace com::sun::star {
namespace util {
diff --git a/chart2/source/view/main/AxisUsage.hxx
b/chart2/source/view/main/AxisUsage.hxx
index 51a32a59b0e1..eea864b87918 100644
--- a/chart2/source/view/main/AxisUsage.hxx
+++ b/chart2/source/view/main/AxisUsage.hxx
@@ -20,7 +20,6 @@
#pragma once
#include <sal/types.h>
-#include <memory>
#include <map>
#include <VCoordinateSystem.hxx>
diff --git a/chart2/source/view/main/ChartItemPool.cxx
b/chart2/source/view/main/ChartItemPool.cxx
index 84903cd42609..e5599ef3fcd5 100644
--- a/chart2/source/view/main/ChartItemPool.cxx
+++ b/chart2/source/view/main/ChartItemPool.cxx
@@ -25,25 +25,18 @@
#include <Axis.hxx>
#include <svx/chrtitem.hxx>
#include <svx/sdangitm.hxx>
-#include <svx/svdpool.hxx>
-#include <svx/svx3ditems.hxx>
#include <svx/ChartColorPaletteType.hxx>
#include <svl/intitem.hxx>
-#include <editeng/editeng.hxx>
#include <editeng/brushitem.hxx>
-#include <editeng/eeitem.hxx>
#include <editeng/sizeitem.hxx>
#include <svl/stritem.hxx>
#include <svl/ilstitem.hxx>
-#include <comphelper/processfactory.hxx>
#include <editeng/editids.hrc>
#include <svx/svxids.hrc>
#include <vector>
#include <com/sun/star/chart2/LegendPosition.hpp>
#include <com/sun/star/chart2/MovingAverageType.hpp>
-#include <com/sun/star/frame/XTerminateListener.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
namespace chart
{
diff --git a/chart2/source/view/main/ChartItemPool.hxx
b/chart2/source/view/main/ChartItemPool.hxx
index 558ab3c6e2fc..8dc2459b264f 100644
--- a/chart2/source/view/main/ChartItemPool.hxx
+++ b/chart2/source/view/main/ChartItemPool.hxx
@@ -18,9 +18,7 @@
*/
#pragma once
-#include <tools/mapunit.hxx>
#include <svl/itempool.hxx>
-#include <memory>
namespace chart
{
diff --git a/chart2/source/view/main/DataTableView.cxx
b/chart2/source/view/main/DataTableView.cxx
index 6911e9cd5560..274f4d3be90f 100644
--- a/chart2/source/view/main/DataTableView.cxx
+++ b/chart2/source/view/main/DataTableView.cxx
@@ -16,21 +16,17 @@
#include <svx/svdotable.hxx>
-#include <com/sun/star/table/BorderLine.hpp>
#include <com/sun/star/table/BorderLine2.hpp>
-#include <com/sun/star/table/TableBorder.hpp>
#include <com/sun/star/table/BorderLineStyle.hpp>
#include <com/sun/star/text/XTextRange.hpp>
#include <com/sun/star/text/XText.hpp>
#include <com/sun/star/style/ParagraphAdjust.hpp>
-#include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
#include <com/sun/star/drawing/TextVerticalAdjust.hpp>
#include <com/sun/star/drawing/LineDash.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
#include <com/sun/star/drawing/FillStyle.hpp>
#include <com/sun/star/util/XBroadcaster.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
#include <o3tl/unit_conversion.hxx>
diff --git a/chart2/source/view/main/PolarLabelPositionHelper.cxx
b/chart2/source/view/main/PolarLabelPositionHelper.cxx
index 5662f8639f08..d59ee7c111b1 100644
--- a/chart2/source/view/main/PolarLabelPositionHelper.cxx
+++ b/chart2/source/view/main/PolarLabelPositionHelper.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <BaseGFXHelper.hxx>
#include <PolarLabelPositionHelper.hxx>
#include <PlottingPositionHelper.hxx>
#include <basegfx/vector/b2dvector.hxx>
diff --git a/chart2/source/view/main/SeriesPlotterContainer.cxx
b/chart2/source/view/main/SeriesPlotterContainer.cxx
index 01a577139da5..a93279af4517 100644
--- a/chart2/source/view/main/SeriesPlotterContainer.cxx
+++ b/chart2/source/view/main/SeriesPlotterContainer.cxx
@@ -23,7 +23,6 @@
#include "SeriesPlotterContainer.hxx"
-#include <ChartView.hxx>
#include <Diagram.hxx>
#include <ChartType.hxx>
#include <DataSeries.hxx>
@@ -33,7 +32,6 @@
#include <DiagramHelper.hxx>
#include <Axis.hxx>
#include <AxisIndexDefines.hxx>
-#include <ConfigColorScheme.hxx>
#include <ChartColorScheme.hxx>
#include <DataSeriesHelper.hxx>
#include <ExplicitCategoriesProvider.hxx>
@@ -44,7 +42,6 @@
#include <com/sun/star/chart2/PieChartSubType.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <comphelper/classids.hxx>
#include <servicenames_charttypes.hxx>
#include <comphelper/diagnose_ex.hxx>
diff --git a/chart2/source/view/main/SeriesPlotterContainer.hxx
b/chart2/source/view/main/SeriesPlotterContainer.hxx
index 485d4210d646..48be4933988f 100644
--- a/chart2/source/view/main/SeriesPlotterContainer.hxx
+++ b/chart2/source/view/main/SeriesPlotterContainer.hxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <config_feature_desktop.h>
#include <VSeriesPlotter.hxx>
#include <BaseCoordinateSystem.hxx>
#include "AxisUsage.hxx"
diff --git a/chart2/source/view/main/ShapeFactory.cxx
b/chart2/source/view/main/ShapeFactory.cxx
index c788a85c6edd..ed0def9192af 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -40,7 +40,6 @@
#include <com/sun/star/drawing/TextVerticalAdjust.hpp>
#include <com/sun/star/drawing/XShapes2.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
-#include <com/sun/star/drawing/XShapes.hpp>
#include <com/sun/star/style/ParagraphAdjust.hpp>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/Any.hxx>
diff --git a/chart2/source/view/main/VDataSeries.cxx
b/chart2/source/view/main/VDataSeries.cxx
index ebf2141d8bb9..0cbfaf55077a 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -18,7 +18,6 @@
*/
#include <limits>
-#include <memory>
-e
... etc. - the rest is truncated
