diff options
author | Gabor Kelemen <kelemeng@ubuntu.com> | 2018-09-24 07:29:16 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-09-26 17:59:57 +0200 |
commit | 3bb54d3a046feabaa35df39b7a753c385c3c4101 (patch) | |
tree | ae114ec55330b6c2ab235059b43038433becd08f | |
parent | d321b7dd08e2e9138efe925b86a502a6740e89ef (diff) |
tdf#42949 Fix IWYU warnings in chart2/source/controller/chartapiwrapper/*hxx
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I07bdc60ecc2d8ff9ad9c109f32b350eb09ac72e5
Reviewed-on: https://gerrit.libreoffice.org/60921
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
47 files changed, 221 insertions, 76 deletions
diff --git a/chart2/IwyuFilter_chart2.yaml b/chart2/IwyuFilter_chart2.yaml index f95575b0282c..d44df956305d 100644 --- a/chart2/IwyuFilter_chart2.yaml +++ b/chart2/IwyuFilter_chart2.yaml @@ -440,3 +440,109 @@ blacklist: chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx: # base class has to be a complete type - com/sun/star/view/XSelectionChangeListener.hpp + chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx: + # base class has to be a complete type + - com/sun/star/chart2/XAnyDescriptionAccess.hpp + - com/sun/star/chart/XDateCategories.hpp + - com/sun/star/lang/XComponent.hpp + - com/sun/star/lang/XServiceInfo.hpp + - com/sun/star/uno/XComponent.hpp + chart2/source/controller/chartapiwrapper/AxisWrapper.hxx: + # base class has to be a complete type + - com/sun/star/chart/XAxis.hpp + - com/sun/star/drawing/XShape.hpp + - com/sun/star/lang/XComponent.hpp + - com/sun/star/lang/XServiceInfo.hpp + - com/sun/star/util/XNumberFormatsSupplier.hpp + - WrappedPropertySet.hxx + chart2/source/controller/chartapiwrapper/AreaWrapper.hxx: + # base class has to be a complete type + - com/sun/star/drawing/XShape.hpp + - com/sun/star/lang/XComponent.hpp + - com/sun/star/lang/XServiceInfo.hpp + - WrappedPropertySet.hxx + chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx: + # base class has to be a complete type + - com/sun/star/lang/XComponent.hpp + - com/sun/star/lang/XEventListener.hpp + - com/sun/star/lang/XInitialization.hpp + - com/sun/star/lang/XServiceInfo.hpp + - WrappedPropertySet.hxx + chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx: + # base class has to be a complete type + - com/sun/star/chart2/XDiagramProvider.hpp + - com/sun/star/chart/X3DDefaultSetter.hpp + - com/sun/star/chart/X3DDisplay.hpp + - com/sun/star/chart/XAxisSupplier.hpp + - com/sun/star/chart/XAxisZSupplier.hpp + - com/sun/star/chart/XDiagram.hpp + - com/sun/star/chart/XDiagramPositioning.hpp + - com/sun/star/chart/XSecondAxisTitleSupplier.hpp + - com/sun/star/chart/XStatisticDisplay.hpp + - com/sun/star/chart/XTwoAxisXSupplier.hpp + - com/sun/star/chart/XTwoAxisYSupplier.hpp + - com/sun/star/lang/XComponent.hpp + - com/sun/star/lang/XServiceInfo.hpp + - WrappedPropertySet.hxx + chart2/source/controller/chartapiwrapper/GridWrapper.hxx: + # base class has to be a complete type + - WrappedPropertySet.hxx + - com/sun/star/lang/XComponent.hpp + - com/sun/star/lang/XServiceInfo.hpp + chart2/source/controller/chartapiwrapper/LegendWrapper.hxx: + # base class has to be a complete type + - com/sun/star/drawing/XShape.hpp + - com/sun/star/lang/XComponent.hpp + - com/sun/star/lang/XServiceInfo.hpp + - WrappedPropertySet.hxx + chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx: + # base class has to be a complete type + - com/sun/star/beans/XMultiPropertySet.hpp + - com/sun/star/beans/XMultiPropertyStates.hpp + - com/sun/star/beans/XPropertySet.hpp + - com/sun/star/beans/XPropertyState.hpp + - com/sun/star/lang/XComponent.hpp + - com/sun/star/lang/XServiceInfo.hpp + chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx: + # base class has to be a complete type + - com/sun/star/beans/XMultiPropertySet.hpp + - com/sun/star/beans/XMultiPropertyStates.hpp + - com/sun/star/beans/XPropertySet.hpp + - com/sun/star/beans/XPropertyState.hpp + - com/sun/star/lang/XComponent.hpp + - com/sun/star/lang/XServiceInfo.hpp + chart2/source/controller/chartapiwrapper/TitleWrapper.hxx: + # base class has to be a complete type + - WrappedPropertySet.hxx + - com/sun/star/drawing/XShape.hpp + - com/sun/star/lang/XComponent.hpp + - com/sun/star/lang/XServiceInfo.hpp + chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx: + # base class has to be a complete type + - WrappedPropertySet.hxx + - com/sun/star/lang/XComponent.hpp + - com/sun/star/lang/XServiceInfo.hpp + chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx: + # Needed for css namespace shortcut + - sal/types.h + chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx: + # Needed for css namespace shortcut + - sal/types.h + chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx: + # Needed for css namespace shortcut + - sal/types.h + chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx: + # Needed for css namespace shortcut + - sal/types.h + chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx: + # Needed for css namespace shortcut + - sal/types.h + chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx: + # Needed for css namespace shortcut + - sal/types.h + chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx: + # Needed for css namespace shortcut + - sal/types.h + chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx: + # Needed for css namespace shortcut + - sal/types.h diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx index 66fed1b1b8be..f6a94e2769e3 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx @@ -21,6 +21,7 @@ #include "Chart2ModelContact.hxx" #include <WrappedDirectStateProperty.hxx> #include <com/sun/star/drawing/FillStyle.hpp> +#include <com/sun/star/chart2/XChartDocument.hpp> #include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx index 897450351b0e..a0ea50f677e6 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx @@ -25,8 +25,6 @@ #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/chart2/XChartDocument.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <memory> diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx index 6260249c9140..859b9c9a0720 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx @@ -24,15 +24,15 @@ #include <cppuhelper/implbase.hxx> #include <comphelper/interfacecontainer2.hxx> #include <com/sun/star/chart/XAxis.hpp> -#include <com/sun/star/chart2/XAxis.hpp> #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <memory> +namespace com { namespace sun { namespace star { namespace chart2 { class XAxis; } } } } + namespace chart { namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx index 3b5767e6de18..8dd51ad29f00 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx +++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx @@ -19,22 +19,27 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_CHART2MODELCONTACT_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_CHART2MODELCONTACT_HXX -#include <chartview/ExplicitScaleValues.hxx> -#include <com/sun/star/chart2/XAxis.hpp> -#include <com/sun/star/chart2/XChartDocument.hpp> -#include <com/sun/star/chart2/XDataSeries.hpp> -#include <com/sun/star/chart2/XDiagram.hpp> -#include <com/sun/star/chart2/XTitle.hpp> #include <cppuhelper/weakref.hxx> #include <com/sun/star/awt/Size.hpp> -#include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/drawing/XDrawPage.hpp> -#include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/lang/XUnoTunnel.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> +#include <com/sun/star/awt/Point.hpp> +#include <com/sun/star/awt/Rectangle.hpp> #include <map> +namespace chart { struct ExplicitIncrementData; } +namespace chart { struct ExplicitScaleData; } +namespace com { namespace sun { namespace star { namespace chart2 { class XAxis; } } } } +namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } } +namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } } +namespace com { namespace sun { namespace star { namespace chart2 { class XDiagram; } } } } +namespace com { namespace sun { namespace star { namespace chart2 { class XTitle; } } } } +namespace com { namespace sun { namespace star { namespace container { class XNameContainer; } } } } +namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } } +namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace com { namespace sun { namespace star { namespace lang { class XUnoTunnel; } } } } +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } + + namespace chart { class ExplicitValueProvider; diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx index c4b4c74cbe66..b5b4bf783554 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/chart2/data/XNumericalDataSequence.hpp> #include <com/sun/star/chart2/data/XTextualDataSequence.hpp> #include <com/sun/star/chart2/data/XDataSource.hpp> +#include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/chart2/XDataSeriesContainer.hpp> #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx index 8d613361be46..55bb8c63b3e8 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx @@ -26,8 +26,7 @@ #include <com/sun/star/chart/XDateCategories.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/chart2/XChartDocument.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> +#include <com/sun/star/lang/EventObject.hpp> #include <memory> diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx index 38a981791483..f6ee8695ddae 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx @@ -23,15 +23,15 @@ #include "ReferenceSizePropertyProvider.hxx" #include <cppuhelper/implbase.hxx> #include <comphelper/interfacecontainer2.hxx> -#include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <memory> +namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } } + namespace chart { diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index 6a2f056e785c..2a05b9303f5f 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -53,6 +53,7 @@ #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/chart/ChartSolidType.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx index c4d733085a21..45be31f52714 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx @@ -20,17 +20,10 @@ #define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_DIAGRAMWRAPPER_HXX #include <WrappedPropertySet.hxx> -#include <DiagramHelper.hxx> #include <comphelper/interfacecontainer2.hxx> -#include <cppuhelper/interfacecontainer.hxx> -#include <com/sun/star/chart2/XChartDocument.hpp> -#include <com/sun/star/chart2/XDiagram.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/chart/XDiagramPositioning.hpp> #include <com/sun/star/chart2/XDiagramProvider.hpp> -#include <com/sun/star/chart2/XChartTypeTemplate.hpp> -#include <com/sun/star/chart2/XChartTypeManager.hpp> #include <com/sun/star/chart/XDiagram.hpp> #include <com/sun/star/chart/XAxisSupplier.hpp> #include <com/sun/star/chart/XAxisZSupplier.hpp> @@ -40,12 +33,14 @@ #include <com/sun/star/chart/X3DDisplay.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/chart/XSecondAxisTitleSupplier.hpp> #include <com/sun/star/chart/X3DDefaultSetter.hpp> #include <memory> +namespace com { namespace sun { namespace star { namespace chart2 { class XDiagram; } } } } +namespace com { namespace sun { namespace star { namespace lang { class XEventListener; } } } } + namespace chart { namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx index be84adc2eaec..275d28279d0f 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx @@ -22,11 +22,8 @@ #include <WrappedPropertySet.hxx> #include <cppuhelper/implbase.hxx> #include <comphelper/interfacecontainer2.hxx> -#include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/chart2/XDiagram.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <memory> diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx index 7eca9ea364fc..78a149a0ded2 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx @@ -28,6 +28,7 @@ #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 <com/sun/star/drawing/FillStyle.hpp> #include <CharacterProperties.hxx> diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx index 0e7082156766..b614b55cae5a 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx @@ -26,9 +26,6 @@ #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/chart2/XChartDocument.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/chart2/XLegend.hpp> #include <memory> diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx index 42f140e4beb4..d7497ecec331 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx @@ -21,6 +21,7 @@ #include "Chart2ModelContact.hxx" #include <DiagramHelper.hxx> #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> diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx index f66dda7d0ba5..72966ee04a8f 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx @@ -23,16 +23,13 @@ #include <WrappedIgnoreProperty.hxx> #include <comphelper/interfacecontainer2.hxx> -#include <com/sun/star/chart2/XDiagram.hpp> - -#include <cppuhelper/propshlp.hxx> #include <cppuhelper/implbase.hxx> #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/beans/XMultiPropertyStates.hpp> #include <com/sun/star/beans/XPropertyState.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <memory> diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index cd1ccd00ce51..e14d528c6163 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -18,12 +18,15 @@ */ #include "TitleWrapper.hxx" +#include "Chart2ModelContact.hxx" #include <ControllerLockGuard.hxx> #include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> #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/frame/XModel.hpp> #include <CharacterProperties.hxx> #include <LinePropertiesHelper.hxx> diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx index e85ba63674ca..577b885f0336 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx @@ -21,19 +21,18 @@ #include <WrappedPropertySet.hxx> #include "ReferenceSizePropertyProvider.hxx" -#include "Chart2ModelContact.hxx" #include <TitleHelper.hxx> #include <cppuhelper/implbase.hxx> -#include <cppuhelper/interfacecontainer.hxx> #include <comphelper/interfacecontainer2.hxx> #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/chart2/XTitle.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <memory> +namespace chart { namespace wrapper { class Chart2ModelContact; } } +namespace com { namespace sun { namespace star { namespace chart2 { class XTitle; } } } } + namespace chart { namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx index e59dc5b14b02..fdd1368ae57d 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx @@ -22,6 +22,7 @@ #include <DiagramHelper.hxx> #include <servicenames_charttypes.hxx> #include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/propshlp.hxx> #include <com/sun/star/chart2/XChartType.hpp> #include <com/sun/star/chart2/XDataSeriesContainer.hpp> #include <comphelper/sequence.hxx> diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx index 3209364a2dbd..a1b455bcc888 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx @@ -22,16 +22,13 @@ #include <MutexContainer.hxx> #include <comphelper/interfacecontainer2.hxx> -#include <com/sun/star/chart2/XDiagram.hpp> - -#include <cppuhelper/propshlp.hxx> #include <cppuhelper/implbase.hxx> #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/beans/XMultiPropertyStates.hpp> #include <com/sun/star/beans/XPropertyState.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <memory> diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx index 513a37ff2f56..e6938d7bcf68 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx @@ -23,6 +23,8 @@ #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/drawing/FillStyle.hpp> +#include <com/sun/star/chart2/XDataSeries.hpp> +#include <com/sun/star/chart2/XDiagram.hpp> #include <FillProperties.hxx> #include <LinePropertiesHelper.hxx> diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx index 5352d353eb46..2a79c211ea42 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx @@ -24,7 +24,6 @@ #include <comphelper/interfacecontainer2.hxx> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <memory> diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx index 5b5eef470939..b05c41cb2ab3 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx @@ -18,6 +18,7 @@ */ #include "WrappedAddInProperty.hxx" +#include <ChartDocumentWrapper.hxx> using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx index 4239a143c7e3..f8f8ae937114 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx @@ -20,7 +20,8 @@ #define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDADDINPROPERTY_HXX #include <WrappedProperty.hxx> -#include <ChartDocumentWrapper.hxx> + +namespace chart { namespace wrapper { class ChartDocumentWrapper; } } namespace chart { diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx index 5b2fcd4330a5..2280eacada4a 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx @@ -18,7 +18,9 @@ */ #include "WrappedAutomaticPositionProperties.hxx" +#include "Chart2ModelContact.hxx" #include <FastPropertyIdRanges.hxx> +#include <WrappedProperty.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx index 1a0010ee17b1..25dbe7b14b84 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx @@ -20,10 +20,13 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDAUTOMATICPOSITIONPROPERTIES_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDAUTOMATICPOSITIONPROPERTIES_HXX -#include <WrappedProperty.hxx> -#include <com/sun/star/beans/Property.hpp> +#include <sal/types.h> +#include <memory> #include <vector> +namespace chart { class WrappedProperty; } +namespace com { namespace sun { namespace star { namespace beans { struct Property; } } } } + namespace chart { namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx index a3654434f66d..829bba7fb119 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx @@ -18,8 +18,11 @@ */ #include "WrappedAxisAndGridExistenceProperties.hxx" +#include <com/sun/star/beans/XPropertySet.hpp> #include <AxisHelper.hxx> #include <ChartModelHelper.hxx> +#include <WrappedProperty.hxx> +#include "Chart2ModelContact.hxx" #include <TitleHelper.hxx> #include <osl/diagnose.h> diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx index 3d8c715963cc..2248bf5c861b 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx @@ -20,12 +20,12 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDAXISANDGRIDEXISTENCEPROPERTIES_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDAXISANDGRIDEXISTENCEPROPERTIES_HXX -#include <WrappedProperty.hxx> -#include "Chart2ModelContact.hxx" - #include <memory> #include <vector> +namespace chart { class WrappedProperty; } +namespace chart { namespace wrapper { class Chart2ModelContact; } } + namespace chart { namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx index c9d637179ba0..6468d64acec8 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/chart2/DataPointLabel.hpp> #include <com/sun/star/chart/ChartDataCaption.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx index e92959aef66a..42b24bf6f544 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx @@ -19,12 +19,14 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDDATACAPTIONPROPERTIES_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDDATACAPTIONPROPERTIES_HXX -#include <WrappedProperty.hxx> -#include "Chart2ModelContact.hxx" - +#include <sal/types.h> #include <memory> #include <vector> +namespace chart { class WrappedProperty; } +namespace chart { namespace wrapper { class Chart2ModelContact; } } +namespace com { namespace sun { namespace star { namespace beans { struct Property; } } } } + namespace chart { namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx index 43c9951e4ccf..faffb951077d 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx @@ -18,6 +18,7 @@ */ #include "WrappedGapwidthProperty.hxx" +#include "Chart2ModelContact.hxx" #include <DiagramHelper.hxx> using namespace ::com::sun::star; diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx index aa5c92f5f8f3..18ada6723146 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx @@ -20,10 +20,11 @@ #define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDGAPWIDTHPROPERTY_HXX #include <WrappedDefaultProperty.hxx> -#include "Chart2ModelContact.hxx" #include <memory> +namespace chart { namespace wrapper { class Chart2ModelContact; } } + namespace chart { namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx index 2a079001caeb..437c97f07b43 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx @@ -18,6 +18,9 @@ */ #include "WrappedNumberFormatProperty.hxx" +#include "Chart2ModelContact.hxx" +#include <com/sun/star/chart2/XAxis.hpp> +#include <com/sun/star/chart2/XDataSeries.hpp> #include <unonames.hxx> #include <osl/diagnose.h> diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx index e36d9daec1a2..0e3efa3940db 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx @@ -20,16 +20,17 @@ #define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDNUMBERFORMATPROPERTY_HXX #include <WrappedDirectStateProperty.hxx> -#include "Chart2ModelContact.hxx" #include <memory> +namespace chart { namespace wrapper { class Chart2ModelContact; } } + namespace chart { namespace wrapper { -class WrappedLinkNumberFormatProperty; +//class WrappedLinkNumberFormatProperty; class WrappedNumberFormatProperty : public WrappedDirectStateProperty { diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx index a15b3ba183a0..7604af7234d6 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx @@ -18,6 +18,7 @@ */ #include "WrappedScaleProperty.hxx" +#include "Chart2ModelContact.hxx" #include <CommonConverters.hxx> #include <AxisHelper.hxx> #include <com/sun/star/chart2/AxisType.hpp> diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx index 95de67dfcc51..e2602bbf5bb6 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx @@ -20,11 +20,12 @@ #define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDSCALEPROPERTY_HXX #include <WrappedProperty.hxx> -#include "Chart2ModelContact.hxx" #include <memory> #include <vector> +namespace chart { namespace wrapper { class Chart2ModelContact; } } + namespace chart { namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx index 90cd4d122b69..003c3b877514 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx @@ -18,10 +18,13 @@ */ #include "WrappedScaleTextProperties.hxx" +#include "Chart2ModelContact.hxx" #include <FastPropertyIdRanges.hxx> +#include <WrappedProperty.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/XPropertyState.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> #include <tools/diagnose_ex.h> using namespace ::com::sun::star; diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx index c10df5a0d2cc..5e25c532cb67 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx @@ -20,12 +20,14 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDSCALETEXTPROPERTIES_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDSCALETEXTPROPERTIES_HXX -#include <WrappedProperty.hxx> -#include "Chart2ModelContact.hxx" - +#include <sal/types.h> #include <memory> #include <vector> +namespace chart { class WrappedProperty; } +namespace chart { namespace wrapper { class Chart2ModelContact; } } +namespace com { namespace sun { namespace star { namespace beans { struct Property; } } } } + namespace chart { namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx index b475a1004378..772167514b2f 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx @@ -18,6 +18,7 @@ */ #include "WrappedSceneProperty.hxx" +#include "Chart2ModelContact.hxx" #include <DiagramHelper.hxx> #include <servicenames_charttypes.hxx> #include <BaseGFXHelper.hxx> diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx index d1dfc2a98ffd..0c410c0d3c39 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx @@ -20,11 +20,12 @@ #define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDSCENEPROPERTY_HXX #include <WrappedProperty.hxx> -#include "Chart2ModelContact.hxx" #include <memory> #include <vector> +namespace chart { namespace wrapper { class Chart2ModelContact; } } + namespace chart { namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx index d3eefe7e4adb..a57525acca71 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx @@ -22,11 +22,12 @@ #include <WrappedProperty.hxx> #include "Chart2ModelContact.hxx" #include <DiagramHelper.hxx> -#include <com/sun/star/chart2/XDataSeries.hpp> #include <memory> #include <vector> +namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } } + namespace chart { namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx index c47eb30ce54b..ae114a30ea64 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx @@ -18,14 +18,17 @@ */ #include "WrappedSplineProperties.hxx" +#include "Chart2ModelContact.hxx" #include <FastPropertyIdRanges.hxx> #include <DiagramHelper.hxx> +#include <WrappedProperty.hxx> #include <unonames.hxx> #include <sal/log.hxx> #include <com/sun/star/chart2/CurveStyle.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> using namespace ::com::sun::star; using ::com::sun::star::uno::Any; diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx index 2614c67202f0..09cb8e90f621 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx @@ -19,12 +19,14 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDSPLINEPROPERTIES_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDSPLINEPROPERTIES_HXX -#include <WrappedProperty.hxx> -#include "Chart2ModelContact.hxx" - +#include <sal/types.h> #include <memory> #include <vector> +namespace chart { class WrappedProperty; } +namespace chart { namespace wrapper { class Chart2ModelContact; } } +namespace com { namespace sun { namespace star { namespace beans { struct Property; } } } } + namespace chart { namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx index 41dc9761a76a..a3d2d517c23e 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx @@ -27,10 +27,13 @@ #include <unonames.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/beans/Property.hpp> #include <com/sun/star/chart/ChartErrorCategory.hpp> #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/XDataProvider.hpp> #include <com/sun/star/chart2/data/XRangeXMLConversion.hpp> #include <com/sun/star/chart2/XRegressionCurveContainer.hpp> diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx index 250d9255f55d..c2a946394ca6 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx @@ -19,12 +19,14 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDSTATISTICPROPERTIES_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDSTATISTICPROPERTIES_HXX -#include <WrappedProperty.hxx> -#include "Chart2ModelContact.hxx" - +#include <sal/types.h> #include <memory> #include <vector> +namespace chart { class WrappedProperty; } +namespace chart { namespace wrapper { class Chart2ModelContact; } } +namespace com { namespace sun { namespace star { namespace beans { struct Property; } } } } + namespace chart { namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx index 4002929b6a99..4ede52c2bec9 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx @@ -18,10 +18,12 @@ */ #include "WrappedStockProperties.hxx" +#include "Chart2ModelContact.hxx" #include <FastPropertyIdRanges.hxx> #include <DiagramHelper.hxx> #include <ChartModelHelper.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> diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx index 14fbd39f445d..d477b351a5b3 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx @@ -19,12 +19,14 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDSTOCKPROPERTIES_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDSTOCKPROPERTIES_HXX -#include <WrappedProperty.hxx> -#include "Chart2ModelContact.hxx" - +#include <sal/types.h> #include <memory> #include <vector> +namespace chart { class WrappedProperty; } +namespace chart { namespace wrapper { class Chart2ModelContact; } } +namespace com { namespace sun { namespace star { namespace beans { struct Property; } } } } + namespace chart { namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx index 29eb04ea4957..653b83110fdc 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx @@ -19,12 +19,14 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDSYMBOLPROPERTIES_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDSYMBOLPROPERTIES_HXX -#include <WrappedProperty.hxx> -#include "Chart2ModelContact.hxx" - +#include <sal/types.h> #include <memory> #include <vector> +namespace chart { class WrappedProperty; } +namespace chart { namespace wrapper { class Chart2ModelContact; } } +namespace com { namespace sun { namespace star { namespace beans { struct Property; } } } } + namespace chart { namespace wrapper |