chart2/IwyuFilter_chart2.yaml | 13 ------- chart2/inc/ChartTypeManager.hxx | 3 - chart2/qa/extras/chart2export.cxx | 1 chart2/qa/extras/chart2export3.cxx | 8 ---- chart2/qa/extras/chart2geometry.cxx | 2 - chart2/qa/extras/chart2import.cxx | 1 chart2/qa/extras/uichart.cxx | 1 chart2/source/controller/accessibility/AccessibleBase.cxx | 3 - chart2/source/controller/accessibility/AccessibleChartElement.cxx | 6 --- chart2/source/controller/accessibility/AccessibleChartView.cxx | 3 - chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 3 - chart2/source/controller/chartapiwrapper/GridWrapper.cxx | 1 chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx | 1 chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx | 1 chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx | 1 chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx | 1 chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx | 1 chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx | 1 chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx | 1 chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx | 1 chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx | 1 chart2/source/controller/dialogs/ChartTypeDialogController.cxx | 1 chart2/source/controller/dialogs/DataBrowserModel.cxx | 1 chart2/source/controller/dialogs/DialogModel.cxx | 1 chart2/source/controller/dialogs/DialogModel.hxx | 2 - chart2/source/controller/dialogs/ObjectNameProvider.cxx | 3 - chart2/source/controller/dialogs/TitleDialogData.cxx | 1 chart2/source/controller/dialogs/dlg_DataEditor.cxx | 1 chart2/source/controller/dialogs/dlg_DataSource.cxx | 1 chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx | 4 -- chart2/source/controller/dialogs/res_LegendPosition.cxx | 1 chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx | 1 chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx | 1 chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx | 1 chart2/source/controller/dialogs/tp_ChartType.cxx | 2 - chart2/source/controller/dialogs/tp_DataSource.cxx | 1 chart2/source/controller/dialogs/tp_LegendPosition.hxx | 1 chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx | 1 chart2/source/controller/drawinglayer/DrawViewWrapper.cxx | 1 chart2/source/controller/drawinglayer/ViewElementListProvider.cxx | 1 chart2/source/controller/inc/AccessibleBase.hxx | 1 chart2/source/controller/inc/AccessibleTextHelper.hxx | 1 chart2/source/controller/inc/TabPageNotifiable.hxx | 2 + chart2/source/controller/inc/TitleDialogData.hxx | 1 chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx | 1 chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx | 3 - chart2/source/controller/itemsetwrapper/DataTableItemConverter.cxx | 17 ---------- chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx | 1 chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx | 2 - chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx | 3 - chart2/source/controller/main/ChartController.cxx | 8 ---- chart2/source/controller/main/ChartController_Insert.cxx | 2 - chart2/source/controller/main/ChartController_Position.cxx | 2 - chart2/source/controller/main/ChartController_Properties.cxx | 4 -- chart2/source/controller/main/ChartController_TextEdit.cxx | 1 chart2/source/controller/main/ChartController_Tools.cxx | 2 - chart2/source/controller/main/ChartController_Window.cxx | 2 - chart2/source/controller/main/ChartModelClone.cxx | 3 - chart2/source/controller/main/CommandDispatch.cxx | 1 chart2/source/controller/main/CommandDispatch.hxx | 1 chart2/source/controller/main/ControllerCommandDispatch.cxx | 2 - chart2/source/controller/main/DragMethod_RotateDiagram.cxx | 2 - chart2/source/controller/main/DrawCommandDispatch.cxx | 1 chart2/source/controller/main/ObjectHierarchy.cxx | 2 - chart2/source/controller/main/PositionAndSizeHelper.cxx | 1 chart2/source/controller/main/SelectionHelper.cxx | 2 - chart2/source/controller/sidebar/ChartColorWrapper.hxx | 2 - chart2/source/controller/sidebar/ChartElementsPanel.cxx | 2 - chart2/source/controller/sidebar/ChartLinePanel.cxx | 1 chart2/source/controller/sidebar/ChartSeriesPanel.cxx | 1 chart2/source/controller/sidebar/ChartTypePanel.cxx | 2 - chart2/source/controller/uitest/uiobject.cxx | 2 - chart2/source/inc/AxisHelper.hxx | 2 - chart2/source/inc/ChartTypeHelper.hxx | 1 chart2/source/inc/CloneHelper.hxx | 1 chart2/source/inc/ConfigColorScheme.hxx | 1 chart2/source/inc/DiagramHelper.hxx | 2 - chart2/source/inc/EventListenerHelper.hxx | 1 chart2/source/inc/FormattedStringHelper.hxx | 1 chart2/source/model/main/Axis.cxx | 1 chart2/source/model/main/ChartModel_Persistence.cxx | 3 - chart2/source/model/main/Diagram.cxx | 1 chart2/source/model/main/StockBar.cxx | 1 chart2/source/model/main/UndoManager.cxx | 1 chart2/source/model/template/AreaChartTypeTemplate.cxx | 1 chart2/source/model/template/BarChartTypeTemplate.cxx | 1 chart2/source/model/template/ChartTypeTemplate.cxx | 2 - chart2/source/model/template/LineChartTypeTemplate.cxx | 1 chart2/source/model/template/NetChartTypeTemplate.cxx | 1 chart2/source/model/template/PieChartTypeTemplate.cxx | 2 - chart2/source/model/template/ScatterChartTypeTemplate.cxx | 1 chart2/source/model/template/StockChartTypeTemplate.cxx | 1 chart2/source/tools/AxisHelper.cxx | 1 chart2/source/tools/ChartModelHelper.cxx | 2 - chart2/source/tools/ChartTypeHelper.cxx | 2 - chart2/source/tools/ConfigColorScheme.cxx | 4 -- chart2/source/tools/DataSeriesHelper.cxx | 3 - chart2/source/tools/DataSourceHelper.cxx | 1 chart2/source/tools/DiagramHelper.cxx | 11 ------ chart2/source/tools/FormattedStringHelper.cxx | 1 chart2/source/tools/InternalDataProvider.cxx | 1 chart2/source/tools/ObjectIdentifier.cxx | 3 - chart2/source/tools/ReferenceSizeProvider.cxx | 2 - chart2/source/tools/RegressionCurveHelper.cxx | 3 - chart2/source/tools/StatisticsHelper.cxx | 1 chart2/source/tools/ThreeDHelper.cxx | 6 --- chart2/source/tools/TitleHelper.cxx | 2 - chart2/source/view/axes/VAxisProperties.cxx | 1 chart2/source/view/axes/VCoordinateSystem.cxx | 1 chart2/source/view/charttypes/Splines.cxx | 1 110 files changed, 10 insertions(+), 220 deletions(-)
New commits: commit 102622a07d48a0bac3573d6af00cdccc0b05df3e Author: Rafał Dobrakowski <dobrakowskira...@gmail.com> AuthorDate: Fri Mar 15 11:33:59 2024 +0100 Commit: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de> CommitDate: Wed Mar 27 09:20:54 2024 +0100 tdf#146619 Remove unused #includes from C/C++ files 'chart2' module was cleaned. Change-Id: Ib4cdb3c8a21d0ed47f4970894d416327df5e68a6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164864 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 219c179a0d6b..98a78ef2ca4d 100644 --- a/chart2/IwyuFilter_chart2.yaml +++ b/chart2/IwyuFilter_chart2.yaml @@ -194,12 +194,6 @@ excludelist: - com/sun/star/util/XCloneable.hpp - com/sun/star/util/XModifyBroadcaster.hpp - com/sun/star/util/XModifyListener.hpp - chart2/source/model/main/GridProperties.hxx: - # base class has to be a complete type - - com/sun/star/lang/XServiceInfo.hpp - - com/sun/star/util/XCloneable.hpp - - com/sun/star/util/XModifyBroadcaster.hpp - - com/sun/star/util/XModifyListener.hpp chart2/source/model/main/Legend.cxx: # Needed for template - com/sun/star/awt/Size.hpp @@ -211,13 +205,6 @@ excludelist: - com/sun/star/util/XCloneable.hpp - com/sun/star/util/XModifyBroadcaster.hpp - com/sun/star/util/XModifyListener.hpp - chart2/source/model/main/Title.hxx: - # base class has to be a complete type - - com/sun/star/chart2/XTitle.hpp - - com/sun/star/lang/XServiceInfo.hpp - - com/sun/star/util/XCloneable.hpp - - com/sun/star/util/XModifyBroadcaster.hpp - - com/sun/star/util/XModifyListener.hpp chart2/source/model/main/Title.cxx: # Needed for template - com/sun/star/awt/Size.hpp diff --git a/chart2/inc/ChartTypeManager.hxx b/chart2/inc/ChartTypeManager.hxx index 41227a4a2df6..ac2c56263432 100644 --- a/chart2/inc/ChartTypeManager.hxx +++ b/chart2/inc/ChartTypeManager.hxx @@ -25,13 +25,12 @@ #include <com/sun/star/chart2/XChartTypeManager.hpp> #include <charttoolsdllapi.hxx> #include <rtl/ref.hxx> +#include <ChartTypeTemplate.hxx> namespace com::sun::star::uno { class XComponentContext; } namespace chart { -class ChartTypeTemplate; - class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) ChartTypeManager final : public ::cppu::WeakImplHelper< css::lang::XServiceInfo, diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 86f2dee778e6..3f5866e8c49c 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -16,7 +16,6 @@ #include <com/sun/star/text/XTextDocument.hpp> #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/drawing/FillStyle.hpp> -#include <com/sun/star/chart2/DataPointLabel.hpp> #include <com/sun/star/chart/DataLabelPlacement.hpp> #include <com/sun/star/chart2/PieChartSubType.hpp> diff --git a/chart2/qa/extras/chart2export3.cxx b/chart2/qa/extras/chart2export3.cxx index 838da77191b7..e1229b07720c 100644 --- a/chart2/qa/extras/chart2export3.cxx +++ b/chart2/qa/extras/chart2export3.cxx @@ -9,15 +9,7 @@ #include "charttest.hxx" -#include <com/sun/star/chart/ErrorBarStyle.hpp> -#include <com/sun/star/chart2/XRegressionCurveContainer.hpp> -#include <com/sun/star/chart2/MovingAverageType.hpp> -#include <com/sun/star/lang/XServiceName.hpp> -#include <com/sun/star/text/XTextDocument.hpp> -#include <com/sun/star/drawing/LineStyle.hpp> -#include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/chart2/DataPointLabel.hpp> -#include <com/sun/star/chart/DataLabelPlacement.hpp> using uno::Reference; using beans::XPropertySet; diff --git a/chart2/qa/extras/chart2geometry.cxx b/chart2/qa/extras/chart2geometry.cxx index c7de713df1b2..c554fc950c61 100644 --- a/chart2/qa/extras/chart2geometry.cxx +++ b/chart2/qa/extras/chart2geometry.cxx @@ -9,8 +9,6 @@ #include "charttest.hxx" -#include <test/xmltesttools.hxx> - #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/drawing/FillStyle.hpp> diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx index 8b5834df94c6..02c00daed941 100644 --- a/chart2/qa/extras/chart2import.cxx +++ b/chart2/qa/extras/chart2import.cxx @@ -35,7 +35,6 @@ #include <com/sun/star/util/Color.hpp> #include <com/sun/star/awt/Gradient2.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <basegfx/utils/gradienttools.hxx> #include <docmodel/uno/UnoGradientTools.hxx> namespace diff --git a/chart2/qa/extras/uichart.cxx b/chart2/qa/extras/uichart.cxx index e2f3d9a9d0b3..50d6c9a27495 100644 --- a/chart2/qa/extras/uichart.cxx +++ b/chart2/qa/extras/uichart.cxx @@ -10,7 +10,6 @@ #include "charttest.hxx" #include <comphelper/propertyvalue.hxx> -#include <vcl/scheduler.hxx> using namespace ::com::sun::star; diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index 905c7f89696e..e1f583a578ee 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -23,7 +23,6 @@ #include <ObjectIdentifier.hxx> #include <ChartView.hxx> #include <ChartController.hxx> -#include <chartview/ExplicitValueProvider.hxx> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleEventObject.hpp> @@ -32,11 +31,9 @@ #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <com/sun/star/view/XSelectionSupplier.hpp> #include <sal/log.hxx> #include <utility> #include <vcl/svapp.hxx> -#include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <i18nlangtag/languagetag.hxx> #include <toolkit/helper/vclunohelper.hxx> diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx index 209d282c2c77..d3b98c102f76 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx @@ -24,17 +24,11 @@ #include <ChartController.hxx> #include <ObjectIdentifier.hxx> #include <ObjectNameProvider.hxx> -#include <servicenames.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> -#include <com/sun/star/lang/XInitialization.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/view/XSelectionSupplier.hpp> - -#include <comphelper/diagnose_ex.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx index acedf732cc87..8f01816a6504 100644 --- a/chart2/source/controller/accessibility/AccessibleChartView.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx @@ -18,7 +18,6 @@ */ #include <AccessibleChartView.hxx> -#include <chartview/ExplicitValueProvider.hxx> #include <ObjectHierarchy.hxx> #include <ObjectIdentifier.hxx> #include <ResId.hxx> @@ -32,8 +31,6 @@ #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> -#include <comphelper/servicehelper.hxx> - #include <rtl/ustring.hxx> #include <vcl/window.hxx> #include <toolkit/helper/vclunohelper.hxx> diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index ea01ae000b65..51c803a1db0c 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -37,9 +37,7 @@ #include <ChartModel.hxx> -#include <DiagramHelper.hxx> #include <DataSourceHelper.hxx> -#include <ChartModelHelper.hxx> #include <AxisHelper.hxx> #include <ThreeDHelper.hxx> @@ -53,7 +51,6 @@ #include <cppuhelper/supportsservice.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/sequence.hxx> -#include <comphelper/servicehelper.hxx> #include <utility> #include <vcl/settings.hxx> diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx index c6f7317cf415..8a9f4267e785 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx @@ -22,7 +22,6 @@ #include "Chart2ModelContact.hxx" #include <AxisIndexDefines.hxx> #include <BaseCoordinateSystem.hxx> -#include <GridProperties.hxx> #include <LinePropertiesHelper.hxx> #include <UserDefinedProperties.hxx> diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx index 3b40bcb5a0f7..4f98fa5923f2 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx @@ -20,7 +20,6 @@ #include "MinMaxLineWrapper.hxx" #include "Chart2ModelContact.hxx" #include <ChartType.hxx> -#include <DiagramHelper.hxx> #include <servicenames_charttypes.hxx> #include <cppuhelper/propshlp.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx index 721fa266821c..9fa2e5132168 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx @@ -20,7 +20,6 @@ #include "UpDownBarWrapper.hxx" #include "Chart2ModelContact.hxx" #include <ChartType.hxx> -#include <DiagramHelper.hxx> #include <servicenames_charttypes.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/propshlp.hxx> diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx index 740097fc3051..517a2406fe2c 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx @@ -20,7 +20,6 @@ #include <comphelper/interfacecontainer4.hxx> -#include <cppuhelper/basemutex.hxx> #include <cppuhelper/implbase.hxx> #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/beans/XMultiPropertyStates.hpp> diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx index 3c0cbb353192..079d25f63bb4 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx @@ -24,7 +24,6 @@ #include "WrappedGapwidthProperty.hxx" #include "Chart2ModelContact.hxx" #include <ChartType.hxx> -#include <DiagramHelper.hxx> #include <tools/long.hxx> #include <utility> diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx index 971e69a585e4..0598b4fd377f 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx @@ -20,7 +20,6 @@ #include "WrappedNumberFormatProperty.hxx" #include "Chart2ModelContact.hxx" #include <Axis.hxx> -#include <com/sun/star/chart2/XAxis.hpp> #include <com/sun/star/chart2/XDataSeries.hpp> #include <unonames.hxx> #include <utility> diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx index 1c8e6dc73e59..5c22750dc17b 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx @@ -19,7 +19,6 @@ #include "WrappedSceneProperty.hxx" #include "Chart2ModelContact.hxx" -#include <DiagramHelper.hxx> #include <BaseGFXHelper.hxx> #include <utility> diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx index 82cd43eefb17..8b0b54db3d7a 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx @@ -20,7 +20,6 @@ #include <WrappedProperty.hxx> #include "Chart2ModelContact.hxx" -#include <DiagramHelper.hxx> #include <DataSeries.hxx> #include <memory> diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx index d775dbdae67b..53ce90fa24f9 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx @@ -21,7 +21,6 @@ #include "Chart2ModelContact.hxx" #include <FastPropertyIdRanges.hxx> #include <ChartType.hxx> -#include <DiagramHelper.hxx> #include <WrappedProperty.hxx> #include <unonames.hxx> diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx index 837afa34c0a3..093321843018 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx @@ -21,7 +21,6 @@ #include "Chart2ModelContact.hxx" #include <FastPropertyIdRanges.hxx> #include <DataSeries.hxx> -#include <DiagramHelper.hxx> #include <ControllerLockGuard.hxx> #include <WrappedProperty.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index 2a597a287490..35284fbb6bfc 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -25,7 +25,6 @@ #include <bitmaps.hlst> #include <ChartModelHelper.hxx> #include <DataSeries.hxx> -#include <DiagramHelper.hxx> #include <Diagram.hxx> #include <ControllerLockGuard.hxx> #include <AxisHelper.hxx> diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx index 63ec6f31fc16..938da978dd07 100644 --- a/chart2/source/controller/dialogs/DataBrowserModel.cxx +++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx @@ -22,7 +22,6 @@ #include <ChartModelHelper.hxx> #include <ChartType.hxx> #include <ChartTypeManager.hxx> -#include <DiagramHelper.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 edd00184e685..4c888e8ed5b6 100644 --- a/chart2/source/controller/dialogs/DialogModel.cxx +++ b/chart2/source/controller/dialogs/DialogModel.cxx @@ -23,7 +23,6 @@ #include <DataSeries.hxx> #include <DataSeriesHelper.hxx> #include <DataSourceHelper.hxx> -#include <DiagramHelper.hxx> #include <Diagram.hxx> #include <strings.hrc> #include <ResId.hxx> diff --git a/chart2/source/controller/dialogs/DialogModel.hxx b/chart2/source/controller/dialogs/DialogModel.hxx index 325cffe06773..24b74d6fab3a 100644 --- a/chart2/source/controller/dialogs/DialogModel.hxx +++ b/chart2/source/controller/dialogs/DialogModel.hxx @@ -21,6 +21,7 @@ #include <TimerTriggeredControllerLock.hxx> #include <rtl/ustring.hxx> #include <rtl/ref.hxx> +#include <ChartTypeTemplate.hxx> #include <map> #include <memory> @@ -46,7 +47,6 @@ namespace com::sun::star::chart2 { namespace chart { class ChartType; -class ChartTypeTemplate; class DataSeries; struct InterpretedData; class LabeledDataSequence; diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx index 2097e43c2130..f06c7af5e777 100644 --- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx +++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx @@ -27,9 +27,7 @@ #include <Axis.hxx> #include <AxisHelper.hxx> #include <ChartModel.hxx> -#include <ChartModelHelper.hxx> #include <ChartType.hxx> -#include <DiagramHelper.hxx> #include <Diagram.hxx> #include <DataSeries.hxx> #include <DataSeriesHelper.hxx> @@ -46,7 +44,6 @@ #include <vcl/svapp.hxx> #include <unotools/localedatawrapper.hxx> -#include <com/sun/star/chart2/XTitle.hpp> #include <com/sun/star/chart2/MovingAverageType.hpp> #include <comphelper/diagnose_ex.hxx> #include <o3tl/string_view.hxx> diff --git a/chart2/source/controller/dialogs/TitleDialogData.cxx b/chart2/source/controller/dialogs/TitleDialogData.cxx index 526c1fbc8430..45dda2c897b0 100644 --- a/chart2/source/controller/dialogs/TitleDialogData.cxx +++ b/chart2/source/controller/dialogs/TitleDialogData.cxx @@ -21,7 +21,6 @@ #include <TitleDialogData.hxx> #include <TitleHelper.hxx> -#include <ChartModelHelper.hxx> #include <Diagram.hxx> #include <AxisHelper.hxx> #include <ChartModel.hxx> diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index 367b1d183a54..ee120df76fe7 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -20,7 +20,6 @@ #include <dlg_DataEditor.hxx> #include "DataBrowser.hxx" #include <ChartModel.hxx> -#include <comphelper/stl_types.hxx> #include <com/sun/star/awt/XWindow.hpp> #include <utility> diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx index 1eb6202deb4b..f485c021b0ae 100644 --- a/chart2/source/controller/dialogs/dlg_DataSource.cxx +++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx @@ -23,7 +23,6 @@ #include <ChartTypeTemplateProvider.hxx> #include <ChartTypeTemplate.hxx> #include <Diagram.hxx> -#include <DiagramHelper.hxx> #include "DialogModel.hxx" #include <ChartModel.hxx> diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx index 807e902856a7..8ed2c1d7d650 100644 --- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx @@ -21,19 +21,15 @@ #include <res_ErrorBar.hxx> #include <chartview/ExplicitScaleValues.hxx> #include <chartview/ExplicitValueProvider.hxx> -#include <ChartModelHelper.hxx> #include <ChartModel.hxx> #include <ChartView.hxx> #include <ObjectIdentifier.hxx> -#include <DiagramHelper.hxx> #include <Diagram.hxx> #include <Axis.hxx> #include <AxisHelper.hxx> #include <ObjectNameProvider.hxx> #include <DataSeries.hxx> -#include <comphelper/servicehelper.hxx> - using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx index 1562fcc71943..92cb4399e563 100644 --- a/chart2/source/controller/dialogs/res_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx @@ -18,7 +18,6 @@ */ #include <res_LegendPosition.hxx> -#include <ChartModelHelper.hxx> #include <Legend.hxx> #include <LegendHelper.hxx> #include <ChartModel.hxx> diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx index e07969c957e0..adeb27a02501 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx @@ -18,7 +18,6 @@ */ #include "tp_3D_SceneAppearance.hxx" -#include <ChartModelHelper.hxx> #include <ChartModel.hxx> #include <ThreeDHelper.hxx> #include <ControllerLockGuard.hxx> diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx index 138952775e1e..f368a8193a58 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx @@ -20,7 +20,6 @@ #include "tp_3D_SceneGeometry.hxx" #include <Diagram.hxx> -#include <DiagramHelper.hxx> #include <ChartType.hxx> #include <ChartTypeHelper.hxx> #include <ThreeDHelper.hxx> diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index 3d7d2f327d65..2650e56fe8a4 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -30,7 +30,6 @@ #include <svx/svx3ditems.hxx> #include <svx/svddef.hxx> #include <utility> -#include <svx/obj3d.hxx> #include <vcl/svapp.hxx> #include <comphelper/diagnose_ex.hxx> diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index 7d791815e70f..b301a9794d5d 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -22,10 +22,8 @@ #include <ChartTypeManager.hxx> #include <strings.hrc> #include <ResId.hxx> -#include <ChartModelHelper.hxx> #include <ChartModel.hxx> #include <ChartTypeTemplate.hxx> -#include <DiagramHelper.hxx> #include <Diagram.hxx> #include <unonames.hxx> diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index c30ce8afaedd..fe4ba0981599 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -33,7 +33,6 @@ #include "DialogModel.hxx" #include <o3tl/safeint.hxx> #include <TabPageNotifiable.hxx> -#include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/chart2/data/XDataProvider.hpp> #include <comphelper/diagnose_ex.hxx> diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.hxx b/chart2/source/controller/dialogs/tp_LegendPosition.hxx index 7a444694c3d8..4534501b5209 100644 --- a/chart2/source/controller/dialogs/tp_LegendPosition.hxx +++ b/chart2/source/controller/dialogs/tp_LegendPosition.hxx @@ -22,7 +22,6 @@ #include <res_LegendPosition.hxx> #include <TextDirectionListBox.hxx> -#include <optional> namespace chart { diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx index e0fd6a51f84e..4e813b4593fa 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx @@ -20,7 +20,6 @@ #include "tp_Wizard_TitlesAndObjects.hxx" #include <res_Titles.hxx> #include <res_LegendPosition.hxx> -#include <ChartModelHelper.hxx> #include <ChartModel.hxx> #include <Diagram.hxx> #include <AxisHelper.hxx> diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx index 02d37de41d03..74be51a5ee11 100644 --- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx +++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx @@ -36,7 +36,6 @@ #include <editeng/fhgtitem.hxx> #include <osl/diagnose.h> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/drawing/XShape.hpp> #include <sfx2/objsh.hxx> diff --git a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx index 3fd4435d75b7..51b163d1fccd 100644 --- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx +++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/drawing/Direction3D.hpp> #include <o3tl/safeint.hxx> #include <svx/xtable.hxx> -#include <svl/itempool.hxx> #include <svtools/ctrltool.hxx> #include <vcl/svapp.hxx> #include <svx/svdobj.hxx> diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx index a6076a0cc14c..b7ccbac900da 100644 --- a/chart2/source/controller/inc/AccessibleBase.hxx +++ b/chart2/source/controller/inc/AccessibleBase.hxx @@ -29,7 +29,6 @@ #include <comphelper/accessibleeventnotifier.hxx> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> -#include <rtl/ref.hxx> #include <tools/color.hxx> #include <unotools/weakref.hxx> diff --git a/chart2/source/controller/inc/AccessibleTextHelper.hxx b/chart2/source/controller/inc/AccessibleTextHelper.hxx index 9002a81fb75c..85fcb83dc3e4 100644 --- a/chart2/source/controller/inc/AccessibleTextHelper.hxx +++ b/chart2/source/controller/inc/AccessibleTextHelper.hxx @@ -18,7 +18,6 @@ */ #pragma once -#include <memory> #include <comphelper/compbase.hxx> #include <svx/AccessibleTextHelper.hxx> #include <com/sun/star/accessibility/XAccessibleContext.hpp> diff --git a/chart2/source/controller/inc/TabPageNotifiable.hxx b/chart2/source/controller/inc/TabPageNotifiable.hxx index a5da029810b1..c0b53972e546 100644 --- a/chart2/source/controller/inc/TabPageNotifiable.hxx +++ b/chart2/source/controller/inc/TabPageNotifiable.hxx @@ -18,6 +18,8 @@ */ #pragma once +#include <sal/types.h> + // color to use as foreground for an invalid range #define RANGE_SELECTION_INVALID_RANGE_FOREGROUND_COLOR COL_WHITE // color to use as background for an invalid range diff --git a/chart2/source/controller/inc/TitleDialogData.hxx b/chart2/source/controller/inc/TitleDialogData.hxx index 1000cc58baf2..123ae9d6d65f 100644 --- a/chart2/source/controller/inc/TitleDialogData.hxx +++ b/chart2/source/controller/inc/TitleDialogData.hxx @@ -19,7 +19,6 @@ #pragma once #include <ReferenceSizeProvider.hxx> -#include <memory> #include <com/sun/star/uno/Sequence.hxx> #include <rtl/ref.hxx> diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx index c17d26a08d87..c91eb41dbe97 100644 --- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx @@ -25,7 +25,6 @@ #include <chartview/ExplicitScaleValues.hxx> #include <chartview/ExplicitValueProvider.hxx> #include "SchWhichPairs.hxx" -#include <ChartModelHelper.hxx> #include <ChartModel.hxx> #include <Axis.hxx> #include <AxisHelper.hxx> diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx index 93490438d753..571f98a56952 100644 --- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx @@ -28,10 +28,8 @@ #include <DataSeries.hxx> #include <DataSeriesHelper.hxx> #include <DataSeriesProperties.hxx> -#include <DiagramHelper.hxx> #include <Diagram.hxx> #include <ChartModel.hxx> -#include <ChartModelHelper.hxx> #include <ChartType.hxx> #include <ChartTypeHelper.hxx> #include <unonames.hxx> @@ -41,7 +39,6 @@ #include <com/sun/star/chart2/DataPointLabel.hpp> #include <com/sun/star/chart2/Symbol.hpp> #include <com/sun/star/chart2/RelativePosition.hpp> -#include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <comphelper/sequence.hxx> diff --git a/chart2/source/controller/itemsetwrapper/DataTableItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataTableItemConverter.cxx index 62a5e2b0396b..e152bf298dfc 100644 --- a/chart2/source/controller/itemsetwrapper/DataTableItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/DataTableItemConverter.cxx @@ -12,27 +12,10 @@ #include <CharacterPropertyItemConverter.hxx> #include <GraphicPropertyItemConverter.hxx> #include <chartview/ChartSfxItemIds.hxx> -#include <chartview/ExplicitScaleValues.hxx> -#include <chartview/ExplicitValueProvider.hxx> #include "SchWhichPairs.hxx" -#include <ChartModelHelper.hxx> #include <ChartModel.hxx> -#include <CommonConverters.hxx> -#include <ChartType.hxx> -#include <ChartTypeHelper.hxx> -#include <Diagram.hxx> -#include <unonames.hxx> -#include <BaseCoordinateSystem.hxx> #include <memory> -#include <osl/diagnose.h> -#include <o3tl/any.hxx> -#include <svl/eitem.hxx> -#include <svx/chrtitem.hxx> -#include <svx/sdangitm.hxx> -#include <svl/intitem.hxx> -#include <rtl/math.hxx> - using namespace css; namespace chart::wrapper diff --git a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx index 42595efd8b29..ef0a1fc4c098 100644 --- a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx +++ b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx @@ -34,7 +34,6 @@ #include <Axis.hxx> #include <AxisHelper.hxx> #include <chartview/ExplicitValueProvider.hxx> -#include <com/sun/star/chart2/XTitle.hpp> using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx index b0ae879ed5c1..653e7bf20e5a 100644 --- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx @@ -31,8 +31,6 @@ #include <ChartModel.hxx> #include <BaseCoordinateSystem.hxx> -#include <com/sun/star/chart2/XDataSeries.hpp> - #include <svl/eitem.hxx> #include <svl/intitem.hxx> #include <svl/ilstitem.hxx> diff --git a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx index 10c1f9373547..a8838f3b24e0 100644 --- a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx @@ -20,13 +20,11 @@ #include <TextLabelItemConverter.hxx> #include <CharacterPropertyItemConverter.hxx> #include <ChartModel.hxx> -#include <ChartModelHelper.hxx> #include <ChartType.hxx> #include <ChartTypeHelper.hxx> #include <DataSeries.hxx> #include <DataSeriesHelper.hxx> #include <DataSeriesProperties.hxx> -#include <DiagramHelper.hxx> #include <Diagram.hxx> #include <ItemPropertyMap.hxx> #include "SchWhichPairs.hxx" @@ -49,7 +47,6 @@ #include <com/sun/star/chart2/DataPointLabel.hpp> #include <com/sun/star/chart2/Symbol.hpp> #include <com/sun/star/chart2/RelativePosition.hpp> -#include <com/sun/star/chart2/XDataSeries.hpp> #include <memory> using namespace com::sun::star; diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index 9eca81b25513..661cf327b39f 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -33,14 +33,12 @@ #include <DataSeries.hxx> #include <Diagram.hxx> #include <strings.hrc> -#include <chartview/ExplicitValueProvider.hxx> #include <ChartViewHelper.hxx> #include <ChartWindow.hxx> #include <chartview/DrawModelWrapper.hxx> #include <DrawViewWrapper.hxx> #include <ObjectIdentifier.hxx> -#include <DiagramHelper.hxx> #include <ControllerLockGuard.hxx> #include "UndoGuard.hxx" #include "ChartDropTargetHelper.hxx" @@ -54,15 +52,11 @@ #include "UndoActions.hxx" #include <ViewElementListProvider.hxx> -#include <cppuhelper/supportsservice.hxx> #include <comphelper/dispatchcommand.hxx> -#include <comphelper/servicehelper.hxx> #include <BaseCoordinateSystem.hxx> -#include <com/sun/star/awt/XVclWindowPeer.hpp> #include <com/sun/star/frame/XController2.hpp> #include <com/sun/star/util/CloseVetoException.hpp> -#include <com/sun/star/util/XModeChangeBroadcaster.hpp> #include <com/sun/star/frame/LayoutManagerEvents.hpp> #include <com/sun/star/frame/XLayoutManagerEventBroadcaster.hpp> #include <com/sun/star/ui/XSidebar.hpp> @@ -80,7 +74,7 @@ #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 diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index 6461955cbc24..b3455ad49e04 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -19,7 +19,6 @@ #include <memory> #include <ChartController.hxx> -#include <ChartView.hxx> #include <dlg_InsertAxis_Grid.hxx> #include <dlg_InsertDataLabel.hxx> @@ -33,7 +32,6 @@ #include <AxisHelper.hxx> #include <TitleHelper.hxx> #include <DataSeries.hxx> -#include <DiagramHelper.hxx> #include <Diagram.hxx> #include <GridProperties.hxx> #include <chartview/DrawModelWrapper.hxx> diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx index 9e7194eca890..ed4cd59793d3 100644 --- a/chart2/source/controller/main/ChartController_Position.cxx +++ b/chart2/source/controller/main/ChartController_Position.cxx @@ -27,11 +27,9 @@ #include "UndoGuard.hxx" #include <ObjectNameProvider.hxx> #include <DiagramHelper.hxx> -#include <chartview/ExplicitValueProvider.hxx> #include <CommonConverters.hxx> #include <svx/ActionDescriptionProvider.hxx> -#include <comphelper/servicehelper.hxx> #include <svx/svxids.hrc> #include <svx/rectenum.hxx> #include <svl/intitem.hxx> diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index f6a259c64d8f..62b7ad8a6beb 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -48,7 +48,6 @@ #include <ColorPerPointHelper.hxx> #include <DataSeries.hxx> #include <DataSeriesProperties.hxx> -#include <DiagramHelper.hxx> #include <Diagram.hxx> #include <ControllerLockGuard.hxx> #include "UndoGuard.hxx" @@ -58,9 +57,8 @@ #include <ReferenceSizeProvider.hxx> #include <RegressionCurveHelper.hxx> #include <RegressionCurveModel.hxx> -#include <com/sun/star/util/CloseVetoException.hpp> -#include <comphelper/servicehelper.hxx> #include <o3tl/string_view.hxx> +#include <com/sun/star/util/CloseVetoException.hpp> #include <memory> diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx index 10d89fd92442..aa105883aadf 100644 --- a/chart2/source/controller/main/ChartController_TextEdit.cxx +++ b/chart2/source/controller/main/ChartController_TextEdit.cxx @@ -43,7 +43,6 @@ #include <editeng/editids.hrc> #include <vcl/svapp.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/chart2/XTitle.hpp> #include <svl/stritem.hxx> #include <editeng/fontitem.hxx> #include <memory> diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index 604148f8c9f8..6df81215f261 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -23,7 +23,6 @@ #include <ChartModelHelper.hxx> #include <ChartType.hxx> #include <TitleHelper.hxx> -#include <ThreeDHelper.hxx> #include <DataSeries.hxx> #include <DataSeriesHelper.hxx> #include "UndoGuard.hxx" @@ -49,7 +48,6 @@ #include <com/sun/star/awt/Gradient.hpp> #include <com/sun/star/chart2/DataPointLabel.hpp> -#include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/drawing/TextVerticalAdjust.hpp> #include <com/sun/star/drawing/TextHorizontalAdjust.hpp> diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 0cb2a0ad234d..681c0ae95f0b 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -65,13 +65,11 @@ #include <com/sun/star/frame/DispatchHelper.hpp> #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/frame/XPopupMenuController.hpp> -#include <com/sun/star/util/XUpdatable.hpp> #include <com/sun/star/awt/Rectangle.hpp> #include <comphelper/lok.hxx> #include <comphelper/propertysequence.hxx> #include <comphelper/propertyvalue.hxx> -#include <comphelper/sequence.hxx> #include <sfx2/viewsh.hxx> #include <svx/ActionDescriptionProvider.hxx> diff --git a/chart2/source/controller/main/ChartModelClone.cxx b/chart2/source/controller/main/ChartModelClone.cxx index 6e620a32dac5..b1228cd383a3 100644 --- a/chart2/source/controller/main/ChartModelClone.cxx +++ b/chart2/source/controller/main/ChartModelClone.cxx @@ -29,9 +29,6 @@ #include <com/sun/star/util/XCloneable.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> -#include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/chart2/XTitled.hpp> -#include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/chart2/data/XLabeledDataSequence.hpp> #include <comphelper/property.hxx> diff --git a/chart2/source/controller/main/CommandDispatch.cxx b/chart2/source/controller/main/CommandDispatch.cxx index 37a56e151254..2cb25f68d5bf 100644 --- a/chart2/source/controller/main/CommandDispatch.cxx +++ b/chart2/source/controller/main/CommandDispatch.cxx @@ -19,7 +19,6 @@ #include "CommandDispatch.hxx" #include <com/sun/star/util/URLTransformer.hpp> -#include <comphelper/diagnose_ex.hxx> using namespace ::com::sun::star; diff --git a/chart2/source/controller/main/CommandDispatch.hxx b/chart2/source/controller/main/CommandDispatch.hxx index 41171926b6d2..feb1c2183af5 100644 --- a/chart2/source/controller/main/CommandDispatch.hxx +++ b/chart2/source/controller/main/CommandDispatch.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/util/XModifyListener.hpp> #include <map> -#include <memory> namespace com::sun::star::uno { class XComponentContext; } namespace com::sun::star::util { class XURLTransformer; } diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx index 5317c1c47c06..201dd24f499c 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.cxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx @@ -18,9 +18,7 @@ */ #include "ControllerCommandDispatch.hxx" -#include <ChartModelHelper.hxx> #include <ChartModel.hxx> -#include <DiagramHelper.hxx> #include <Diagram.hxx> #include <Axis.hxx> #include <AxisHelper.hxx> diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx index 0ae2f2803cbd..6172a25edad2 100644 --- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx +++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx @@ -21,9 +21,7 @@ #include <DrawViewWrapper.hxx> #include <SelectionHelper.hxx> -#include <ChartModelHelper.hxx> #include <ChartModel.hxx> -#include <DiagramHelper.hxx> #include <Diagram.hxx> #include <ChartType.hxx> #include <ChartTypeHelper.hxx> diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx index 0ecbf737994b..01771f1e7763 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.cxx +++ b/chart2/source/controller/main/DrawCommandDispatch.cxx @@ -26,7 +26,6 @@ #include <o3tl/unsafe_downcast.hxx> #include <o3tl/string_view.hxx> #include <vcl/svapp.hxx> -#include <svl/itempool.hxx> #include <editeng/eeitem.hxx> #include <svx/strings.hrc> #include <svx/dialmgr.hxx> diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx index f66efd82ea2c..3a215ac99522 100644 --- a/chart2/source/controller/main/ObjectHierarchy.cxx +++ b/chart2/source/controller/main/ObjectHierarchy.cxx @@ -19,8 +19,6 @@ #include <ObjectHierarchy.hxx> #include <ObjectIdentifier.hxx> -#include <ChartModelHelper.hxx> -#include <DiagramHelper.hxx> #include <Diagram.hxx> #include <RegressionCurveHelper.hxx> #include <RegressionCurveModel.hxx> diff --git a/chart2/source/controller/main/PositionAndSizeHelper.cxx b/chart2/source/controller/main/PositionAndSizeHelper.cxx index 50678d145b3c..8cad36404fdc 100644 --- a/chart2/source/controller/main/PositionAndSizeHelper.cxx +++ b/chart2/source/controller/main/PositionAndSizeHelper.cxx @@ -23,7 +23,6 @@ #include <com/sun/star/chart2/RelativePosition.hpp> #include <com/sun/star/chart2/RelativeSize.hpp> #include <tools/gen.hxx> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/awt/Rectangle.hpp> #include <ChartModel.hxx> #include <Diagram.hxx> diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx index 13e44518c8d8..93cd20dfee86 100644 --- a/chart2/source/controller/main/SelectionHelper.cxx +++ b/chart2/source/controller/main/SelectionHelper.cxx @@ -19,9 +19,7 @@ #include <SelectionHelper.hxx> #include <ObjectIdentifier.hxx> -#include <DiagramHelper.hxx> #include <Diagram.hxx> -#include <ChartModelHelper.hxx> #include <ChartModel.hxx> #include <svx/svdpage.hxx> diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.hxx b/chart2/source/controller/sidebar/ChartColorWrapper.hxx index 6894726768d0..70b3ce8fa47c 100644 --- a/chart2/source/controller/sidebar/ChartColorWrapper.hxx +++ b/chart2/source/controller/sidebar/ChartColorWrapper.hxx @@ -11,7 +11,7 @@ #include <ChartModel.hxx> -#include <svx/Palette.hxx> +#include <sfx2/namedcolor.hxx> #include <rtl/ref.hxx> namespace com::sun::star::frame { class XModel; } diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx b/chart2/source/controller/sidebar/ChartElementsPanel.cxx index b4452e38da2e..9b55fc6c77ef 100644 --- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx +++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx @@ -28,9 +28,7 @@ #include <Legend.hxx> #include <LegendHelper.hxx> -#include <ChartModelHelper.hxx> #include <AxisHelper.hxx> -#include <DiagramHelper.hxx> #include <Diagram.hxx> #include <ChartType.hxx> #include <ChartTypeHelper.hxx> diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx b/chart2/source/controller/sidebar/ChartLinePanel.cxx index c029d70b1619..46cec9695f4d 100644 --- a/chart2/source/controller/sidebar/ChartLinePanel.cxx +++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx @@ -13,7 +13,6 @@ #include <ChartModel.hxx> #include <svx/xlnwtit.hxx> -#include <svx/xlinjoit.hxx> #include <svx/xlntrit.hxx> #include <svx/linectrl.hxx> diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx index 48eaa5a3f297..9e94ac005ecb 100644 --- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx +++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx @@ -29,7 +29,6 @@ #include <ChartType.hxx> #include <DataSeries.hxx> #include <DataSeriesHelper.hxx> -#include <DiagramHelper.hxx> #include <Diagram.hxx> #include <RegressionCurveHelper.hxx> #include <RegressionCurveModel.hxx> diff --git a/chart2/source/controller/sidebar/ChartTypePanel.cxx b/chart2/source/controller/sidebar/ChartTypePanel.cxx index 69409a8d673b..40423aa62ea1 100644 --- a/chart2/source/controller/sidebar/ChartTypePanel.cxx +++ b/chart2/source/controller/sidebar/ChartTypePanel.cxx @@ -21,13 +21,11 @@ #include <TimerTriggeredControllerLock.hxx> #include <ChartController.hxx> -#include <ChartModelHelper.hxx> #include <ChartModel.hxx> #include <ChartResourceGroups.hxx> #include <ChartTypeDialogController.hxx> #include <ChartTypeManager.hxx> #include <ChartTypeTemplate.hxx> -#include <DiagramHelper.hxx> #include <Diagram.hxx> #include <unonames.hxx> diff --git a/chart2/source/controller/uitest/uiobject.cxx b/chart2/source/controller/uitest/uiobject.cxx index 531978db13d7..783a91982f84 100644 --- a/chart2/source/controller/uitest/uiobject.cxx +++ b/chart2/source/controller/uitest/uiobject.cxx @@ -17,8 +17,6 @@ #include <ObjectHierarchy.hxx> #include <chartview/ExplicitValueProvider.hxx> -#include <comphelper/servicehelper.hxx> - #include <utility> #include <vcl/svapp.hxx> diff --git a/chart2/source/inc/AxisHelper.hxx b/chart2/source/inc/AxisHelper.hxx index 7b764473a7d2..f39e54c1fc00 100644 --- a/chart2/source/inc/AxisHelper.hxx +++ b/chart2/source/inc/AxisHelper.hxx @@ -22,6 +22,7 @@ #include "charttoolsdllapi.hxx" #include <com/sun/star/chart2/ScaleData.hpp> #include <rtl/ref.hxx> +#include "GridProperties.hxx" #include <vector> @@ -43,7 +44,6 @@ class Axis; class BaseCoordinateSystem; class ChartType; class Diagram; -class GridProperties; class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) AxisHelper { diff --git a/chart2/source/inc/ChartTypeHelper.hxx b/chart2/source/inc/ChartTypeHelper.hxx index 83a83363004c..7366e4689773 100644 --- a/chart2/source/inc/ChartTypeHelper.hxx +++ b/chart2/source/inc/ChartTypeHelper.hxx @@ -22,6 +22,7 @@ #include <config_options.h> #include <com/sun/star/drawing/Direction3D.hpp> #include "charttoolsdllapi.hxx" +#include "ChartType.hxx" #include <rtl/ref.hxx> namespace com::sun::star::chart2 { class XChartType; } diff --git a/chart2/source/inc/CloneHelper.hxx b/chart2/source/inc/CloneHelper.hxx index c0896efb5c7b..cabcdb58366f 100644 --- a/chart2/source/inc/CloneHelper.hxx +++ b/chart2/source/inc/CloneHelper.hxx @@ -20,7 +20,6 @@ #include <com/sun/star/util/XCloneable.hpp> #include <rtl/ref.hxx> -#include <algorithm> #include <iterator> #include <vector> diff --git a/chart2/source/inc/ConfigColorScheme.hxx b/chart2/source/inc/ConfigColorScheme.hxx index 8375c600277e..fe73dc671bb6 100644 --- a/chart2/source/inc/ConfigColorScheme.hxx +++ b/chart2/source/inc/ConfigColorScheme.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <memory> -#include <string_view> namespace com::sun::star::uno { class XComponentContext; } diff --git a/chart2/source/inc/DiagramHelper.hxx b/chart2/source/inc/DiagramHelper.hxx index a989fa548a02..eb9e4fd00792 100644 --- a/chart2/source/inc/DiagramHelper.hxx +++ b/chart2/source/inc/DiagramHelper.hxx @@ -24,8 +24,6 @@ #include <com/sun/star/awt/Rectangle.hpp> #include <rtl/ref.hxx> -#include <vector> - namespace chart { class ChartModel; } namespace com::sun::star::chart2 { class XAxis; } namespace com::sun::star::chart2 { class XChartDocument; } diff --git a/chart2/source/inc/EventListenerHelper.hxx b/chart2/source/inc/EventListenerHelper.hxx index 19c93c152f55..dcf3256d46b5 100644 --- a/chart2/source/inc/EventListenerHelper.hxx +++ b/chart2/source/inc/EventListenerHelper.hxx @@ -20,7 +20,6 @@ #include <com/sun/star/lang/XComponent.hpp> -#include <algorithm> #include <utility> namespace com::sun::star::lang { class XEventListener; } diff --git a/chart2/source/inc/FormattedStringHelper.hxx b/chart2/source/inc/FormattedStringHelper.hxx index 9e4d33b6af67..adc1f54802b8 100644 --- a/chart2/source/inc/FormattedStringHelper.hxx +++ b/chart2/source/inc/FormattedStringHelper.hxx @@ -20,7 +20,6 @@ #include <rtl/ref.hxx> #include <rtl/ustring.hxx> -#include <vector> namespace com::sun::star::beans { class XPropertySet; } namespace com::sun::star::chart2 { class XFormattedString2; } diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx index 26a6d48368b9..3d7cfc6267b8 100644 --- a/chart2/source/model/main/Axis.cxx +++ b/chart2/source/model/main/Axis.cxx @@ -23,7 +23,6 @@ #include <LinePropertiesHelper.hxx> #include <UserDefinedProperties.hxx> #include <PropertyHelper.hxx> -#include <CloneHelper.hxx> #include <AxisHelper.hxx> #include <EventListenerHelper.hxx> #include <ModifyListenerHelper.hxx> diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx index 03824aab5ca5..4fb17e9f1001 100644 --- a/chart2/source/model/main/ChartModel_Persistence.cxx +++ b/chart2/source/model/main/ChartModel_Persistence.cxx @@ -28,7 +28,6 @@ #include <AxisHelper.hxx> #include <ThreeDHelper.hxx> #include <Diagram.hxx> -#include <DiagramHelper.hxx> #include <BaseCoordinateSystem.hxx> #include <Legend.hxx> #include <XMLFilter.hxx> @@ -47,8 +46,6 @@ #include <com/sun/star/io/IOException.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/io/TempFile.hpp> -#include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/ucb/CommandFailedException.hpp> #include <com/sun/star/ucb/ContentCreationException.hpp> diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx index 1ef884c796f9..a963e2a25c07 100644 --- a/chart2/source/model/main/Diagram.cxx +++ b/chart2/source/model/main/Diagram.cxx @@ -60,7 +60,6 @@ #include <cppuhelper/supportsservice.hxx> #include <comphelper/diagnose_ex.hxx> -#include <editeng/unoprnms.hxx> #include <o3tl/safeint.hxx> #include <rtl/math.hxx> #include <tools/helpers.hxx> diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx index e8c72059bc65..5d7efdc5f0d9 100644 --- a/chart2/source/model/main/StockBar.cxx +++ b/chart2/source/model/main/StockBar.cxx @@ -23,7 +23,6 @@ #include <UserDefinedProperties.hxx> #include <PropertyHelper.hxx> #include <ModifyListenerHelper.hxx> -#include <com/sun/star/uno/Sequence.hxx> #include <algorithm> diff --git a/chart2/source/model/main/UndoManager.cxx b/chart2/source/model/main/UndoManager.cxx index a756e7440a75..3688863b3883 100644 --- a/chart2/source/model/main/UndoManager.cxx +++ b/chart2/source/model/main/UndoManager.cxx @@ -21,7 +21,6 @@ #include <ChartModel.hxx> #include <ChartViewHelper.hxx> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/NoSupportException.hpp> diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx index f2ff81a1e8d1..2ffad2a416fc 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.cxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx @@ -20,7 +20,6 @@ #include "AreaChartTypeTemplate.hxx" #include "AreaChartType.hxx" #include <Diagram.hxx> -#include <DiagramHelper.hxx> #include <DataSeries.hxx> #include <DataSeriesHelper.hxx> #include <PropertyHelper.hxx> diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx index 1381e09cc413..2b649ec43364 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.cxx +++ b/chart2/source/model/template/BarChartTypeTemplate.cxx @@ -20,7 +20,6 @@ #include "BarChartTypeTemplate.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/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index e91eab13e4e9..79ed5c7f4c90 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -22,10 +22,8 @@ #include <CommonConverters.hxx> #include <ChartTypeHelper.hxx> #include <ChartType.hxx> -#include <DataSeries.hxx> #include <DataSeriesProperties.hxx> #include <DataSource.hxx> -#include <GridProperties.hxx> #include <Axis.hxx> #include <AxisHelper.hxx> diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx index 6b04b3094c9c..e4d347960f18 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.cxx +++ b/chart2/source/model/template/LineChartTypeTemplate.cxx @@ -20,7 +20,6 @@ #include "LineChartTypeTemplate.hxx" #include "LineChartType.hxx" #include <Diagram.hxx> -#include <DiagramHelper.hxx> #include <DataSeries.hxx> #include <DataSeriesHelper.hxx> #include <PropertyHelper.hxx> diff --git a/chart2/source/model/template/NetChartTypeTemplate.cxx b/chart2/source/model/template/NetChartTypeTemplate.cxx index 77908172b751..0acd07d7b928 100644 --- a/chart2/source/model/template/NetChartTypeTemplate.cxx +++ b/chart2/source/model/template/NetChartTypeTemplate.cxx @@ -21,7 +21,6 @@ #include "FilledNetChartType.hxx" #include "NetChartType.hxx" #include <Diagram.hxx> -#include <DiagramHelper.hxx> #include <DataSeries.hxx> #include <DataSeriesHelper.hxx> #include <ChartType.hxx> diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx index 20880808d10b..df97c53aaef9 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.cxx +++ b/chart2/source/model/template/PieChartTypeTemplate.cxx @@ -23,13 +23,11 @@ #include <CommonConverters.hxx> #include <ChartType.hxx> #include <Diagram.hxx> -#include <DiagramHelper.hxx> #include <DataSeries.hxx> #include <DataSeriesHelper.hxx> #include <DataSeriesProperties.hxx> #include <Axis.hxx> #include <AxisHelper.hxx> -#include <ThreeDHelper.hxx> #include <PropertyHelper.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/drawing/LineStyle.hpp> diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx index e54d202bb1d3..3457bfa00126 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx @@ -22,7 +22,6 @@ #include "XYDataInterpreter.hxx" #include <ChartType.hxx> #include <Diagram.hxx> -#include <DiagramHelper.hxx> #include <DataSeries.hxx> #include <DataSeriesHelper.hxx> #include <PropertyHelper.hxx> diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx index e05981bebbeb..6da7a143b3b6 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.cxx +++ b/chart2/source/model/template/StockChartTypeTemplate.cxx @@ -24,7 +24,6 @@ #include <DataSeries.hxx> #include <DataSeriesHelper.hxx> #include "StockDataInterpreter.hxx" -#include <DiagramHelper.hxx> #include <Diagram.hxx> #include <BaseCoordinateSystem.hxx> #include <servicenames_charttypes.hxx> diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx index 214031eb34b6..b48fd313a91c 100644 --- a/chart2/source/tools/AxisHelper.cxx +++ b/chart2/source/tools/AxisHelper.cxx @@ -49,7 +49,6 @@ #include <com/sun/star/lang/XServiceName.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <comphelper/sequence.hxx> #include <comphelper/diagnose_ex.hxx> #include <cstddef> diff --git a/chart2/source/tools/ChartModelHelper.cxx b/chart2/source/tools/ChartModelHelper.cxx index 0aa2288ff888..6c2420e7bd7c 100644 --- a/chart2/source/tools/ChartModelHelper.cxx +++ b/chart2/source/tools/ChartModelHelper.cxx @@ -18,12 +18,10 @@ */ #include <ChartModelHelper.hxx> -#include <DiagramHelper.hxx> #include <Diagram.hxx> #include <DataSource.hxx> #include <DataSourceHelper.hxx> #include <ControllerLockGuard.hxx> -#include <RangeHighlighter.hxx> #include <InternalDataProvider.hxx> #include <ChartModel.hxx> #include <BaseCoordinateSystem.hxx> diff --git a/chart2/source/tools/ChartTypeHelper.cxx b/chart2/source/tools/ChartTypeHelper.cxx index 15f00eac6fa9..b8df30edfbd5 100644 --- a/chart2/source/tools/ChartTypeHelper.cxx +++ b/chart2/source/tools/ChartTypeHelper.cxx @@ -24,12 +24,10 @@ #include <DiagramHelper.hxx> #include <servicenames_charttypes.hxx> -#include <com/sun/star/beans/XPropertySet.hpp> #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 <com/sun/star/chart2/XDataSeries.hpp> #include <comphelper/diagnose_ex.hxx> using namespace ::com::sun::star; diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx index 24ee5facb60e..6ea26d99c5fb 100644 --- a/chart2/source/tools/ConfigColorScheme.cxx +++ b/chart2/source/tools/ConfigColorScheme.cxx @@ -20,11 +20,7 @@ #include <ConfigColorScheme.hxx> #include <unotools/configitem.hxx> -#include <sal/macros.h> #include <cppuhelper/supportsservice.hxx> -#include <comphelper/sequence.hxx> - -#include <set> using namespace ::com::sun::star; diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx index a6efbda3a1e9..45f235cd2810 100644 --- a/chart2/source/tools/DataSeriesHelper.cxx +++ b/chart2/source/tools/DataSeriesHelper.cxx @@ -29,9 +29,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/chart2/DataPointLabel.hpp> -#include <com/sun/star/chart2/data/XTextualDataSequence.hpp> #include <com/sun/star/chart2/StackingDirection.hpp> -#include <com/sun/star/chart2/data/LabelOrigin.hpp> #include <com/sun/star/chart2/AxisType.hpp> #include <com/sun/star/chart2/SymbolStyle.hpp> #include <com/sun/star/chart2/Symbol.hpp> @@ -39,7 +37,6 @@ #include <com/sun/star/drawing/LineStyle.hpp> #include <comphelper/sequence.hxx> -#include <rtl/ustrbuf.hxx> #include <comphelper/diagnose_ex.hxx> #include <algorithm> diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx index 4f42e6e64074..dc6c1b9c87f1 100644 --- a/chart2/source/tools/DataSourceHelper.cxx +++ b/chart2/source/tools/DataSourceHelper.cxx @@ -21,7 +21,6 @@ #include <ChartModel.hxx> #include <ChartModelHelper.hxx> #include <ChartTypeManager.hxx> -#include <DiagramHelper.hxx> #include <Diagram.hxx> #include <DataSeries.hxx> #include <DataSeriesHelper.hxx> diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx index 79a99688fd7a..38aa97265396 100644 --- a/chart2/source/tools/DiagramHelper.cxx +++ b/chart2/source/tools/DiagramHelper.cxx @@ -24,35 +24,25 @@ #include <Axis.hxx> #include <AxisHelper.hxx> #include <ChartType.hxx> -#include <ChartTypeHelper.hxx> -#include <ChartTypeManager.hxx> -#include <ChartTypeTemplate.hxx> #include <ChartModel.hxx> #include <ChartModelHelper.hxx> #include <ExplicitCategoriesProvider.hxx> -#include <servicenames_charttypes.hxx> #include <RelativePositionHelper.hxx> #include <ControllerLockGuard.hxx> #include <NumberFormatterWrapper.hxx> #include <unonames.hxx> #include <BaseCoordinateSystem.hxx> -#include <com/sun/star/chart/MissingValueTreatment.hpp> #include <com/sun/star/chart/XDiagramPositioning.hpp> #include <com/sun/star/chart2/XAnyDescriptionAccess.hpp> #include <com/sun/star/chart2/AxisType.hpp> -#include <com/sun/star/chart2/DataPointGeometry3D.hpp> #include <com/sun/star/chart2/RelativePosition.hpp> #include <com/sun/star/chart2/RelativeSize.hpp> #include <com/sun/star/chart2/StackingDirection.hpp> -#include <com/sun/star/util/CloseVetoException.hpp> #include <com/sun/star/util/NumberFormat.hpp> -#include <com/sun/star/util/XNumberFormatsSupplier.hpp> -#include <o3tl/safeint.hxx> #include <unotools/saveopt.hxx> -#include <rtl/math.hxx> #include <svl/numformat.hxx> #include <svl/zforlist.hxx> #include <vcl/svapp.hxx> @@ -61,7 +51,6 @@ #include <comphelper/diagnose_ex.hxx> #include <sal/log.hxx> -#include <cstddef> #include <limits> using namespace ::com::sun::star; diff --git a/chart2/source/tools/FormattedStringHelper.cxx b/chart2/source/tools/FormattedStringHelper.cxx index a59a76d2f563..6b881160670f 100644 --- a/chart2/source/tools/FormattedStringHelper.cxx +++ b/chart2/source/tools/FormattedStringHelper.cxx @@ -19,7 +19,6 @@ #include <FormattedStringHelper.hxx> #include <FormattedString.hxx> -#include <com/sun/star/chart2/FormattedString.hpp> #include <comphelper/diagnose_ex.hxx> #include <comphelper/property.hxx> diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index 883920daa9fb..7e76708d596b 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -29,7 +29,6 @@ #include <DataSourceHelper.hxx> #include <ChartModel.hxx> #include <ChartModelHelper.hxx> -#include <DiagramHelper.hxx> #include <Diagram.hxx> #include <ExplicitCategoriesProvider.hxx> #include <BaseCoordinateSystem.hxx> diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx index 0b071d7d4041..d5b2f068c8a0 100644 --- a/chart2/source/tools/ObjectIdentifier.cxx +++ b/chart2/source/tools/ObjectIdentifier.cxx @@ -25,13 +25,10 @@ #include <ObjectIdentifier.hxx> #include <TitleHelper.hxx> #include <ChartModel.hxx> -#include <ChartModelHelper.hxx> #include <ChartType.hxx> -#include <GridProperties.hxx> #include <Axis.hxx> #include <AxisHelper.hxx> #include <servicenames_charttypes.hxx> -#include <DiagramHelper.hxx> #include <Diagram.hxx> #include <unonames.hxx> #include <BaseCoordinateSystem.hxx> diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx index e8d4c1d1415e..714fa83b425c 100644 --- a/chart2/source/tools/ReferenceSizeProvider.cxx +++ b/chart2/source/tools/ReferenceSizeProvider.cxx @@ -19,11 +19,9 @@ #include <ReferenceSizeProvider.hxx> #include <RelativeSizeHelper.hxx> -#include <ChartModelHelper.hxx> #include <ChartModel.hxx> #include <DataSeries.hxx> #include <DataSeriesProperties.hxx> -#include <DiagramHelper.hxx> #include <Diagram.hxx> #include <Axis.hxx> #include <AxisHelper.hxx> diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx index 0277e61a44f1..efb6bea5c3aa 100644 --- a/chart2/source/tools/RegressionCurveHelper.cxx +++ b/chart2/source/tools/RegressionCurveHelper.cxx @@ -36,14 +36,11 @@ #include <ChartModel.hxx> #include <ChartModelHelper.hxx> #include <DataSeries.hxx> -#include <Diagram.hxx> #include <ResId.hxx> #include <strings.hrc> -#include <DiagramHelper.hxx> #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/XDataSeries.hpp> #include <com/sun/star/chart2/data/XDataSource.hpp> #include <o3tl/safeint.hxx> #include <comphelper/diagnose_ex.hxx> diff --git a/chart2/source/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx index 06eba5da4c44..5f3bbdf802d6 100644 --- a/chart2/source/tools/StatisticsHelper.cxx +++ b/chart2/source/tools/StatisticsHelper.cxx @@ -25,7 +25,6 @@ #include <rtl/ustrbuf.hxx> #include <comphelper/processfactory.hxx> -#include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/chart2/data/LabeledDataSequence.hpp> #include <com/sun/star/chart2/data/XNumericalDataSequence.hpp> #include <com/sun/star/chart2/data/XDataProvider.hpp> diff --git a/chart2/source/tools/ThreeDHelper.cxx b/chart2/source/tools/ThreeDHelper.cxx index 5733c6f44ba2..47fa8bb49317 100644 --- a/chart2/source/tools/ThreeDHelper.cxx +++ b/chart2/source/tools/ThreeDHelper.cxx @@ -17,19 +17,15 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <basegfx/numeric/ftools.hxx> #include <ThreeDHelper.hxx> #include <Diagram.hxx> -#include <DiagramHelper.hxx> #include <ChartTypeHelper.hxx> -#include <ChartType.hxx> -#include <BaseGFXHelper.hxx> #include <DataSeries.hxx> #include <DataSeriesHelper.hxx> #include <defines.hxx> -#include <editeng/unoprnms.hxx> #include <com/sun/star/drawing/LineStyle.hpp> -#include <com/sun/star/drawing/ShadeMode.hpp> #include <comphelper/diagnose_ex.hxx> #include <tools/helpers.hxx> #include <rtl/math.hxx> diff --git a/chart2/source/tools/TitleHelper.cxx b/chart2/source/tools/TitleHelper.cxx index 992f5cdf6196..b6aff7c4f4c7 100644 --- a/chart2/source/tools/TitleHelper.cxx +++ b/chart2/source/tools/TitleHelper.cxx @@ -20,10 +20,8 @@ #include <TitleHelper.hxx> #include <Title.hxx> #include <ChartModel.hxx> -#include <ChartModelHelper.hxx> #include <Axis.hxx> #include <AxisHelper.hxx> -#include <DiagramHelper.hxx> #include <Diagram.hxx> #include <ReferenceSizeProvider.hxx> #include <com/sun/star/chart2/FormattedString.hpp> diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx index c521489b6279..a69508cec77a 100644 --- a/chart2/source/view/axes/VAxisProperties.cxx +++ b/chart2/source/view/axes/VAxisProperties.cxx @@ -24,7 +24,6 @@ #include <ChartModelHelper.hxx> #include <ExplicitCategoriesProvider.hxx> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/chart/ChartAxisArrangeOrderType.hpp> #include <com/sun/star/chart2/AxisType.hpp> diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx index 6266f989aecd..41ec23d307f3 100644 --- a/chart2/source/view/axes/VCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCoordinateSystem.cxx @@ -36,7 +36,6 @@ #include <chartview/ExplicitValueProvider.hxx> #include <com/sun/star/chart/TimeUnit.hpp> #include <com/sun/star/chart2/AxisType.hpp> -#include <comphelper/sequence.hxx> #include <rtl/math.hxx> #include <comphelper/diagnose_ex.hxx> diff --git a/chart2/source/view/charttypes/Splines.cxx b/chart2/source/view/charttypes/Splines.cxx index 0f089d1b7758..15980b638bc8 100644 --- a/chart2/source/view/charttypes/Splines.cxx +++ b/chart2/source/view/charttypes/Splines.cxx @@ -23,7 +23,6 @@ #include <vector> #include <algorithm> -#include <memory> #include <optional> #include <cmath> #include <limits>