diff options
Diffstat (limited to 'chart2/source')
35 files changed, 15 insertions, 54 deletions
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx index 82f55eeda53f..ad95e10110b3 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx @@ -32,6 +32,7 @@ #include <vcl/svapp.hxx> #include <rtl/ustrbuf.hxx> #include <tools/diagnose_ex.h> +#include <comphelper/property.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx index dcd67beb5330..7a2a041d41f8 100644 --- a/chart2/source/controller/dialogs/DataBrowserModel.cxx +++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx @@ -45,6 +45,7 @@ #include <com/sun/star/chart2/data/XTextualDataSequence.hpp> #include <com/sun/star/util/XModifiable.hpp> #include <tools/diagnose_ex.h> +#include <comphelper/property.hxx> #include <rtl/math.hxx> diff --git a/chart2/source/inc/BaseGFXHelper.hxx b/chart2/source/inc/BaseGFXHelper.hxx index fe607b1ee890..df6a11087722 100644 --- a/chart2/source/inc/BaseGFXHelper.hxx +++ b/chart2/source/inc/BaseGFXHelper.hxx @@ -20,9 +20,6 @@ #define INCLUDED_CHART2_SOURCE_INC_BASEGFXHELPER_HXX #include <basegfx/matrix/b3dhommatrix.hxx> -#include <basegfx/polygon/b3dpolypolygon.hxx> -#include <basegfx/polygon/b3dpolygon.hxx> -#include <basegfx/point/b3dpoint.hxx> #include <basegfx/range/b2irectangle.hxx> #include <basegfx/tuple/b3dtuple.hxx> #include <basegfx/vector/b3dvector.hxx> diff --git a/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx index 91bbd3870baf..c18a8daac9e6 100644 --- a/chart2/source/inc/CachedDataSequence.hxx +++ b/chart2/source/inc/CachedDataSequence.hxx @@ -37,8 +37,6 @@ #include <com/sun/star/util/XCloneable.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> -#include <vector> - namespace chart { diff --git a/chart2/source/inc/CloneHelper.hxx b/chart2/source/inc/CloneHelper.hxx index 5c8b87f307f3..36e50f98e4b9 100644 --- a/chart2/source/inc/CloneHelper.hxx +++ b/chart2/source/inc/CloneHelper.hxx @@ -21,9 +21,7 @@ #include <com/sun/star/util/XCloneable.hpp> -#include <map> #include <algorithm> -#include <iterator> namespace chart { diff --git a/chart2/source/inc/CommonConverters.hxx b/chart2/source/inc/CommonConverters.hxx index 389c1ff553e0..18b261083dc0 100644 --- a/chart2/source/inc/CommonConverters.hxx +++ b/chart2/source/inc/CommonConverters.hxx @@ -29,7 +29,6 @@ #include <com/sun/star/drawing/PointSequenceSequence.hpp> #include <com/sun/star/drawing/Position3D.hpp> #include <com/sun/star/drawing/PolyPolygonShape3D.hpp> -#include <com/sun/star/text/WritingMode.hpp> #include <com/sun/star/chart2/data/XDataSequence.hpp> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/point/b3dpoint.hxx> @@ -37,8 +36,6 @@ #include "charttoolsdllapi.hxx" #include <vector> -#include <algorithm> -#include <iterator> namespace chart { diff --git a/chart2/source/inc/CommonFunctors.hxx b/chart2/source/inc/CommonFunctors.hxx index 8b11df32f3ea..e8818c67c972 100644 --- a/chart2/source/inc/CommonFunctors.hxx +++ b/chart2/source/inc/CommonFunctors.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_CHART2_SOURCE_INC_COMMONFUNCTORS_HXX #define INCLUDED_CHART2_SOURCE_INC_COMMONFUNCTORS_HXX -#include <algorithm> #include <o3tl/any.hxx> #include <rtl/math.hxx> #include <com/sun/star/uno/Any.hxx> diff --git a/chart2/source/inc/ContainerHelper.hxx b/chart2/source/inc/ContainerHelper.hxx index b2c0b448c30c..014d3c1033d5 100644 --- a/chart2/source/inc/ContainerHelper.hxx +++ b/chart2/source/inc/ContainerHelper.hxx @@ -20,12 +20,6 @@ #define INCLUDED_CHART2_SOURCE_INC_CONTAINERHELPER_HXX #include <vector> -#include <set> -#include <map> - -#include <algorithm> -#include <functional> -#include <o3tl/functional.hxx> namespace chart { diff --git a/chart2/source/inc/DataSource.hxx b/chart2/source/inc/DataSource.hxx index 17d2a386be1f..6ad8bbffc409 100644 --- a/chart2/source/inc/DataSource.hxx +++ b/chart2/source/inc/DataSource.hxx @@ -22,7 +22,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/chart2/data/XDataSource.hpp> #include <com/sun/star/chart2/data/XDataSink.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> namespace chart diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx index 3e20a0c5c280..11625784b106 100644 --- a/chart2/source/inc/ErrorBar.hxx +++ b/chart2/source/inc/ErrorBar.hxx @@ -20,26 +20,26 @@ #define INCLUDED_CHART2_SOURCE_INC_ERRORBAR_HXX #include "MutexContainer.hxx" -#include "ModifyListenerHelper.hxx" #include "charttoolsdllapi.hxx" #include <cppuhelper/implbase.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> -#include <com/sun/star/container/XChild.hpp> #include <com/sun/star/chart2/data/XDataSink.hpp> #include <com/sun/star/chart2/data/XDataSource.hpp> -#include <com/sun/star/chart/ErrorBarStyle.hpp> #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/drawing/LineJoint.hpp> #include <com/sun/star/drawing/LineDash.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XServiceName.hpp> #include <com/sun/star/uno/Any.hxx> -#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/XCloneable.hpp> #include <com/sun/star/util/Color.hpp> +#include <com/sun/star/util/XModifyListener.hpp> +#include <com/sun/star/util/XModifyBroadcaster.hpp> + + +#include <vector> namespace chart { diff --git a/chart2/source/inc/EventListenerHelper.hxx b/chart2/source/inc/EventListenerHelper.hxx index 8b9c1ec6c47f..03f63ed6c82e 100644 --- a/chart2/source/inc/EventListenerHelper.hxx +++ b/chart2/source/inc/EventListenerHelper.hxx @@ -22,9 +22,7 @@ #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/lang/XComponent.hpp> -#include <list> #include <algorithm> -#include <utility> namespace chart { diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx index 1745e5552cf8..481794b40fa1 100644 --- a/chart2/source/inc/LifeTime.hxx +++ b/chart2/source/inc/LifeTime.hxx @@ -21,13 +21,11 @@ #include <osl/mutex.hxx> #include <osl/conditn.hxx> -#include <com/sun/star/uno/Exception.hpp> #include <cppuhelper/interfacecontainer.hxx> #include <com/sun/star/util/CloseVetoException.hpp> #include <com/sun/star/util/XCloseListener.hpp> #include <com/sun/star/util/XCloseable.hpp> #include <com/sun/star/lang/XComponent.hpp> -#include <cppuhelper/weakref.hxx> #include "charttoolsdllapi.hxx" namespace apphelper diff --git a/chart2/source/inc/LinePropertiesHelper.hxx b/chart2/source/inc/LinePropertiesHelper.hxx index 81a5e5a1272f..91822feae671 100644 --- a/chart2/source/inc/LinePropertiesHelper.hxx +++ b/chart2/source/inc/LinePropertiesHelper.hxx @@ -23,6 +23,7 @@ #include "FastPropertyIdRanges.hxx" #include "charttoolsdllapi.hxx" #include <com/sun/star/beans/Property.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> #include <vector> diff --git a/chart2/source/inc/MediaDescriptorHelper.hxx b/chart2/source/inc/MediaDescriptorHelper.hxx index 73e1b3fe4c91..9c6b4705f823 100644 --- a/chart2/source/inc/MediaDescriptorHelper.hxx +++ b/chart2/source/inc/MediaDescriptorHelper.hxx @@ -21,8 +21,6 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/util/URL.hpp> -#include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/io/XStream.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XOutputStream.hpp> diff --git a/chart2/source/inc/ModifyListenerHelper.hxx b/chart2/source/inc/ModifyListenerHelper.hxx index 1e91a44bab84..42bb4838eeed 100644 --- a/chart2/source/inc/ModifyListenerHelper.hxx +++ b/chart2/source/inc/ModifyListenerHelper.hxx @@ -19,10 +19,8 @@ #ifndef INCLUDED_CHART2_SOURCE_INC_MODIFYLISTENERHELPER_HXX #define INCLUDED_CHART2_SOURCE_INC_MODIFYLISTENERHELPER_HXX -#include <cppuhelper/interfacecontainer.hxx> #include <com/sun/star/util/XModifyListener.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> -#include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/uno/XWeak.hpp> #include <cppuhelper/compbase.hxx> #include <cppuhelper/weakref.hxx> diff --git a/chart2/source/inc/NameContainer.hxx b/chart2/source/inc/NameContainer.hxx index 33392a9c3903..8d13d8037eff 100644 --- a/chart2/source/inc/NameContainer.hxx +++ b/chart2/source/inc/NameContainer.hxx @@ -22,7 +22,6 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/XCloneable.hpp> #include <cppuhelper/implbase.hxx> #include "charttoolsdllapi.hxx" diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx index fd5ad5632366..e5f18492a96b 100644 --- a/chart2/source/inc/OPropertySet.hxx +++ b/chart2/source/inc/OPropertySet.hxx @@ -21,16 +21,12 @@ // helper classes #include <cppuhelper/propshlp.hxx> -#include <cppuhelper/interfacecontainer.hxx> -#include <cppuhelper/weak.hxx> // interfaces and types #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/beans/XMultiPropertyStates.hpp> -#include <com/sun/star/beans/Property.hpp> #include <com/sun/star/style/XStyleSupplier.hpp> -#include <osl/mutex.hxx> #include "charttoolsdllapi.hxx" #include <memory> diff --git a/chart2/source/inc/PopupRequest.hxx b/chart2/source/inc/PopupRequest.hxx index 006a58003ffc..850e2c513fd2 100644 --- a/chart2/source/inc/PopupRequest.hxx +++ b/chart2/source/inc/PopupRequest.hxx @@ -12,7 +12,6 @@ #include "MutexContainer.hxx" #include <cppuhelper/compbase.hxx> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/awt/XRequestCallback.hpp> namespace chart diff --git a/chart2/source/inc/PropertyHelper.hxx b/chart2/source/inc/PropertyHelper.hxx index 52a38edfed6c..ae84a8c2aac8 100644 --- a/chart2/source/inc/PropertyHelper.hxx +++ b/chart2/source/inc/PropertyHelper.hxx @@ -19,15 +19,11 @@ #ifndef INCLUDED_CHART2_SOURCE_INC_PROPERTYHELPER_HXX #define INCLUDED_CHART2_SOURCE_INC_PROPERTYHELPER_HXX -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/Property.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <comphelper/property.hxx> #include "charttoolsdllapi.hxx" -#include <map> #include <unordered_map> namespace chart diff --git a/chart2/source/inc/RegressionCalculationHelper.hxx b/chart2/source/inc/RegressionCalculationHelper.hxx index 084f49623c42..eb1e46703e39 100644 --- a/chart2/source/inc/RegressionCalculationHelper.hxx +++ b/chart2/source/inc/RegressionCalculationHelper.hxx @@ -22,7 +22,6 @@ #include <rtl/math.hxx> #include <utility> -#include <algorithm> #include <vector> namespace chart diff --git a/chart2/source/inc/Scaling.hxx b/chart2/source/inc/Scaling.hxx index de4c4d67a82f..7314ce84ebbc 100644 --- a/chart2/source/inc/Scaling.hxx +++ b/chart2/source/inc/Scaling.hxx @@ -22,7 +22,6 @@ #include <com/sun/star/chart2/XScaling.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceName.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> namespace chart diff --git a/chart2/source/inc/StatisticsHelper.hxx b/chart2/source/inc/StatisticsHelper.hxx index 838c3bd59728..1c75344131d1 100644 --- a/chart2/source/inc/StatisticsHelper.hxx +++ b/chart2/source/inc/StatisticsHelper.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_SOURCE_INC_STATISTICSHELPER_HXX #include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/chart2/data/XDataSource.hpp> #include <com/sun/star/chart2/data/XDataProvider.hpp> #include <com/sun/star/chart2/XDataSeries.hpp> diff --git a/chart2/source/inc/ThreeDHelper.hxx b/chart2/source/inc/ThreeDHelper.hxx index 48b79b316b76..1b90ce394569 100644 --- a/chart2/source/inc/ThreeDHelper.hxx +++ b/chart2/source/inc/ThreeDHelper.hxx @@ -22,7 +22,6 @@ #include <com/sun/star/chart2/XDiagram.hpp> #include <com/sun/star/drawing/CameraGeometry.hpp> -#include <com/sun/star/drawing/ShadeMode.hpp> #include "charttoolsdllapi.hxx" namespace chart diff --git a/chart2/source/inc/UncachedDataSequence.hxx b/chart2/source/inc/UncachedDataSequence.hxx index b1187dd05731..08b06103dc46 100644 --- a/chart2/source/inc/UncachedDataSequence.hxx +++ b/chart2/source/inc/UncachedDataSequence.hxx @@ -25,12 +25,10 @@ #include <comphelper/broadcasthelper.hxx> #include <comphelper/propertycontainer.hxx> #include <comphelper/proparrhlp.hxx> -#include "charttoolsdllapi.hxx" // interfaces and types #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/chart2/XInternalDataProvider.hpp> #include <com/sun/star/chart2/data/XDataSequence.hpp> #include <com/sun/star/chart2/data/XNumericalDataSequence.hpp> @@ -38,11 +36,8 @@ #include <com/sun/star/container/XIndexReplace.hpp> #include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/util/XCloneable.hpp> -#include <com/sun/star/util/XModifyBroadcaster.hpp> #include <com/sun/star/util/XModifiable.hpp> -#include <vector> - namespace chart { diff --git a/chart2/source/inc/UserDefinedProperties.hxx b/chart2/source/inc/UserDefinedProperties.hxx index 471126e32df5..6551a206b1e0 100644 --- a/chart2/source/inc/UserDefinedProperties.hxx +++ b/chart2/source/inc/UserDefinedProperties.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_CHART2_SOURCE_INC_USERDEFINEDPROPERTIES_HXX #define INCLUDED_CHART2_SOURCE_INC_USERDEFINEDPROPERTIES_HXX -#include "PropertyHelper.hxx" #include "FastPropertyIdRanges.hxx" #include "charttoolsdllapi.hxx" #include <com/sun/star/beans/Property.hpp> diff --git a/chart2/source/inc/WeakListenerAdapter.hxx b/chart2/source/inc/WeakListenerAdapter.hxx index 10b3b6357d94..faa3b5d3aff9 100644 --- a/chart2/source/inc/WeakListenerAdapter.hxx +++ b/chart2/source/inc/WeakListenerAdapter.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_CHART2_SOURCE_INC_WEAKLISTENERADAPTER_HXX #define INCLUDED_CHART2_SOURCE_INC_WEAKLISTENERADAPTER_HXX -#include <com/sun/star/uno/XWeak.hpp> #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/util/XModifyListener.hpp> #include <com/sun/star/view/XSelectionChangeListener.hpp> diff --git a/chart2/source/inc/WrappedPropertySet.hxx b/chart2/source/inc/WrappedPropertySet.hxx index 5f9f703430d4..dd70bed2cde2 100644 --- a/chart2/source/inc/WrappedPropertySet.hxx +++ b/chart2/source/inc/WrappedPropertySet.hxx @@ -30,7 +30,6 @@ #include <cppuhelper/implbase.hxx> #include <cppuhelper/propshlp.hxx> -#include <algorithm> #include <vector> namespace chart diff --git a/chart2/source/inc/chartview/DrawModelWrapper.hxx b/chart2/source/inc/chartview/DrawModelWrapper.hxx index cc9bdbbe3ac4..bd7d248be60d 100644 --- a/chart2/source/inc/chartview/DrawModelWrapper.hxx +++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx @@ -23,7 +23,6 @@ #include <svx/svdobj.hxx> #include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <chartview/chartviewdllapi.hxx> diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index de1275c71f46..724bfff3a805 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -37,6 +37,7 @@ #include <com/sun/star/chart2/XDataSeriesContainer.hpp> #include <com/sun/star/chart2/XChartTypeContainer.hpp> #include <tools/diagnose_ex.h> +#include <comphelper/property.hxx> #include <algorithm> #include <iterator> diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx index f4118dd9b05d..3ea38e528e67 100644 --- a/chart2/source/tools/ErrorBar.cxx +++ b/chart2/source/tools/ErrorBar.cxx @@ -22,6 +22,7 @@ #include <EventListenerHelper.hxx> #include <PropertyHelper.hxx> #include <CloneHelper.hxx> +#include <ModifyListenerHelper.hxx> #include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/chart2/source/tools/FormattedStringHelper.cxx b/chart2/source/tools/FormattedStringHelper.cxx index e47b706e98fa..1eff3e204caa 100644 --- a/chart2/source/tools/FormattedStringHelper.cxx +++ b/chart2/source/tools/FormattedStringHelper.cxx @@ -21,6 +21,7 @@ #include <PropertyHelper.hxx> #include <com/sun/star/chart2/FormattedString.hpp> #include <tools/diagnose_ex.h> +#include <comphelper/property.hxx> namespace chart { diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index a28314c70b6f..12f3231cc291 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -42,6 +42,7 @@ #include <unotools/charclass.hxx> #include <cppuhelper/supportsservice.hxx> #include <comphelper/sequenceashashmap.hxx> +#include <comphelper/property.hxx> #include <tools/diagnose_ex.h> #include <vector> diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx index c6235094cd40..01ffba6b8fba 100644 --- a/chart2/source/tools/RegressionCurveHelper.cxx +++ b/chart2/source/tools/RegressionCurveHelper.cxx @@ -35,6 +35,7 @@ #include <DiagramHelper.hxx> #include <com/sun/star/chart2/XChartDocument.hpp> #include <tools/diagnose_ex.h> +#include <comphelper/property.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx index 34adacf97e13..1e23ee3e9c83 100644 --- a/chart2/source/tools/Scaling.cxx +++ b/chart2/source/tools/Scaling.cxx @@ -20,6 +20,7 @@ #include <Scaling.hxx> #include <rtl/math.hxx> #include <com/sun/star/uno/RuntimeException.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/supportsservice.hxx> namespace diff --git a/chart2/source/tools/ThreeDHelper.cxx b/chart2/source/tools/ThreeDHelper.cxx index 6fe11c7c684b..9ba6b85aefe4 100644 --- a/chart2/source/tools/ThreeDHelper.cxx +++ b/chart2/source/tools/ThreeDHelper.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/chart2/XDiagram.hpp> #include <com/sun/star/drawing/LineStyle.hpp> +#include <com/sun/star/drawing/ShadeMode.hpp> #include <tools/diagnose_ex.h> namespace chart |