diff options
| author | Gabor Kelemen <kelemeng@ubuntu.com> | 2022-04-17 23:02:33 +0200 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2022-04-23 16:33:58 +0200 |
| commit | fef939d8ffd17abdb108a5e5635790a862018c2d (patch) | |
| tree | 2302883339a23dad6db3ed895745130cdedea5ab /chart2 | |
| parent | 9c4d3188bb34c24f611bd4d5e94376d4734dd8c3 (diff) | |
Recheck module chart2 with IWYU
See tdf#42949 for motivation
Change-Id: Id4cdca3eed8618c289f30913d506f8f2bd46f0bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133112
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Diffstat (limited to 'chart2')
149 files changed, 80 insertions, 381 deletions
diff --git a/chart2/IwyuFilter_chart2.yaml b/chart2/IwyuFilter_chart2.yaml index 276007e29fa3..e1c845f6fffe 100644 --- a/chart2/IwyuFilter_chart2.yaml +++ b/chart2/IwyuFilter_chart2.yaml @@ -151,39 +151,6 @@ excludelist: - com/sun/star/beans/XMultiPropertyStates.hpp - com/sun/star/beans/XPropertySet.hpp - com/sun/star/beans/XPropertyState.hpp - chart2/source/model/inc/BaseCoordinateSystem.hxx: - # base class has to be a complete type - - com/sun/star/chart2/XChartTypeContainer.hpp - - com/sun/star/chart2/XCoordinateSystem.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/inc/ChartTypeManager.hxx: - # base class has to be a complete type - - com/sun/star/chart2/XChartTypeManager.hpp - - com/sun/star/lang/XMultiServiceFactory.hpp - - com/sun/star/lang/XServiceInfo.hpp - chart2/source/model/inc/DataSeries.hxx: - # base class has to be a complete type - - com/sun/star/chart2/XDataSeries.hpp - - com/sun/star/chart2/XRegressionCurveContainer.hpp - - com/sun/star/chart2/data/XDataSink.hpp - - com/sun/star/chart2/data/XDataSource.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/inc/Diagram.hxx: - # base class has to be a complete type - - com/sun/star/chart/X3DDefaultSetter.hpp - - com/sun/star/chart2/XCoordinateSystemContainer.hpp - - com/sun/star/chart2/XDiagram.hpp - - com/sun/star/chart2/XTitled.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/inc/StockBar.hxx: # base class has to be a complete type - com/sun/star/util/XCloneable.hpp @@ -200,6 +167,9 @@ excludelist: chart2/source/model/filter/XMLFilter.cxx: # Actually used - com/sun/star/lang/XMultiComponentFactory.hpp + chart2/source/model/main/ChartModel_Persistence.cxx: + # Needed for implicit dtor + - BaseCoordinateSystem.hxx chart2/source/model/main/DataPoint.hxx: # base class has to be a complete type - com/sun/star/container/XChild.hpp @@ -207,14 +177,6 @@ excludelist: - com/sun/star/util/XCloneable.hpp - com/sun/star/util/XModifyBroadcaster.hpp - com/sun/star/util/XModifyListener.hpp - chart2/source/model/main/Axis.hxx: - # base class has to be a complete type - - com/sun/star/chart2/XAxis.hpp - - com/sun/star/chart2/XTitled.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/Axis.cxx: # Needed for template - com/sun/star/awt/Size.hpp @@ -240,13 +202,6 @@ excludelist: - com/sun/star/util/XCloneable.hpp - com/sun/star/util/XModifyBroadcaster.hpp - com/sun/star/util/XModifyListener.hpp - chart2/source/model/main/Legend.hxx: - # base class has to be a complete type - - com/sun/star/chart2/XLegend.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/Legend.cxx: # Needed for template - com/sun/star/awt/Size.hpp @@ -278,21 +233,6 @@ excludelist: - com/sun/star/util/XCloneable.hpp - com/sun/star/util/XModifyBroadcaster.hpp - com/sun/star/util/XModifyListener.hpp - chart2/source/model/template/ChartType.hxx: - # base class has to be a complete type - - com/sun/star/chart2/XChartType.hpp - - com/sun/star/chart2/XDataSeriesContainer.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/template/ChartTypeTemplate.hxx: - # base class has to be a complete type - - com/sun/star/lang/XServiceName.hpp - chart2/source/model/template/DataInterpreter.hxx: - # base class has to be a complete type - - com/sun/star/chart2/XDataInterpreter.hpp - - com/sun/star/lang/XServiceInfo.hpp chart2/source/model/template/AreaChartTypeTemplate.cxx: # Actually used - com/sun/star/uno/XComponentContext.hpp @@ -346,20 +286,18 @@ excludelist: - com/sun/star/drawing/LineStyle.hpp - com/sun/star/util/Color.hpp - com/sun/star/drawing/LineJoint.hpp + chart2/source/tools/ExplicitCategoriesProvider.cxx: + # Needed for implicit dtor + - ChartType.hxx chart2/source/tools/CharacterProperties.cxx: # Actually used - com/sun/star/beans/XMultiPropertySet.hpp chart2/source/tools/DataSourceHelper.cxx: # Actually used - com/sun/star/chart2/data/XLabeledDataSequence.hpp - chart2/source/tools/RegressionCurveModel.hxx: - # base class has to be a complete type - - com/sun/star/chart2/XRegressionCurve.hpp - - com/sun/star/lang/XServiceInfo.hpp - - com/sun/star/lang/XServiceName.hpp - - com/sun/star/util/XCloneable.hpp - - com/sun/star/util/XModifyBroadcaster.hpp - - com/sun/star/util/XModifyListener.hpp + chart2/source/tools/InternalDataProvider.cxx: + # Needed for implicit dtor + - BaseCoordinateSystem.hxx chart2/source/tools/LegendHelper.cxx: # Actually used - com/sun/star/uno/XComponentContext.hpp @@ -390,6 +328,8 @@ excludelist: chart2/source/tools/RegressionCurveHelper.cxx: # Actually used - com/sun/star/chart2/XRegressionCurveCalculator.hpp + # Needed for implicit dtor + - ChartType.hxx chart2/source/tools/RegressionEquation.hxx: # base class has to be a complete type - com/sun/star/chart2/XTitle.hpp @@ -428,10 +368,6 @@ excludelist: chart2/source/tools/WrappedProperty.cxx: # Actually used - com/sun/star/beans/XPropertyState.hpp - chart2/source/view/inc/3DChartObjects.hxx: - # base class has to be a complete type - - boost/shared_array.hpp - - map chart2/source/view/inc/VLineProperties.hxx: # base class has to be a complete type - com/sun/star/uno/Reference.h @@ -455,10 +391,13 @@ excludelist: - com/sun/star/chart2/XCoordinateSystem.hpp chart2/source/view/axes/VPolarAngleAxis.cxx: # Needed for implicit dtor - - com/sun/star/chart2/XAxis.hpp + - Axis.hxx chart2/source/view/axes/VPolarCoordinateSystem.cxx: # Actually used - com/sun/star/chart2/XCoordinateSystem.hpp + chart2/source/view/axes/VPolarRadiusAxis.cxx: + # Needed for implicit dtor + - Axis.hxx chart2/source/view/axes/VCartesianAxis.cxx: # Needed for implicit dtor - com/sun/star/chart2/XAxis.hpp @@ -477,6 +416,9 @@ excludelist: chart2/source/view/charttypes/BarChart.cxx: # comphelper::ScopeGuard being used - comphelper/scopeguard.hxx + chart2/source/view/diagram/VDiagram.cxx: + # Needed for implicit dtor + - ChartType.hxx chart2/source/view/main/LabelPositionHelper.cxx: # Actually used - com/sun/star/beans/XPropertySet.hpp @@ -607,12 +549,17 @@ excludelist: chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx: # Actually used - vector + # Needed for implicit dtor + - BaseCoordinateSystem.hxx chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx: # Needed for implicit dtor - com/sun/star/chart2/XAxis.hpp chart2/source/controller/dialogs/ChartTypeDialogController.cxx: # Actually used - com/sun/star/chart2/XChartDocument.hpp + # Needed for implicit dtor + - DataSeries.hxx + - BaseCoordinateSystem.hxx chart2/source/controller/dialogs/DataBrowser.cxx: # Needed for complex variable type - com/sun/star/chart2/XChartDocument.hpp @@ -620,9 +567,14 @@ excludelist: # Actually used - com/sun/star/uno/XComponentContext.hpp - com/sun/star/chart2/XChartDocument.hpp + # Needed for implicit dtor + - LabeledDataSequence.hxx chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx: # Needed for complex variable type - com/sun/star/frame/XModel.hpp + chart2/source/controller/dialogs/dlg_CreationWizard.cxx: + # Needed for implicit dtor + - ChartTypeTemplate.hxx chart2/source/controller/dialogs/dlg_DataEditor.cxx: # Needed for direct member access - com/sun/star/awt/XWindow.hpp @@ -635,6 +587,9 @@ excludelist: chart2/source/controller/dialogs/res_ErrorBar.cxx: # Actually used - com/sun/star/chart2/XChartDocument.hpp + chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx: + # Needed for implicit dtor + - ChartType.hxx chart2/source/controller/dialogs/tp_AxisPositions.cxx: # Actually used - rtl/math.hxx @@ -647,6 +602,9 @@ excludelist: chart2/source/controller/dialogs/tp_DataSource.cxx: # Needed for implicit dtor - com/sun/star/frame/XModel.hpp + # Needed for implicit dtor + - ChartTypeTemplate.hxx + - LabeledDataSequence.hxx chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx: # Needed for rtl::math::round - rtl/math.hxx @@ -659,6 +617,9 @@ excludelist: chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx: # Needed for rtl::math::round - rtl/math.hxx + chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx: + # Needed for implicit dtor + - RegressionCurveModel.hxx chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx: # Actually used - com/sun/star/beans/XPropertySet.hpp @@ -677,6 +638,9 @@ excludelist: chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx: # Needed for rtl::math::round - rtl/math.hxx + # Needed for implicit dtor + - ChartType.hxx + - Diagram.hxx chart2/source/controller/main/ChartModelClone.hxx: # Needed for implicit dtor - com/sun/star/uno/Any.hxx @@ -718,20 +682,40 @@ excludelist: chart2/source/controller/main/ChartController_EditData.cxx: # Needed for member access - ChartWindow.hxx + chart2/source/controller/main/ChartController_Insert.cxx: + # Needed for implicit dtor + - Legend.hxx chart2/source/controller/main/ChartController_Position.cxx: # Needed for member access - ChartWindow.hxx + # Needed for implicit dtor + - ChartModel.hxx chart2/source/controller/main/ChartController_Properties.cxx: # Needed for member access - ChartWindow.hxx + # Needed for implicit dtor + - RegressionCurveModel.hxx + chart2/source/controller/main/ChartController_TextEdit.cxx: + # Needed for implicit dtor + - ChartModel.hxx chart2/source/controller/main/ChartController_Tools.cxx: # Needed for template - com/sun/star/graphic/XGraphic.hpp + chart2/source/controller/main/ControllerCommandDispatch.cxx: + # Needed for implicit dtor + - Axis.hxx + chart2/source/controller/main/DragMethod_RotateDiagram.cxx: + # Needed for implicit dtor + - ChartType.hxx chart2/source/controller/main/PositionAndSizeHelper.cxx: # Actually used - com/sun/star/awt/Rectangle.hpp # Needed for implicit dtor - com/sun/star/chart2/XDiagram.hpp + - Diagram.hxx + chart2/source/controller/main/SelectionHelper.cxx: + # Needed for implicit dtor + - Diagram.hxx chart2/source/controller/main/StatusBarCommandDispatch.cxx: # Actually used - com/sun/star/view/XSelectionSupplier.hpp @@ -745,6 +729,9 @@ excludelist: # base class has to be a complete type - com/sun/star/ui/XUIElementFactory.hpp - com/sun/star/lang/XServiceInfo.hpp + chart2/source/controller/sidebar/ChartSeriesPanel.cxx: + # Needed for implicit dtor + - RegressionCurveModel.hxx chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx: # base class has to be a complete type - com/sun/star/util/XModifyListener.hpp @@ -854,6 +841,9 @@ excludelist: chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx: # Needed for css namespace shortcut - sal/types.h + chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx: + # Needed for implicit dtor + - RegressionCurveModel.hxx chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx: # Needed for compound type declaration - com/sun/star/chart2/XAxis.hpp diff --git a/chart2/qa/extras/chart2dump/chart2dump.cxx b/chart2/qa/extras/chart2dump/chart2dump.cxx index 55fe31cda1a7..faaa3ccd9677 100644 --- a/chart2/qa/extras/chart2dump/chart2dump.cxx +++ b/chart2/qa/extras/chart2dump/chart2dump.cxx @@ -16,7 +16,6 @@ #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/drawing/FillStyle.hpp> -#include <o3tl/string_view.hxx> #include <editeng/unoprnms.hxx> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index 4def612c215e..8b6b94585cd2 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -37,7 +37,6 @@ #include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <i18nlangtag/languagetag.hxx> -#include <vcl/unohelp.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/window.hxx> #include <vcl/settings.hxx> @@ -45,7 +44,6 @@ #include <o3tl/safeint.hxx> #include <tools/diagnose_ex.h> #include <unotools/accessiblestatesethelper.hxx> -#include <ChartModel.hxx> #include <algorithm> #include <iterator> diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx index 7f8e2dca6b61..d89a5d027412 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/chart2/XTitle.hpp> -#include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/lang/XInitialization.hpp> diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx index c0dac3c22657..6f9dad562840 100644 --- a/chart2/source/controller/accessibility/AccessibleChartView.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx @@ -29,7 +29,6 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> -#include <com/sun/star/chart2/XChartDocument.hpp> #include <comphelper/servicehelper.hxx> diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx index 7cbef7d67e2c..10cd00e29480 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx @@ -20,7 +20,6 @@ #include "AreaWrapper.hxx" #include "Chart2ModelContact.hxx" #include <WrappedDirectStateProperty.hxx> -#include <com/sun/star/chart2/XChartDocument.hpp> #include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx index 21f952069205..542e0e584da5 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx @@ -36,7 +36,6 @@ #include <com/sun/star/chart/ChartAxisLabelPosition.hpp> #include <com/sun/star/chart/ChartAxisMarkPosition.hpp> #include <com/sun/star/chart2/XAxis.hpp> -#include <com/sun/star/chart2/XDiagram.hpp> #include <com/sun/star/frame/XModel.hpp> #include <CharacterProperties.hxx> diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx index fe29d1990c99..e65d789156bf 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx +++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx @@ -34,7 +34,6 @@ #include <ChartModel.hxx> #include <com/sun/star/chart2/XDataSeries.hpp> -#include <comphelper/servicehelper.hxx> #include <tools/diagnose_ex.h> using namespace ::com::sun::star; diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx index 837c09341fd3..7a89fb7dd06d 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx +++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx @@ -18,7 +18,6 @@ */ #pragma once -#include <cppuhelper/weakref.hxx> #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/Rectangle.hpp> diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx index 6050af15319f..787c9ba1be52 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx @@ -25,7 +25,6 @@ #include <ControllerLockGuard.hxx> #include "Chart2ModelContact.hxx" #include <cppuhelper/supportsservice.hxx> -#include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart/XChartDocument.hpp> #include <float.h> diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index 9c7a2b5342f7..563982ec2af4 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -53,12 +53,8 @@ #include <com/sun/star/chart/ChartDataRowSource.hpp> #include <com/sun/star/chart2/RelativeSize.hpp> #include <com/sun/star/chart2/RelativePosition.hpp> -#include <com/sun/star/chart2/XChartDocument.hpp> -#include <com/sun/star/chart2/XChartType.hpp> -#include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/chart/ChartSolidType.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <LinePropertiesHelper.hxx> #include <FillProperties.hxx> diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx index ca5a25005152..e914168213f9 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/chart2/LegendPosition.hpp> #include <com/sun/star/chart/ChartLegendExpansion.hpp> #include <com/sun/star/chart2/RelativePosition.hpp> -#include <com/sun/star/chart2/XDiagram.hpp> #include <CharacterProperties.hxx> #include <LinePropertiesHelper.hxx> diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx index 8678d743957d..3520dacb5f7d 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx @@ -24,8 +24,6 @@ #include <servicenames_charttypes.hxx> #include <cppuhelper/propshlp.hxx> #include <cppuhelper/supportsservice.hxx> -#include <com/sun/star/chart2/XChartType.hpp> -#include <com/sun/star/chart2/XDataSeriesContainer.hpp> #include <com/sun/star/drawing/LineJoint.hpp> #include <comphelper/sequence.hxx> #include <DataSeries.hxx> diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index 074a37778e65..d9039d8790ec 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/chart2/RelativePosition.hpp> #include <com/sun/star/chart2/XTitle.hpp> -#include <com/sun/star/chart2/XChartDocument.hpp> #include <CharacterProperties.hxx> #include <LinePropertiesHelper.hxx> diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx index 6a80eae044bb..c1bde1473a62 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx @@ -24,7 +24,6 @@ #include <servicenames_charttypes.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/propshlp.hxx> -#include <com/sun/star/chart2/XChartType.hpp> #include <comphelper/sequence.hxx> #include <LinePropertiesHelper.hxx> diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx index 711f68201727..9131bec9b9e9 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx @@ -21,7 +21,6 @@ #include "Chart2ModelContact.hxx" #include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> -#include <com/sun/star/chart2/XDiagram.hpp> #include <FillProperties.hxx> #include <LinePropertiesHelper.hxx> diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx index 2f7181cfbb0e..2f56ace70af9 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx @@ -24,13 +24,11 @@ #include "WrappedAxisAndGridExistenceProperties.hxx" #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/chart2/XAxis.hpp> -#include <com/sun/star/chart2/XDiagram.hpp> #include <Axis.hxx> #include <AxisHelper.hxx> #include <WrappedProperty.hxx> #include "Chart2ModelContact.hxx" #include <TitleHelper.hxx> -#include <ChartView.hxx> #include <osl/diagnose.h> using namespace ::com::sun::star; diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx index 0d73a59bd61f..e613161bf10f 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx @@ -21,7 +21,6 @@ #include "Chart2ModelContact.hxx" #include <ChartType.hxx> #include <DiagramHelper.hxx> -#include <com/sun/star/chart2/XChartType.hpp> #include <tools/long.hxx> using namespace ::com::sun::star; diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx index b3149088b10b..db9a07b45859 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx @@ -21,7 +21,6 @@ #include <WrappedProperty.hxx> #include "Chart2ModelContact.hxx" #include <DiagramHelper.hxx> -#include <com/sun/star/chart2/XDataSeries.hpp> #include <DataSeries.hxx> #include <memory> diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx index 8bbcf985b4a6..102acfb02ba2 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx @@ -28,7 +28,6 @@ #include <sal/log.hxx> #include <com/sun/star/chart2/CurveStyle.hpp> -#include <com/sun/star/chart2/XChartType.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx index b2a54ecac804..2de01cc8b966 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx @@ -32,7 +32,6 @@ #include <com/sun/star/chart/ErrorBarStyle.hpp> #include <com/sun/star/chart/ChartErrorIndicatorType.hpp> #include <com/sun/star/chart/ChartRegressionCurveType.hpp> -#include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart2/data/XRangeXMLConversion.hpp> #include <com/sun/star/chart2/XRegressionCurveContainer.hpp> #include <utility> diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx index 593089029d74..23c0b0fe5e00 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx @@ -24,8 +24,6 @@ #include <DiagramHelper.hxx> #include <ControllerLockGuard.hxx> #include <WrappedProperty.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <tools/diagnose_ex.h> #include <ChartTypeManager.hxx> diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index 585393f1ecdd..cbd4db6e430f 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -40,7 +40,6 @@ #include <vcl/image.hxx> #include <vcl/settings.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <tools/diagnose_ex.h> namespace chart diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index bdb491213d5f..6af79ed3453e 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -33,7 +33,6 @@ #include <helpids.h> #include <ChartModel.hxx> #include <ChartType.hxx> -#include <LabeledDataSequence.hxx> #include <vcl/weld.hxx> #include <vcl/settings.hxx> @@ -45,8 +44,6 @@ #include <toolkit/helper/vclunohelper.hxx> #include <com/sun/star/chart2/XChartDocument.hpp> -#include <com/sun/star/chart2/XChartType.hpp> -#include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/container/XIndexReplace.hpp> #include <algorithm> diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx index 07666575102a..b11411cac41b 100644 --- a/chart2/source/controller/dialogs/DataBrowserModel.cxx +++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx @@ -29,24 +29,18 @@ #include <ControllerLockGuard.hxx> #include <StatisticsHelper.hxx> #include <ChartTypeHelper.hxx> -#include <ChartTypeTemplate.hxx> #include <chartview/ExplicitValueProvider.hxx> #include <ExplicitCategoriesProvider.hxx> #include <BaseCoordinateSystem.hxx> -#include <LabeledDataSequence.hxx> #include <ChartModel.hxx> #include <unonames.hxx> #include <com/sun/star/container/XIndexReplace.hpp> -#include <com/sun/star/chart2/XDataSeriesContainer.hpp> #include <com/sun/star/chart2/XInternalDataProvider.hpp> -#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> -#include <com/sun/star/chart2/XChartTypeContainer.hpp> #include <com/sun/star/chart2/data/XDataSource.hpp> #include <com/sun/star/chart2/data/XLabeledDataSequence.hpp> #include <com/sun/star/chart2/data/XNumericalDataSequence.hpp> #include <com/sun/star/chart2/data/XTextualDataSequence.hpp> -#include <com/sun/star/util/XModifiable.hpp> #include <o3tl/safeint.hxx> #include <tools/diagnose_ex.h> #include <comphelper/property.hxx> diff --git a/chart2/source/controller/dialogs/DataBrowserModel.hxx b/chart2/source/controller/dialogs/DataBrowserModel.hxx index a06c6828fad7..3eb1756fa154 100644 --- a/chart2/source/controller/dialogs/DataBrowserModel.hxx +++ b/chart2/source/controller/dialogs/DataBrowserModel.hxx @@ -18,6 +18,9 @@ */ #pragma once +#include <DataSeries.hxx> +#include <ChartType.hxx> + #include <com/sun/star/uno/Reference.hxx> #include <rtl/ref.hxx> diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx index 1a2dcb617af1..908d6d47b433 100644 --- a/chart2/source/controller/dialogs/DialogModel.cxx +++ b/chart2/source/controller/dialogs/DialogModel.cxx @@ -38,12 +38,8 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/chart2/AxisType.hpp> -#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> -#include <com/sun/star/chart2/XChartTypeContainer.hpp> #include <com/sun/star/chart2/XDataSeriesContainer.hpp> -#include <com/sun/star/chart2/data/XDataSink.hpp> -#include <comphelper/sequence.hxx> #include <tools/diagnose_ex.h> #include <rtl/ustring.hxx> diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx index 926b81a0ae15..07b7f3503e92 100644 --- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx +++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx @@ -34,7 +34,6 @@ #include <DataSeries.hxx> #include <DataSeriesHelper.hxx> #include <TitleHelper.hxx> -#include <LabeledDataSequence.hxx> #include <ExplicitCategoriesProvider.hxx> #include <CommonConverters.hxx> #include <NumberFormatterWrapper.hxx> @@ -49,8 +48,6 @@ #include <com/sun/star/chart2/XTitle.hpp> #include <com/sun/star/chart2/MovingAverageType.hpp> -#include <com/sun/star/chart2/XDataSeries.hpp> -#include <com/sun/star/chart2/XRegressionCurveContainer.hpp> #include <tools/diagnose_ex.h> #include <o3tl/string_view.hxx> diff --git a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx index 33fe0ff6955f..89dbc3aca0bd 100644 --- a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx +++ b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <com/sun/star/frame/XModel.hpp> #include <TimerTriggeredControllerLock.hxx> #include <ControllerLockGuard.hxx> #include <ChartModel.hxx> diff --git a/chart2/source/controller/dialogs/TitleDialogData.cxx b/chart2/source/controller/dialogs/TitleDialogData.cxx index 4a5167c31073..09a8cc359415 100644 --- a/chart2/source/controller/dialogs/TitleDialogData.cxx +++ b/chart2/source/controller/dialogs/TitleDialogData.cxx @@ -19,8 +19,6 @@ #include <sal/config.h> -#include <com/sun/star/frame/XModel.hpp> - #include <TitleDialogData.hxx> #include <TitleHelper.hxx> #include <ChartModelHelper.hxx> diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx index 59ca6be0c99a..b62ac22154fa 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx @@ -19,7 +19,6 @@ #include <dlg_ChartType.hxx> #include "tp_ChartType.hxx" -#include <com/sun/star/chart2/XChartDocument.hpp> #include <ChartModel.hxx> namespace chart diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index 6b85b9eb6b6c..9ef2e70e8961 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -23,8 +23,6 @@ #include <comphelper/stl_types.hxx> #include <com/sun/star/awt/XWindow.hpp> -#include <com/sun/star/chart2/XChartDocument.hpp> -#include <com/sun/star/frame/XStorable.hpp> using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx index 503587cb060f..dc1296af70b0 100644 --- a/chart2/source/controller/dialogs/dlg_DataSource.cxx +++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx @@ -18,11 +18,9 @@ */ #include <com/sun/star/chart2/XChartDocument.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <dlg_DataSource.hxx> #include <ChartTypeTemplateProvider.hxx> -#include <ChartTypeManager.hxx> #include <ChartTypeTemplate.hxx> #include <Diagram.hxx> #include <DiagramHelper.hxx> diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx index fcb0eefd3ba9..98afaa47c057 100644 --- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx @@ -31,7 +31,6 @@ #include <ObjectNameProvider.hxx> #include <DataSeries.hxx> -#include <com/sun/star/frame/XModel.hpp> #include <comphelper/servicehelper.hxx> using ::com::sun::star::uno::Reference; diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index 7a14b9680d45..eb697def87a5 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -48,11 +48,9 @@ #include <CommonConverters.hxx> #include <RegressionCalculationHelper.hxx> #include <BaseCoordinateSystem.hxx> -#include <LabeledDataSequence.hxx> #include <com/sun/star/chart2/AxisType.hpp> #include <com/sun/star/chart2/XAxis.hpp> -#include <com/sun/star/chart2/XDataSeries.hpp> #include <svl/intitem.hxx> #include <svl/ctloptions.hxx> diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx index 09fc4923bdd9..a99782336e03 100644 --- a/chart2/source/controller/dialogs/dlg_View3D.cxx +++ b/chart2/source/controller/dialogs/dlg_View3D.cxx @@ -26,9 +26,7 @@ #include <ChartModelHelper.hxx> #include <ChartModel.hxx> #include <Diagram.hxx> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/chart2/XDiagram.hpp> -#include <com/sun/star/frame/XModel.hpp> namespace chart { diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx index 40dd7b9cd493..c2a84536f4aa 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx @@ -23,10 +23,7 @@ #include <ThreeDHelper.hxx> #include <ControllerLockGuard.hxx> #include <Diagram.hxx> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/chart2/XDiagram.hpp> #include <com/sun/star/drawing/ShadeMode.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <tools/diagnose_ex.h> #include <vcl/svapp.hxx> diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx index a47cebe9c8a4..df1d8e907c99 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx @@ -25,8 +25,6 @@ #include <ChartTypeHelper.hxx> #include <ThreeDHelper.hxx> #include <ControllerLockGuard.hxx> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/chart2/XDiagram.hpp> #include <com/sun/star/drawing/ProjectionMode.hpp> #include <tools/diagnose_ex.h> #include <tools/helpers.hxx> diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index f5eec8625bc7..2b8c36e7c9c0 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -28,7 +28,6 @@ #include <DiagramHelper.hxx> #include <Diagram.hxx> #include <unonames.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> #include <svtools/valueset.hxx> diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index 90295c310ad9..7cadbc04d65d 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -33,13 +33,9 @@ #include "DialogModel.hxx" #include <o3tl/safeint.hxx> #include <TabPageNotifiable.hxx> -#include <com/sun/star/chart2/XChartType.hpp> #include <com/sun/star/chart2/XDataSeries.hpp> -#include <com/sun/star/chart2/XDataSeriesContainer.hpp> #include <com/sun/star/chart2/data/XDataProvider.hpp> #include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/util/XModifiable.hpp> -#include <com/sun/star/chart2/data/XDataSink.hpp> #include <tools/diagnose_ex.h> diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx index 913354f6a198..40219d917f9c 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.hxx +++ b/chart2/source/controller/dialogs/tp_DataSource.hxx @@ -18,6 +18,9 @@ */ #pragma once +#include <DataSeries.hxx> +#include <ChartType.hxx> + #include <vcl/wizardmachine.hxx> #include <RangeSelectionListener.hxx> diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx index 2719874fd66a..be6948b51b8d 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx @@ -25,8 +25,6 @@ #include <Diagram.hxx> #include <AxisHelper.hxx> #include <ControllerLockGuard.hxx> -#include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/chart2/XChartDocument.hpp> namespace chart { diff --git a/chart2/source/controller/inc/ObjectHierarchy.hxx b/chart2/source/controller/inc/ObjectHierarchy.hxx index a767523bfced..55c073bf22ba 100644 --- a/chart2/source/controller/inc/ObjectHierarchy.hxx +++ b/chart2/source/controller/inc/ObjectHierarchy.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <ChartModel.hxx> #include <ObjectIdentifier.hxx> #include <map> #include <vector> diff --git a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx index 2701a7695c8c..30c74c4c2500 100644 --- a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx +++ b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx @@ -19,6 +19,7 @@ #pragma once #include "ItemConverter.hxx" +#include <rtl/ref.hxx> namespace com::sun::star::chart2 { class XRegressionCurveContainer; } namespace com::sun::star::lang { class XMultiServiceFactory; } diff --git a/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx b/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx index 4952e112db88..34a4880c0b7a 100644 --- a/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx +++ b/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx @@ -19,7 +19,6 @@ #pragma once -#include <com/sun/star/uno/Reference.h> #include <vcl/timer.hxx> #include <rtl/ref.hxx> diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx index a073931e9344..20ad1504f018 100644 --- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx @@ -42,10 +42,8 @@ #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/XChartDocument.hpp> #include <com/sun/star/chart2/AxisOrientation.hpp> #include <com/sun/star/chart2/AxisType.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <osl/diagnose.h> #include <o3tl/any.hxx> diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx index c3eb1d40f4e0..42f572c45295 100644 --- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx @@ -42,7 +42,6 @@ #include <com/sun/star/chart2/RelativePosition.hpp> #include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <comphelper/sequence.hxx> #include <svx/xflclit.hxx> diff --git a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx index a26cce3ee4e5..24b5ccfd8c21 100644 --- a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx +++ b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx @@ -33,10 +33,7 @@ #include <Axis.hxx> #include <AxisHelper.hxx> #include <chartview/ExplicitValueProvider.hxx> -#include <com/sun/star/chart2/XChartDocument.hpp> -#include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/chart2/XTitle.hpp> -#include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/chart2/XAxis.hpp> using namespace ::com::sun::star; diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx index 04b8769a1fde..5e230a434cf1 100644 --- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx @@ -32,7 +32,6 @@ #include <rtl/math.hxx> #include <com/sun/star/chart2/XInternalDataProvider.hpp> -#include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart2/XRegressionCurveContainer.hpp> #include <com/sun/star/chart/ErrorBarStyle.hpp> #include <tools/diagnose_ex.h> diff --git a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx index bcea179b7585..644d8d80ccc4 100644 --- a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx @@ -49,7 +49,6 @@ #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/frame/XModel.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 d2a313f3ed03..9174ef885d17 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -58,18 +58,12 @@ #include <BaseCoordinateSystem.hxx> #include <com/sun/star/awt/XWindowPeer.hpp> -#include <com/sun/star/chart2/XChartDocument.hpp> -#include <com/sun/star/chart2/data/XDataReceiver.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/util/XModifyBroadcaster.hpp> #include <com/sun/star/frame/LayoutManagerEvents.hpp> #include <com/sun/star/frame/XLayoutManagerEventBroadcaster.hpp> -#include <com/sun/star/document/XUndoManagerSupplier.hpp> #include <com/sun/star/ui/XSidebar.hpp> -#include <com/sun/star/chart2/XChartTypeContainer.hpp> -#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> #include <com/sun/star/chart2/XDataProviderAccess.hpp> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> diff --git a/chart2/source/controller/main/ChartController_EditData.cxx b/chart2/source/controller/main/ChartController_EditData.cxx index 4f0a979956b0..007a786ca564 100644 --- a/chart2/source/controller/main/ChartController_EditData.cxx +++ b/chart2/source/controller/main/ChartController_EditData.cxx @@ -27,7 +27,6 @@ #include <strings.hrc> #include <vcl/svapp.hxx> -#include <com/sun/star/chart2/XChartDocument.hpp> using namespace ::com::sun::star; diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index d184850b0dc6..4f39f1068cdb 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -27,8 +27,6 @@ #include <dlg_InsertTitle.hxx> #include <dlg_ObjectProperties.hxx> -#include <ChartModel.hxx> -#include <ChartModelHelper.hxx> #include <Axis.hxx> #include <AxisHelper.hxx> #include <TitleHelper.hxx> @@ -57,9 +55,6 @@ #include <RegressionCurveModel.hxx> #include <com/sun/star/chart2/XRegressionCurve.hpp> -#include <com/sun/star/chart2/XRegressionCurveContainer.hpp> -#include <com/sun/star/chart2/XChartDocument.hpp> -#include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/chart/ErrorBarStyle.hpp> #include <svx/ActionDescriptionProvider.hxx> diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index 99c768da772e..fd15ebc11125 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -56,9 +56,6 @@ #include <ReferenceSizeProvider.hxx> #include <RegressionCurveHelper.hxx> #include <RegressionCurveModel.hxx> -#include <com/sun/star/chart2/XChartDocument.hpp> -#include <com/sun/star/chart2/XDataSeries.hpp> -#include <com/sun/star/chart2/XRegressionCurveContainer.hpp> #include <com/sun/star/util/CloseVetoException.hpp> #include <comphelper/servicehelper.hxx> #include <o3tl/string_view.hxx> diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index 905b84a6724c..848452fdb4ce 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -54,7 +54,6 @@ #include <com/sun/star/drawing/TextHorizontalAdjust.hpp> #include <com/sun/star/chart/ErrorBarStyle.hpp> #include <com/sun/star/chart2/XRegressionCurveContainer.hpp> -#include <com/sun/star/chart2/XChartDocument.hpp> #include <editeng/editview.hxx> #include <editeng/outliner.hxx> diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 8808da531bd2..8db4133ee93e 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -57,11 +57,7 @@ #include <com/sun/star/chart2/RelativePosition.hpp> #include <com/sun/star/chart2/RelativeSize.hpp> -#include <com/sun/star/chart2/XRegressionCurveContainer.hpp> #include <com/sun/star/chart2/data/XPivotTableDataProvider.hpp> -#include <com/sun/star/chart2/XChartDocument.hpp> -#include <com/sun/star/chart2/XChartType.hpp> -#include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/awt/PopupMenuDirection.hpp> #include <com/sun/star/frame/DispatchHelper.hpp> @@ -69,15 +65,12 @@ #include <com/sun/star/frame/XPopupMenuController.hpp> #include <com/sun/star/util/XUpdatable.hpp> #include <com/sun/star/awt/Rectangle.hpp> -#include <com/sun/star/qa/XDumper.hpp> #include <comphelper/lok.hxx> #include <comphelper/propertysequence.hxx> #include <comphelper/propertyvalue.hxx> #include <comphelper/sequence.hxx> -#include <toolkit/awt/vclxmenu.hxx> - #include <sfx2/viewsh.hxx> #include <svx/ActionDescriptionProvider.hxx> #include <svx/obj3d.hxx> diff --git a/chart2/source/controller/main/ChartDropTargetHelper.cxx b/chart2/source/controller/main/ChartDropTargetHelper.cxx index e4ffd2a29568..b6e359b96d2e 100644 --- a/chart2/source/controller/main/ChartDropTargetHelper.cxx +++ b/chart2/source/controller/main/ChartDropTargetHelper.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart2/data/XDataProvider.hpp> -#include <com/sun/star/container/XChild.hpp> #include <sot/formats.hxx> #include <vector> diff --git a/chart2/source/controller/main/ChartModelClone.cxx b/chart2/source/controller/main/ChartModelClone.cxx index d4cae52d0ff6..d849452748ec 100644 --- a/chart2/source/controller/main/ChartModelClone.cxx +++ b/chart2/source/controller/main/ChartModelClone.cxx @@ -32,7 +32,6 @@ #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/XDataSource.hpp> #include <com/sun/star/chart2/data/XLabeledDataSequence.hpp> #include <comphelper/property.hxx> diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx index b957d9a0f35b..e5035b4f053c 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.cxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx @@ -44,12 +44,7 @@ #include <sfx2/viewsh.hxx> #include <sfx2/objsh.hxx> -#include <com/sun/star/util/XModifyBroadcaster.hpp> -#include <com/sun/star/frame/XStorable.hpp> -#include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart2/XRegressionCurve.hpp> -#include <com/sun/star/chart2/XRegressionCurveContainer.hpp> -#include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/chart2/XDataProviderAccess.hpp> // only needed until #i68864# is fixed diff --git a/chart2/source/controller/main/DragMethod_Base.cxx b/chart2/source/controller/main/DragMethod_Base.cxx index d1885e333077..e617acd34e4b 100644 --- a/chart2/source/controller/main/DragMethod_Base.cxx +++ b/chart2/source/controller/main/DragMethod_Base.cxx @@ -24,7 +24,6 @@ #include <ObjectIdentifier.hxx> #include <svx/ActionDescriptionProvider.hxx> -#include <com/sun/star/frame/XModel.hpp> #include <vcl/ptrstyle.hxx> namespace chart diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx index 0859ada4ab23..002c54ec037d 100644 --- a/chart2/source/controller/main/DragMethod_PieSegment.cxx +++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx @@ -25,7 +25,6 @@ #include <ObjectIdentifier.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/awt/Point.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <basegfx/matrix/b2dhommatrix.hxx> #include <tools/diagnose_ex.h> diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx index 2af1c013d826..34efccfd9550 100644 --- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx +++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx @@ -33,8 +33,6 @@ #include <svx/scene3d.hxx> #include <basegfx/matrix/b3dhommatrix.hxx> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <svx/sdr/contact/viewcontactofe3dscene.hxx> #include <drawinglayer/geometry/viewinformation3d.hxx> diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index 7f7f3cff3aa6..34bba3173a85 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -33,10 +33,6 @@ #include <toolkit/helper/vclunohelper.hxx> #include <vcl/svapp.hxx> -#include <com/sun/star/chart2/XChartDocument.hpp> -#include <com/sun/star/view/XSelectionSupplier.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> - namespace chart { class ExplicitValueProvider; } namespace chart diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx index 5467dd161299..fb1e4e0527ff 100644 --- a/chart2/source/controller/main/ElementSelector.hxx +++ b/chart2/source/controller/main/ElementSelector.hxx @@ -20,7 +20,6 @@ #include <ObjectIdentifier.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/frame/XController.hpp> #include <cppuhelper/implbase1.hxx> #include <svtools/toolboxcontroller.hxx> diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx index cba33e832180..b21d8354108c 100644 --- a/chart2/source/controller/main/ObjectHierarchy.cxx +++ b/chart2/source/controller/main/ObjectHierarchy.cxx @@ -38,22 +38,14 @@ #include <map> #include <algorithm> -#include <iterator> #include <com/sun/star/drawing/XShapes.hpp> -#include <com/sun/star/chart2/XTitled.hpp> -#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> -#include <com/sun/star/chart2/XChartDocument.hpp> -#include <com/sun/star/chart2/XChartTypeContainer.hpp> -#include <com/sun/star/chart2/XDataSeriesContainer.hpp> -#include <com/sun/star/chart2/XRegressionCurveContainer.hpp> #include <com/sun/star/chart/ErrorBarStyle.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/awt/Key.hpp> #include <com/sun/star/awt/KeyEvent.hpp> #include <com/sun/star/awt/KeyModifier.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <tools/diagnose_ex.h> using namespace ::com::sun::star; diff --git a/chart2/source/controller/main/PositionAndSizeHelper.cxx b/chart2/source/controller/main/PositionAndSizeHelper.cxx index ec744633ca0c..421d9081a891 100644 --- a/chart2/source/controller/main/PositionAndSizeHelper.cxx +++ b/chart2/source/controller/main/PositionAndSizeHelper.cxx @@ -23,7 +23,6 @@ #include <com/sun/star/chart2/XDiagram.hpp> #include <com/sun/star/chart2/RelativePosition.hpp> #include <com/sun/star/chart2/RelativeSize.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <tools/gen.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/awt/Rectangle.hpp> diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx index cc01e09eff0a..177d7acf588b 100644 --- a/chart2/source/controller/main/SelectionHelper.cxx +++ b/chart2/source/controller/main/SelectionHelper.cxx @@ -24,7 +24,6 @@ #include <ChartModelHelper.hxx> #include <ChartModel.hxx> -#include <com/sun/star/frame/XModel.hpp> #include <svx/svdpage.hxx> #include <svx/svditer.hxx> #include <svx/obj3d.hxx> diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index 9a00d7b8ad22..d261a967feea 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -27,7 +27,6 @@ #include <chartview/DrawModelWrapper.hxx> #include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/frame/CommandGroup.hpp> -#include <com/sun/star/frame/XStorable.hpp> #include <vcl/svapp.hxx> #include <editeng/formatbreakitem.hxx> diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/chart2/source/controller/main/StatusBarCommandDispatch.cxx index 26fcc45b4a30..440bd9885b69 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.cxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.cxx @@ -19,9 +19,7 @@ #include "StatusBarCommandDispatch.hxx" #include <ObjectNameProvider.hxx> -#include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> -#include <com/sun/star/util/XModifiable.hpp> #include <ChartModel.hxx> using namespace ::com::sun::star; diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx index 3a05412d1670..03897adf3c49 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.cxx +++ b/chart2/source/controller/main/UndoCommandDispatch.cxx @@ -20,10 +20,8 @@ #include "UndoCommandDispatch.hxx" #include <ChartModel.hxx> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> #include <com/sun/star/document/UndoFailedException.hpp> -#include <com/sun/star/document/XUndoManagerSupplier.hpp> #include <vcl/svapp.hxx> #include <tools/diagnose_ex.h> diff --git a/chart2/source/controller/main/UndoGuard.cxx b/chart2/source/controller/main/UndoGuard.cxx index 420347eb40d4..85cb8bcc96a5 100644 --- a/chart2/source/controller/main/UndoGuard.cxx +++ b/chart2/source/controller/main/UndoGuard.cxx @@ -23,7 +23,6 @@ #include <ChartModel.hxx> #include <com/sun/star/document/XUndoManager.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <tools/diagnose_ex.h> diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx b/chart2/source/controller/sidebar/ChartAreaPanel.cxx index f13f2390debc..b54df41ebd39 100644 --- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx +++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx @@ -19,7 +19,6 @@ #include <PropertyHelper.hxx> #include <chartview/DrawModelWrapper.hxx> -#include <com/sun/star/util/XModifyBroadcaster.hpp> #include <com/sun/star/chart2/XDiagram.hpp> #include <sfx2/weldutils.hxx> diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.cxx b/chart2/source/controller/sidebar/ChartAxisPanel.cxx index c5e15205b325..acc4a8add952 100644 --- a/chart2/source/controller/sidebar/ChartAxisPanel.cxx +++ b/chart2/source/controller/sidebar/ChartAxisPanel.cxx @@ -17,11 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/chart/ChartAxisLabelPosition.hpp> #include <com/sun/star/chart2/AxisOrientation.hpp> -#include <com/sun/star/chart2/XAxis.hpp> -#include <com/sun/star/util/XModifyBroadcaster.hpp> #include <vcl/svapp.hxx> #include <sal/log.hxx> diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.hxx b/chart2/source/controller/sidebar/ChartColorWrapper.hxx index 861f1e1628ea..5237bc9c3219 100644 --- a/chart2/source/controller/sidebar/ChartColorWrapper.hxx +++ b/chart2/source/controller/sidebar/ChartColorWrapper.hxx @@ -9,7 +9,8 @@ #pragma once -#include <com/sun/star/uno/Reference.hxx> +#include <ChartModel.hxx> + #include <svx/Palette.hxx> #include <rtl/ref.hxx> diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx b/chart2/source/controller/sidebar/ChartElementsPanel.cxx index cfa821d3bad8..75dc7ed962c2 100644 --- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx +++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx @@ -19,8 +19,6 @@ #include <com/sun/star/chart2/LegendPosition.hpp> #include <com/sun/star/chart/ChartLegendExpansion.hpp> -#include <com/sun/star/chart2/XChartTypeContainer.hpp> -#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> #include <vcl/svapp.hxx> diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx index 0db870b8bcc5..e86fdf0fef59 100644 --- a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx +++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx @@ -18,7 +18,6 @@ */ #include <com/sun/star/chart/ErrorBarStyle.hpp> -#include <com/sun/star/util/XModifyBroadcaster.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include "ChartErrorBarPanel.hxx" diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx b/chart2/source/controller/sidebar/ChartLinePanel.cxx index 94658d26ed2d..c98357535505 100644 --- a/chart2/source/controller/sidebar/ChartLinePanel.cxx +++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx @@ -22,7 +22,6 @@ #include <vcl/svapp.hxx> #include <com/sun/star/view/XSelectionSupplier.hpp> -#include <com/sun/star/util/XModifyBroadcaster.hpp> #include <com/sun/star/chart2/XDiagram.hpp> #include <comphelper/lok.hxx> diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx index 80036fad36d0..c5b21ed5a4c4 100644 --- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx +++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx @@ -18,14 +18,7 @@ */ #include <com/sun/star/chart/ErrorBarStyle.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/chart/DataLabelPlacement.hpp> -#include <com/sun/star/chart2/XChartDocument.hpp> -#include <com/sun/star/chart2/XDataSeries.hpp> -#include <com/sun/star/chart2/XChartTypeContainer.hpp> -#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> -#include <com/sun/star/chart2/XRegressionCurveContainer.hpp> -#include <com/sun/star/util/XModifyBroadcaster.hpp> #include <vcl/svapp.hxx> #include <sal/log.hxx> diff --git a/chart2/source/controller/sidebar/ChartTypePanel.cxx b/chart2/source/controller/sidebar/ChartTypePanel.cxx index c2a88bc09a6c..9c5a7ba43d76 100644 --- a/chart2/source/controller/sidebar/ChartTypePanel.cxx +++ b/chart2/source/controller/sidebar/ChartTypePanel.cxx @@ -31,10 +31,6 @@ #include <Diagram.hxx> #include <unonames.hxx> -#include <com/sun/star/chart2/XChartDocument.hpp> -#include <com/sun/star/chart2/XDiagram.hpp> -#include <com/sun/star/util/XModifyBroadcaster.hpp> - #include <svtools/valueset.hxx> #include <tools/diagnose_ex.h> diff --git a/chart2/source/controller/uitest/uiobject.cxx b/chart2/source/controller/uitest/uiobject.cxx index ef4f4d7112c8..5081f00c7253 100644 --- a/chart2/source/controller/uitest/uiobject.cxx +++ b/chart2/source/controller/uitest/uiobject.cxx @@ -15,7 +15,6 @@ #include <ChartModel.hxx> #include <ObjectHierarchy.hxx> #include <chartview/ExplicitValueProvider.hxx> -#include <com/sun/star/chart2/XChartDocument.hpp> #include <comphelper/servicehelper.hxx> diff --git a/chart2/source/inc/BaseCoordinateSystem.hxx b/chart2/source/inc/BaseCoordinateSystem.hxx index 85739dc11a3a..89c5eca50e13 100644 --- a/chart2/source/inc/BaseCoordinateSystem.hxx +++ b/chart2/source/inc/BaseCoordinateSystem.hxx @@ -27,7 +27,6 @@ #include <com/sun/star/chart2/XChartTypeContainer.hpp> #include <com/sun/star/util/XCloneable.hpp> #include "ModifyListenerHelper.hxx" -#include "charttoolsdllapi.hxx" #include <vector> diff --git a/chart2/source/inc/ControllerLockGuard.hxx b/chart2/source/inc/ControllerLockGuard.hxx index 78958eb90648..393c8fec1765 100644 --- a/chart2/source/inc/ControllerLockGuard.hxx +++ b/chart2/source/inc/ControllerLockGuard.hxx @@ -19,7 +19,6 @@ #pragma once #include "charttoolsdllapi.hxx" -#include <com/sun/star/uno/Reference.h> #include <rtl/ref.hxx> namespace chart diff --git a/chart2/source/inc/DataInterpreter.hxx b/chart2/source/inc/DataInterpreter.hxx index aa0f5578e369..7638e5ccee3e 100644 --- a/chart2/source/inc/DataInterpreter.hxx +++ b/chart2/source/inc/DataInterpreter.hxx @@ -18,12 +18,11 @@ */ #pragma once +#include "DataSeries.hxx" #include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/chart2/data/XDataSource.hpp> -#include <com/sun/star/chart2/XDataSeries.hpp> -#include "charttoolsdllapi.hxx" #include <rtl/ref.hxx> #include <vector> diff --git a/chart2/source/inc/DataSource.hxx b/chart2/source/inc/DataSource.hxx index 1f9478d85653..6e9b84ed9bd9 100644 --- a/chart2/source/inc/DataSource.hxx +++ b/chart2/source/inc/DataSource.hxx @@ -22,7 +22,6 @@ #include <com/sun/star/chart2/data/XDataSource.hpp> #include <com/sun/star/chart2/data/XDataSink.hpp> #include <cppuhelper/implbase.hxx> -#include <rtl/ref.hxx> #include <vector> #include "charttoolsdllapi.hxx" diff --git a/chart2/source/inc/DiagramHelper.hxx b/chart2/source/inc/DiagramHelper.hxx index f9dd8e593556..f874a1afafa7 100644 --- a/chart2/source/inc/DiagramHelper.hxx +++ b/chart2/source/inc/DiagramHelper.hxx @@ -20,10 +20,10 @@ #include "StackMode.hxx" #include "charttoolsdllapi.hxx" +#include "ChartTypeTemplate.hxx" #include <com/sun/star/awt/Rectangle.hpp> #include <rtl/ref.hxx> -#include <utility> #include <vector> namespace chart { class ChartModel; } diff --git a/chart2/source/inc/ModifyListenerHelper.hxx b/chart2/source/inc/ModifyListenerHelper.hxx index de407f2ba137..1042e5d20e2b 100644 --- a/chart2/source/inc/ModifyListenerHelper.hxx +++ b/chart2/source/inc/ModifyListenerHelper.hxx @@ -26,7 +26,6 @@ #include <mutex> #include <algorithm> -#include <utility> namespace chart { diff --git a/chart2/source/inc/NameContainer.hxx b/chart2/source/inc/NameContainer.hxx index 66d0fde1a70f..12fc76978b0d 100644 --- a/chart2/source/inc/NameContainer.hxx +++ b/chart2/source/inc/NameContainer.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/util/XCloneable.hpp> #include <cppuhelper/implbase.hxx> -#include "charttoolsdllapi.hxx" #include <map> diff --git a/chart2/source/inc/StatisticsHelper.hxx b/chart2/source/inc/StatisticsHelper.hxx index a52fb1fb0d10..d4a05daafd80 100644 --- a/chart2/source/inc/StatisticsHelper.hxx +++ b/chart2/source/inc/StatisticsHelper.hxx @@ -20,7 +20,6 @@ #include <com/sun/star/uno/Reference.h> #include <rtl/ustring.hxx> -#include <rtl/ref.hxx> #include "charttoolsdllapi.hxx" namespace com::sun::star::beans { class XPropertySet; } diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index e31e008fc565..712be3fdfa12 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -47,7 +47,6 @@ #include <svl/numformat.hxx> #include <svl/numuno.hxx> #include <com/sun/star/lang/DisposedException.hpp> -#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/embed/EmbedMapUnits.hpp> #include <com/sun/star/embed/Aspects.hpp> diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx index b932a7b06578..b54fa389773b 100644 --- a/chart2/source/model/main/DataSeries.cxx +++ b/chart2/source/model/main/DataSeries.cxx @@ -24,11 +24,9 @@ #include <UserDefinedProperties.hxx> #include "DataPoint.hxx" #include <DataSeriesHelper.hxx> -#include <LabeledDataSequence.hxx> #include <CloneHelper.hxx> #include <RegressionCurveModel.hxx> #include <ModifyListenerHelper.hxx> -#include <EventListenerHelper.hxx> #include <com/sun/star/container/NoSuchElementException.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <cppuhelper/supportsservice.hxx> diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx index f160987addc3..b1cfa0786f83 100644 --- a/chart2/source/model/main/Diagram.cxx +++ b/chart2/source/model/main/Diagram.cxx @@ -39,7 +39,6 @@ #include <com/sun/star/chart2/RelativeSize.hpp> #include <com/sun/star/container/NoSuchElementException.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <cppuhelper/supportsservice.hxx> #include <tools/diagnose_ex.h> diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx index a08375fc5cf4..69f871ddc3c5 100644 --- a/chart2/source/model/main/FormattedString.cxx +++ b/chart2/source/model/main/FormattedString.cxx @@ -23,7 +23,6 @@ #include <PropertyHelper.hxx> #include <ModifyListenerHelper.hxx> #include <cppuhelper/supportsservice.hxx> -#include <tools/diagnose_ex.h> namespace com::sun::star::uno { class XComponentContext; } diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx index 0cfeaaafe1e3..7bfb4453edcd 100644 --- a/chart2/source/model/main/GridProperties.cxx +++ b/chart2/source/model/main/GridProperties.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <cppuhelper/supportsservice.hxx> -#include <tools/diagnose_ex.h> namespace com::sun::star::beans { class XPropertySetInfo; } namespace com::sun::star::uno { class XComponentContext; } diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx index 741b90039370..8a0676e74bda 100644 --- a/chart2/source/model/main/Legend.cxx +++ b/chart2/source/model/main/Legend.cxx @@ -31,7 +31,6 @@ #include <com/sun/star/chart2/RelativePosition.hpp> #include <com/sun/star/chart2/RelativeSize.hpp> #include <cppuhelper/supportsservice.hxx> -#include <tools/diagnose_ex.h> #include <algorithm> diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx index 9f51469ca9cb..0849f9224f99 100644 --- a/chart2/source/model/main/PageBackground.cxx +++ b/chart2/source/model/main/PageBackground.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/drawing/LineStyle.hpp> #include <cppuhelper/supportsservice.hxx> -#include <tools/diagnose_ex.h> #include <vector> #include <algorithm> diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx index c93a9500e2d6..fcc60846bf67 100644 --- a/chart2/source/model/main/StockBar.cxx +++ b/chart2/source/model/main/StockBar.cxx @@ -24,7 +24,6 @@ #include <PropertyHelper.hxx> #include <ModifyListenerHelper.hxx> #include <com/sun/star/uno/Sequence.hxx> -#include <tools/diagnose_ex.h> #include <algorithm> diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx index 35e3631077b1..ab32d7a306e6 100644 --- a/chart2/source/model/main/Title.cxx +++ b/chart2/source/model/main/Title.cxx @@ -30,7 +30,6 @@ #include <com/sun/star/chart2/RelativePosition.hpp> #include <com/sun/star/awt/Size.hpp> #include <cppuhelper/supportsservice.hxx> -#include <tools/diagnose_ex.h> #include <vector> #include <algorithm> diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx index 5588ed81e0a3..1727cbf317db 100644 --- a/chart2/source/model/main/Wall.cxx +++ b/chart2/source/model/main/Wall.cxx @@ -24,7 +24,6 @@ #include <PropertyHelper.hxx> #include <ModifyListenerHelper.hxx> #include <com/sun/star/drawing/LineStyle.hpp> -#include <tools/diagnose_ex.h> #include <vector> #include <algorithm> diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx index c7dc60003099..c513cc0c950d 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.cxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx @@ -19,18 +19,14 @@ #include "AreaChartTypeTemplate.hxx" #include "AreaChartType.hxx" -#include <servicenames_charttypes.hxx> #include <Diagram.hxx> #include <DiagramHelper.hxx> #include <DataSeries.hxx> #include <DataSeriesHelper.hxx> #include <PropertyHelper.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> -#include <com/sun/star/chart2/XChartType.hpp> -#include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <tools/diagnose_ex.h> #include <algorithm> diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx index 2eef1293665b..09b77f2879f7 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.cxx +++ b/chart2/source/model/template/BarChartTypeTemplate.cxx @@ -21,19 +21,13 @@ #include "ColumnChartType.hxx" #include <Diagram.hxx> #include <DiagramHelper.hxx> -#include <servicenames_charttypes.hxx> #include <DataSeries.hxx> #include <DataSeriesHelper.hxx> #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/chart2/XChartType.hpp> -#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> -#include <com/sun/star/chart2/XDataSeries.hpp> -#include <com/sun/star/chart2/XDiagram.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <tools/diagnose_ex.h> #include <algorithm> diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/chart2/source/model/template/BubbleChartTypeTemplate.cxx index 93bb598b0471..c2eff7efcf12 100644 --- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx +++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx @@ -20,14 +20,11 @@ #include "BubbleChartTypeTemplate.hxx" #include "BubbleChartType.hxx" #include "BubbleDataInterpreter.hxx" -#include <servicenames_charttypes.hxx> #include <DataSeries.hxx> #include <DataSeriesHelper.hxx> -#include <com/sun/star/chart2/XChartType.hpp> #include <com/sun/star/drawing/LineStyle.hpp> #include <PropertyHelper.hxx> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <tools/diagnose_ex.h> #include <algorithm> diff --git a/chart2/source/model/template/BubbleDataInterpreter.cxx b/chart2/source/model/template/BubbleDataInterpreter.cxx index 5ef65c550a38..3c3c33770ce5 100644 --- a/chart2/source/model/template/BubbleDataInterpreter.cxx +++ b/chart2/source/model/template/BubbleDataInterpreter.cxx @@ -21,8 +21,6 @@ #include <DataSeries.hxx> #include <DataSeriesHelper.hxx> #include <CommonConverters.hxx> -#include <LabeledDataSequence.hxx> -#include <com/sun/star/chart2/data/XDataSink.hpp> #include <com/sun/star/util/XCloneable.hpp> #include <tools/diagnose_ex.h> diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx index 5b639dbf31ab..b1abde3522f5 100644 --- a/chart2/source/model/template/ChartTypeManager.cxx +++ b/chart2/source/model/template/ChartTypeManager.cxx @@ -33,7 +33,6 @@ #include <com/sun/star/container/XContentEnumerationAccess.hpp> #include <com/sun/star/lang/XServiceName.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <tools/diagnose_ex.h> #include <sal/log.hxx> #include <algorithm> diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index ba8d28c781bb..0791ab59d8b2 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -32,19 +32,13 @@ #include <AxisIndexDefines.hxx> #include <BaseCoordinateSystem.hxx> #include <unonames.hxx> -#include <LabeledDataSequence.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/chart2/AxisType.hpp> #include <com/sun/star/chart2/StackingDirection.hpp> -#include <com/sun/star/chart2/XDataSeriesContainer.hpp> -#include <com/sun/star/chart2/XChartTypeContainer.hpp> -#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> #include <com/sun/star/chart2/XColorScheme.hpp> -#include <com/sun/star/chart2/XDiagram.hpp> #include <tools/diagnose_ex.h> #include <comphelper/property.hxx> -#include <comphelper/sequence.hxx> #include <algorithm> diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx index 90646552e50e..93476e5bc0ad 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx @@ -30,13 +30,8 @@ #include "ColumnLineDataInterpreter.hxx" #include <PropertyHelper.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> -#include <com/sun/star/chart2/XChartTypeContainer.hpp> -#include <com/sun/star/chart2/XDataSeriesContainer.hpp> -#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> -#include <com/sun/star/chart2/XDiagram.hpp> #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <tools/diagnose_ex.h> #include <algorithm> diff --git a/chart2/source/model/template/ColumnLineDataInterpreter.cxx b/chart2/source/model/template/ColumnLineDataInterpreter.cxx index 546c65307b36..15ce4adce6fc 100644 --- a/chart2/source/model/template/ColumnLineDataInterpreter.cxx +++ b/chart2/source/model/template/ColumnLineDataInterpreter.cxx @@ -18,7 +18,6 @@ */ #include "ColumnLineDataInterpreter.hxx" -#include <LabeledDataSequence.hxx> #include <DataSeries.hxx> #include <osl/diagnose.h> diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx index 2b3eb1537cce..36ead62dcf9e 100644 --- a/chart2/source/model/template/DataInterpreter.cxx +++ b/chart2/source/model/template/DataInterpreter.cxx @@ -20,16 +20,12 @@ #include <DataInterpreter.hxx> #include <DataSeries.hxx> #include <DataSource.hxx> -#include <DataSourceHelper.hxx> #include <DataSeriesHelper.hxx> #include <CommonConverters.hxx> -#include <LabeledDataSequence.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/chart2/data/XDataSink.hpp> #include <cppuhelper/supportsservice.hxx> #include <tools/diagnose_ex.h> -#include <vector> #include <algorithm> using namespace ::com::sun::star; diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx index 478692f15c12..baebe6233c3b 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.cxx +++ b/chart2/source/model/template/LineChartTypeTemplate.cxx @@ -21,7 +21,6 @@ #include "LineChartType.hxx" #include <Diagram.hxx> #include <DiagramHelper.hxx> -#include <servicenames_charttypes.hxx> #include <DataSeries.hxx> #include <DataSeriesHelper.hxx> #include <PropertyHelper.hxx> @@ -31,12 +30,9 @@ #include <com/sun/star/chart2/CurveStyle.hpp> #include <com/sun/star/chart2/SymbolStyle.hpp> #include <com/sun/star/chart2/Symbol.hpp> -#include <com/sun/star/chart2/XChartType.hpp> -#include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <tools/diagnose_ex.h> #include <algorithm> diff --git a/chart2/source/model/template/NetChartTypeTemplate.cxx b/chart2/source/model/template/NetChartTypeTemplate.cxx index 5ab51abbe0f2..5632ac648f07 100644 --- a/chart2/source/model/template/NetChartTypeTemplate.cxx +++ b/chart2/source/model/template/NetChartTypeTemplate.cxx @@ -22,15 +22,11 @@ #include "NetChartType.hxx" #include <Diagram.hxx> #include <DiagramHelper.hxx> -#include <servicenames_charttypes.hxx> #include <DataSeries.hxx> #include <DataSeriesHelper.hxx> #include <ChartType.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/chart2/SymbolStyle.hpp> #include <com/sun/star/chart2/Symbol.hpp> -#include <com/sun/star/chart2/XChartType.hpp> -#include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <tools/diagnose_ex.h> diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx index ce206fa2e2f8..019e315a49c7 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.cxx +++ b/chart2/source/model/template/PieChartTypeTemplate.cxx @@ -24,7 +24,6 @@ #include <ChartType.hxx> #include <Diagram.hxx> #include <DiagramHelper.hxx> -#include <servicenames_charttypes.hxx> #include <DataSeries.hxx> #include <DataSeriesHelper.hxx> #include <Axis.hxx> @@ -33,12 +32,7 @@ #include <PropertyHelper.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/drawing/LineStyle.hpp> -#include <com/sun/star/chart2/XChartTypeContainer.hpp> -#include <com/sun/star/chart2/XDataSeriesContainer.hpp> -#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> -#include <com/sun/star/chart2/XDiagram.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <officecfg/Office/Compatibility.hxx> #include <tools/diagnose_ex.h> diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx index bd02e69fb2e9..9525086ca427 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx @@ -23,7 +23,6 @@ #include <ChartType.hxx> #include <Diagram.hxx> #include <DiagramHelper.hxx> -#include <servicenames_charttypes.hxx> #include <DataSeries.hxx> #include <DataSeriesHelper.hxx> #include <PropertyHelper.hxx> @@ -32,11 +31,9 @@ #include <com/sun/star/chart2/CurveStyle.hpp> #include <com/sun/star/chart2/SymbolStyle.hpp> #include <com/sun/star/chart2/Symbol.hpp> -#include <com/sun/star/chart2/XChartType.hpp> #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <tools/diagnose_ex.h> #include <algorithm> diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx index eb03a9383535..fb514adfa75f 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.cxx +++ b/chart2/source/model/template/StockChartTypeTemplate.cxx @@ -28,17 +28,12 @@ #include <Diagram.hxx> #include <BaseCoordinateSystem.hxx> #include <servicenames_charttypes.hxx> -#include <com/sun/star/chart2/XChartTypeContainer.hpp> -#include <com/sun/star/chart2/XDataSeriesContainer.hpp> -#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <PropertyHelper.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/drawing/LineStyle.hpp> #include <tools/diagnose_ex.h> -#include <vector> #include <algorithm> using namespace ::com::sun::star; diff --git a/chart2/source/model/template/StockDataInterpreter.cxx b/chart2/source/model/template/StockDataInterpreter.cxx index 198ee934f4a3..f2d845a18d6d 100644 --- a/chart2/source/model/template/StockDataInterpreter.cxx +++ b/chart2/source/model/template/StockDataInterpreter.cxx @@ -20,8 +20,6 @@ #include "StockDataInterpreter.hxx" #include "StockChartTypeTemplate.hxx" #include <DataSeries.hxx> -#include <LabeledDataSequence.hxx> -#include <com/sun/star/chart2/data/XDataSink.hpp> #include <tools/diagnose_ex.h> using namespace ::com::sun::star; diff --git a/chart2/source/model/template/XYDataInterpreter.cxx b/chart2/source/model/template/XYDataInterpreter.cxx index 93d8a032d1af..a4ac12b112cc 100644 --- a/chart2/source/model/template/XYDataInterpreter.cxx +++ b/chart2/source/model/template/XYDataInterpreter.cxx @@ -21,8 +21,6 @@ #include <DataSeries.hxx> #include <DataSeriesHelper.hxx> #include <CommonConverters.hxx> -#include <LabeledDataSequence.hxx> -#include <com/sun/star/chart2/data/XDataSink.hpp> #include <com/sun/star/util/XCloneable.hpp> #include <tools/diagnose_ex.h> #include <sal/log.hxx> diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx index c6005022544f..95b50a9640f3 100644 --- a/chart2/source/tools/AxisHelper.cxx +++ b/chart2/source/tools/AxisHelper.cxx @@ -25,7 +25,6 @@ #include <Axis.hxx> #include <AxisIndexDefines.hxx> #include <DataSource.hxx> -#include <LabeledDataSequence.hxx> #include <LinePropertiesHelper.hxx> #include <servicenames_coosystems.hxx> #include <DataSeries.hxx> @@ -43,10 +42,6 @@ #include <com/sun/star/chart/ChartAxisPosition.hpp> #include <com/sun/star/chart2/AxisType.hpp> -#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> -#include <com/sun/star/chart2/XChartTypeContainer.hpp> -#include <com/sun/star/chart2/XDataSeriesContainer.hpp> -#include <com/sun/star/chart2/data/XDataSource.hpp> #include <sal/log.hxx> diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx index 0ca95f9ebdf2..440e9f736fb6 100644 --- a/chart2/source/tools/CachedDataSequence.cxx +++ b/chart2/source/tools/CachedDataSequence.cxx @@ -23,7 +23,6 @@ #include <comphelper/sequenceashashmap.hxx> #include <cppuhelper/supportsservice.hxx> -#include <tools/diagnose_ex.h> #include <algorithm> diff --git a/chart2/source/tools/ChartModelHelper.cxx b/chart2/source/tools/ChartModelHelper.cxx index e13ce8497b03..16e737b83480 100644 --- a/chart2/source/tools/ChartModelHelper.cxx +++ b/chart2/source/tools/ChartModelHelper.cxx @@ -32,11 +32,7 @@ #include <com/sun/star/chart/ChartDataRowSource.hpp> #include <com/sun/star/chart/XChartDocument.hpp> -#include <com/sun/star/chart2/data/XDataReceiver.hpp> -#include <com/sun/star/chart2/XChartDocument.hpp> -#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> #include <com/sun/star/embed/Aspects.hpp> -#include <com/sun/star/embed/XVisualObject.hpp> #include <com/sun/star/view/XSelectionChangeListener.hpp> #include <tools/diagnose_ex.h> diff --git a/chart2/source/tools/ChartTypeHelper.cxx b/chart2/source/tools/ChartTypeHelper.cxx index 289d7adf150d..7ea824d5601e 100644 --- a/chart2/source/tools/ChartTypeHelper.cxx +++ b/chart2/source/tools/ChartTypeHelper.cxx @@ -28,7 +28,6 @@ #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/XChartType.hpp> #include <com/sun/star/chart2/XDataSeries.hpp> #include <tools/diagnose_ex.h> diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx index 5ae4d3e0ab4f..bff4032f16d3 100644 --- a/chart2/source/tools/DataSeriesHelper.cxx +++ b/chart2/source/tools/DataSeriesHelper.cxx @@ -24,7 +24,6 @@ #include <unonames.hxx> #include <Diagram.hxx> #include <BaseCoordinateSystem.hxx> -#include <LabeledDataSequence.hxx> #include <Axis.hxx> #include <com/sun/star/beans/XPropertySet.hpp> @@ -38,9 +37,6 @@ #include <com/sun/star/chart2/XDiagram.hpp> #include <com/sun/star/drawing/LineStyle.hpp> -#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> -#include <com/sun/star/chart2/XChartTypeContainer.hpp> -#include <com/sun/star/chart2/XDataSeriesContainer.hpp> #include <comphelper/sequence.hxx> #include <rtl/ustrbuf.hxx> #include <tools/diagnose_ex.h> diff --git a/chart2/source/tools/DataSource.cxx b/chart2/source/tools/DataSource.cxx index 2770a76211d5..c74687c1485a 100644 --- a/chart2/source/tools/DataSource.cxx +++ b/chart2/source/tools/DataSource.cxx @@ -20,7 +20,6 @@ #include <DataSource.hxx> #include <cppuhelper/supportsservice.hxx> #include <comphelper/sequence.hxx> -#include <LabeledDataSequence.hxx> namespace com::sun::star::uno { class XComponentContext; } diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx index bcbfbcbda756..8e8dd2f3a770 100644 --- a/chart2/source/tools/DataSourceHelper.cxx +++ b/chart2/source/tools/DataSourceHelper.cxx @@ -31,8 +31,6 @@ #include <LabeledDataSequence.hxx> #include <unonames.hxx> -#include <com/sun/star/chart2/XChartDocument.hpp> -#include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/chart2/data/XDataSource.hpp> #include <com/sun/star/chart2/data/XLabeledDataSequence.hpp> diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx index 51bcd4cf9f0c..4526550a9e99 100644 --- a/chart2/source/tools/DiagramHelper.cxx +++ b/chart2/source/tools/DiagramHelper.cxx @@ -30,7 +30,6 @@ #include <ChartModel.hxx> #include <ChartModelHelper.hxx> #include <ExplicitCategoriesProvider.hxx> -#include <LabeledDataSequence.hxx> #include <servicenames_charttypes.hxx> #include <RelativePositionHelper.hxx> #include <ControllerLockGuard.hxx> @@ -41,10 +40,6 @@ #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/XTitled.hpp> -#include <com/sun/star/chart2/XChartTypeContainer.hpp> -#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> -#include <com/sun/star/chart2/XDataSeriesContainer.hpp> #include <com/sun/star/chart2/AxisType.hpp> #include <com/sun/star/chart2/DataPointGeometry3D.hpp> #include <com/sun/star/chart2/RelativePosition.hpp> diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx index c89c91544e23..2a4eee8a70d7 100644 --- a/chart2/source/tools/ExplicitCategoriesProvider.cxx +++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx @@ -30,10 +30,8 @@ #include <unonames.hxx> #include <BaseCoordinateSystem.hxx> #include <DataSeries.hxx> -#include <LabeledDataSequence.hxx> #include <com/sun/star/chart2/AxisType.hpp> -#include <com/sun/star/chart2/XDataSeries.hpp> #include <o3tl/safeint.hxx> #include <rtl/ustrbuf.hxx> #include <tools/diagnose_ex.h> diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index d8dd648c839f..010e3c202924 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -35,7 +35,6 @@ #include <DataSeries.hxx> #include <com/sun/star/chart2/data/XDataSequence.hpp> -#include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/chart/ChartDataRowSource.hpp> #include <cppuhelper/supportsservice.hxx> #include <comphelper/sequenceashashmap.hxx> diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx index c0dafceb79fc..9557f05aef3e 100644 --- a/chart2/source/tools/LabeledDataSequence.cxx +++ b/chart2/source/tools/LabeledDataSequence.cxx @@ -20,7 +20,6 @@ #include <LabeledDataSequence.hxx> #include <ModifyListenerHelper.hxx> #include <cppuhelper/supportsservice.hxx> -#include <tools/diagnose_ex.h> namespace com::sun::star::uno { class XComponentContext; } diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx index 0213e97d9720..507e79fa32e2 100644 --- a/chart2/source/tools/ModifyListenerHelper.cxx +++ b/chart2/source/tools/ModifyListenerHelper.cxx @@ -18,9 +18,6 @@ */ #include <ModifyListenerHelper.hxx> -#include <WeakListenerAdapter.hxx> - -#include <tools/diagnose_ex.h> using namespace ::com::sun::star; diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx index a117873b6e38..a4bf8bf43650 100644 --- a/chart2/source/tools/ObjectIdentifier.cxx +++ b/chart2/source/tools/ObjectIdentifier.cxx @@ -36,19 +36,13 @@ #include <DataSeries.hxx> #include <RegressionCurveModel.hxx> -#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> -#include <com/sun/star/chart2/XChartDocument.hpp> -#include <com/sun/star/chart2/XChartTypeContainer.hpp> -#include <com/sun/star/chart2/XDataSeriesContainer.hpp> #include <com/sun/star/chart2/XAxis.hpp> -#include <com/sun/star/chart2/XRegressionCurveContainer.hpp> #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/drawing/XShape.hpp> #include <rtl/ustrbuf.hxx> #include <tools/diagnose_ex.h> #include <o3tl/string_view.hxx> -#include <comphelper/string.hxx> namespace com::sun::star::drawing { class XShape; } diff --git a/chart2/source/tools/PropertyHelper.cxx b/chart2/source/tools/PropertyHelper.cxx index ae52b5b33127..4cff29e40d17 100644 --- a/chart2/source/tools/PropertyHelper.cxx +++ b/chart2/source/tools/PropertyHelper.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/sequence.hxx> -#include <comphelper/string.hxx> #include <osl/diagnose.h> #include <tools/diagnose_ex.h> #include <o3tl/string_view.hxx> diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx index f2b2837b263f..d59400050044 100644 --- a/chart2/source/tools/RangeHighlighter.cxx +++ b/chart2/source/tools/RangeHighlighter.cxx @@ -26,13 +26,11 @@ #include <DataSeries.hxx> #include <DataSeriesHelper.hxx> #include <Diagram.hxx> -#include <LabeledDataSequence.hxx> #include <com/sun/star/chart2/ScaleData.hpp> #include <com/sun/star/chart2/XAxis.hpp> #include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/chart/ErrorBarStyle.hpp> -#include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <comphelper/sequence.hxx> diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx index 0b99582dde70..6c690af40e0e 100644 --- a/chart2/source/tools/ReferenceSizeProvider.cxx +++ b/chart2/source/tools/ReferenceSizeProvider.cxx @@ -26,10 +26,7 @@ #include <Diagram.hxx> #include <Axis.hxx> #include <AxisHelper.hxx> -#include <com/sun/star/chart2/XChartDocument.hpp> -#include <com/sun/star/chart2/XTitled.hpp> #include <com/sun/star/chart2/XTitle.hpp> -#include <com/sun/star/chart2/XDataSeries.hpp> #include <tools/diagnose_ex.h> #include <vector> diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx index 8ea03805865c..890913e34378 100644 --- a/chart2/source/tools/RegressionCurveModel.cxx +++ b/chart2/source/tools/RegressionCurveModel.cxx @@ -26,7 +26,6 @@ #include <ModifyListenerHelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> -#include <tools/diagnose_ex.h> namespace com::sun::star::uno { class XComponentContext; } diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx index 637a1d7c6774..d421b09d5145 100644 --- a/chart2/source/tools/RegressionEquation.cxx +++ b/chart2/source/tools/RegressionEquation.cxx @@ -33,7 +33,6 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/chart2/RelativePosition.hpp> #include <com/sun/star/awt/Size.hpp> -#include <tools/diagnose_ex.h> #include <algorithm> diff --git a/chart2/source/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx index 1d056e7fe223..78c8b8dda6ab 100644 --- a/chart2/source/tools/StatisticsHelper.cxx +++ b/chart2/source/tools/StatisticsHelper.cxx @@ -21,7 +21,6 @@ #include <DataSeriesHelper.hxx> #include <ErrorBar.hxx> #include <unonames.hxx> -#include <LabeledDataSequence.hxx> #include <rtl/ustrbuf.hxx> #include <comphelper/processfactory.hxx> diff --git a/chart2/source/tools/ThreeDHelper.cxx b/chart2/source/tools/ThreeDHelper.cxx index 3970021b1c54..06ce49b2e6cb 100644 --- a/chart2/source/tools/ThreeDHelper.cxx +++ b/chart2/source/tools/ThreeDHelper.cxx @@ -28,9 +28,6 @@ #include <defines.hxx> #include <editeng/unoprnms.hxx> -#include <com/sun/star/beans/XPropertyState.hpp> -#include <com/sun/star/chart2/XDiagram.hpp> -#include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/drawing/ShadeMode.hpp> #include <tools/diagnose_ex.h> diff --git a/chart2/source/tools/TitleHelper.cxx b/chart2/source/tools/TitleHelper.cxx index 68cc9a290e43..ec2afa7c4327 100644 --- a/chart2/source/tools/TitleHelper.cxx +++ b/chart2/source/tools/TitleHelper.cxx @@ -26,7 +26,6 @@ #include <Diagram.hxx> #include <ReferenceSizeProvider.hxx> #include <com/sun/star/chart2/FormattedString.hpp> -#include <com/sun/star/chart2/XChartDocument.hpp> #include <rtl/ustrbuf.hxx> #include <tools/diagnose_ex.h> #include <sal/log.hxx> diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx index e8a6075d643e..097e05aa4df9 100644 --- a/chart2/source/tools/UncachedDataSequence.cxx +++ b/chart2/source/tools/UncachedDataSequence.cxx @@ -27,7 +27,6 @@ #include <strings.hrc> #include <ResId.hxx> #include <com/sun/star/chart2/XInternalDataProvider.hpp> -#include <tools/diagnose_ex.h> using namespace ::com::sun::star; diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx index 3737237da2d4..c176bd4590e7 100644 --- a/chart2/source/view/axes/VAxisBase.cxx +++ b/chart2/source/view/axes/VAxisBase.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/chart2/AxisType.hpp> #include <com/sun/star/chart2/XAxis.hpp> #include <com/sun/star/chart2/data/XTextualDataSequence.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <osl/diagnose.h> diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx index 729fb32c8171..7819a916e039 100644 --- a/chart2/source/view/axes/VCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCoordinateSystem.cxx @@ -35,7 +35,6 @@ #include <chartview/ExplicitValueProvider.hxx> #include <com/sun/star/chart/TimeUnit.hpp> #include <com/sun/star/chart2/AxisType.hpp> -#include <com/sun/star/chart2/XCoordinateSystem.hpp> #include <comphelper/sequence.hxx> #include <rtl/math.hxx> #include <tools/diagnose_ex.h> diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx b/chart2/source/view/axes/VPolarAngleAxis.cxx index 224f704eb403..13f66cec9cbf 100644 --- a/chart2/source/view/axes/VPolarAngleAxis.cxx +++ b/chart2/source/view/axes/VPolarAngleAxis.cxx @@ -26,7 +26,6 @@ #include <NumberFormatterWrapper.hxx> #include <PolarLabelPositionHelper.hxx> #include <PlottingPositionHelper.hxx> -#include <com/sun/star/chart2/XAxis.hpp> #include <tools/color.hxx> #include <memory> diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx index dc5ee63b001d..de1dc30af2f5 100644 --- a/chart2/source/view/charttypes/AreaChart.cxx +++ b/chart2/source/view/charttypes/AreaChart.cxx @@ -40,7 +40,6 @@ #include <sal/log.hxx> #include <osl/diagnose.h> -#include <com/sun/star/drawing/DoubleSequence.hpp> #include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <officecfg/Office/Compatibility.hxx> diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx index 5931487ecc88..b15706d76845 100644 --- a/chart2/source/view/charttypes/BarChart.cxx +++ b/chart2/source/view/charttypes/BarChart.cxx @@ -35,9 +35,7 @@ #include <com/sun/star/chart2/DataPointGeometry3D.hpp> #include <rtl/math.hxx> -#include <sal/log.hxx> #include <tools/diagnose_ex.h> -#include <unordered_set> namespace chart { diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index cde47b9912fc..806bc468414c 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -28,13 +28,9 @@ #include <ChartType.hxx> #include <com/sun/star/chart/DataLabelPlacement.hpp> -#include <com/sun/star/chart2/XChartType.hpp> #include <com/sun/star/chart2/XColorScheme.hpp> -#include <com/sun/star/container/XChild.hpp> -#include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/drawing/XShapes.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <sal/log.hxx> #include <osl/diagnose.h> #include <tools/diagnose_ex.h> diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 8e5e9d5bf9af..26e462e82c32 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -64,8 +64,6 @@ #include <com/sun/star/chart/TimeUnit.hpp> #include <com/sun/star/chart2/MovingAverageType.hpp> #include <com/sun/star/chart2/XDataPointCustomLabelField.hpp> -#include <com/sun/star/chart2/XDataSeries.hpp> -#include <com/sun/star/chart2/XRegressionCurveContainer.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/chart2/RelativePosition.hpp> #include <tools/color.hxx> @@ -75,7 +73,6 @@ #include <basegfx/vector/b2dvector.hxx> #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/util/XCloneable.hpp> -#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> #include <unotools/localedatawrapper.hxx> #include <comphelper/sequence.hxx> diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx index e5db4c77f3d0..2ce114676b36 100644 --- a/chart2/source/view/diagram/VDiagram.cxx +++ b/chart2/source/view/diagram/VDiagram.cxx @@ -34,7 +34,6 @@ #include <svx/scene3d.hxx> #include <svx/e3dsceneupdater.hxx> #include <tools/diagnose_ex.h> -#include <com/sun/star/chart2/XDiagram.hpp> namespace chart { diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx index 089c4a1ae887..f445d06092ee 100644 --- a/chart2/source/view/inc/VDataSeries.hxx +++ b/chart2/source/view/inc/VDataSeries.hxx @@ -21,7 +21,6 @@ #include "PropertyMapper.hxx" #include <com/sun/star/chart2/StackingDirection.hpp> -#include <com/sun/star/drawing/PolyPolygonShape3D.hpp> #include <com/sun/star/drawing/Position3D.hpp> #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/awt/Point.hpp> diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 9b149872fbc7..56d53a78aa25 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -81,9 +81,6 @@ #include <com/sun/star/chart/TimeUnit.hpp> #include <com/sun/star/chart2/AxisType.hpp> #include <com/sun/star/chart2/StackingDirection.hpp> -#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> -#include <com/sun/star/chart2/XChartTypeContainer.hpp> -#include <com/sun/star/chart2/XDataSeriesContainer.hpp> #include <com/sun/star/chart2/RelativePosition.hpp> #include <com/sun/star/chart2/RelativeSize.hpp> #include <com/sun/star/chart2/data/XPivotTableDataProvider.hpp> diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index 81b3758293fa..311273034e10 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -28,12 +28,10 @@ #include <ChartTypeHelper.hxx> #include <RegressionCurveHelper.hxx> #include <unonames.hxx> -#include <LabeledDataSequence.hxx> #include <com/sun/star/chart/MissingValueTreatment.hpp> #include <com/sun/star/chart2/DataPointLabel.hpp> #include <com/sun/star/chart2/Symbol.hpp> -#include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/chart2/XRegressionCurveCalculator.hpp> #include <com/sun/star/chart2/RelativePosition.hpp> @@ -42,7 +40,6 @@ #include <tools/diagnose_ex.h> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> -#include <com/sun/star/chart2/data/XDataSource.hpp> namespace chart { diff --git a/chart2/source/view/main/VLegend.hxx b/chart2/source/view/main/VLegend.hxx index c6080c52d4a0..f47b21d26b1e 100644 --- a/chart2/source/view/main/VLegend.hxx +++ b/chart2/source/view/main/VLegend.hxx @@ -18,6 +18,8 @@ */ #pragma once +#include <Legend.hxx> + #include <com/sun/star/uno/Reference.hxx> #include <rtl/ref.hxx> #include <svx/unoshape.hxx> diff --git a/chart2/source/view/main/VPolarTransformation.cxx b/chart2/source/view/main/VPolarTransformation.cxx index 9d747d66c956..9ec2eea3fc58 100644 --- a/chart2/source/view/main/VPolarTransformation.cxx +++ b/chart2/source/view/main/VPolarTransformation.cxx @@ -18,7 +18,6 @@ */ #include <VPolarTransformation.hxx> -#include <CommonConverters.hxx> using namespace ::com::sun::star; |