diff options
Diffstat (limited to 'chart2/source/inc')
23 files changed, 102 insertions, 64 deletions
diff --git a/chart2/source/inc/LabeledDataSequence.hxx b/chart2/source/inc/LabeledDataSequence.hxx index 5b8923cb7530..6117c2ffa322 100644 --- a/chart2/source/inc/LabeledDataSequence.hxx +++ b/chart2/source/inc/LabeledDataSequence.hxx @@ -24,9 +24,10 @@ #include <com/sun/star/chart2/data/XLabeledDataSequence2.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/util/XCloneable.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/util/XModifyBroadcaster.hpp> + +namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XDataSequence; } } } } } +namespace com { namespace sun { namespace star { namespace util { class XCloneable; } } } } +namespace com { namespace sun { namespace star { namespace util { class XModifyListener; } } } } namespace chart { diff --git a/chart2/source/inc/LegendHelper.hxx b/chart2/source/inc/LegendHelper.hxx index 0ecb3a142c83..9b1d2546beca 100644 --- a/chart2/source/inc/LegendHelper.hxx +++ b/chart2/source/inc/LegendHelper.hxx @@ -19,13 +19,13 @@ #ifndef INCLUDED_CHART2_SOURCE_INC_LEGENDHELPER_HXX #define INCLUDED_CHART2_SOURCE_INC_LEGENDHELPER_HXX -#include <rtl/ustring.hxx> -#include <com/sun/star/chart2/XLegend.hpp> -#include <com/sun/star/chart2/XDiagram.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> +#include <com/sun/star/uno/Reference.hxx> #include "charttoolsdllapi.hxx" -#include <ChartModel.hxx> +namespace chart { class ChartModel; } +namespace com { namespace sun { namespace star { namespace chart2 { class XDiagram; } } } } +namespace com { namespace sun { namespace star { namespace chart2 { class XLegend; } } } } +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } namespace chart { diff --git a/chart2/source/inc/LinearRegressionCurveCalculator.hxx b/chart2/source/inc/LinearRegressionCurveCalculator.hxx index 11d323887b98..24d82d1ecf5d 100644 --- a/chart2/source/inc/LinearRegressionCurveCalculator.hxx +++ b/chart2/source/inc/LinearRegressionCurveCalculator.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_CHART2_SOURCE_INC_LINEARREGRESSIONCURVECALCULATOR_HXX #define INCLUDED_CHART2_SOURCE_INC_LINEARREGRESSIONCURVECALCULATOR_HXX -#include "RegressionCurveCalculator.hxx" #include "PolynomialRegressionCurveCalculator.hxx" namespace chart diff --git a/chart2/source/inc/MediaDescriptorHelper.hxx b/chart2/source/inc/MediaDescriptorHelper.hxx index 9c6b4705f823..cd78408c92b9 100644 --- a/chart2/source/inc/MediaDescriptorHelper.hxx +++ b/chart2/source/inc/MediaDescriptorHelper.hxx @@ -20,13 +20,15 @@ #define INCLUDED_CHART2_SOURCE_INC_MEDIADESCRIPTORHELPER_HXX #include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/io/XStream.hpp> -#include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/io/XOutputStream.hpp> -#include <com/sun/star/embed/XStorage.hpp> +#include <com/sun/star/uno/Reference.hxx> #include "charttoolsdllapi.hxx" +namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } +namespace com { namespace sun { namespace star { namespace embed { class XStorage; } } } } +namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } } +namespace com { namespace sun { namespace star { namespace io { class XOutputStream; } } } } +namespace com { namespace sun { namespace star { namespace io { class XStream; } } } } + /* * This class helps to read and write the properties mentioned in the service description * com.sun.star.document.MediaDescriptor from and to a sequence of PropertyValues. diff --git a/chart2/source/inc/ModifyListenerHelper.hxx b/chart2/source/inc/ModifyListenerHelper.hxx index 42bb4838eeed..48de142db752 100644 --- a/chart2/source/inc/ModifyListenerHelper.hxx +++ b/chart2/source/inc/ModifyListenerHelper.hxx @@ -21,9 +21,7 @@ #include <com/sun/star/util/XModifyListener.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> -#include <com/sun/star/uno/XWeak.hpp> #include <cppuhelper/compbase.hxx> -#include <cppuhelper/weakref.hxx> #include "MutexContainer.hxx" #include "charttoolsdllapi.hxx" @@ -32,6 +30,9 @@ #include <algorithm> #include <utility> +namespace com { namespace sun { namespace star { namespace uno { class XWeak; } } } } +namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class WeakReference; } } } } + namespace chart { namespace ModifyListenerHelper diff --git a/chart2/source/inc/NumberFormatterWrapper.hxx b/chart2/source/inc/NumberFormatterWrapper.hxx index 2553941c54dd..74a0976a5a51 100644 --- a/chart2/source/inc/NumberFormatterWrapper.hxx +++ b/chart2/source/inc/NumberFormatterWrapper.hxx @@ -20,8 +20,12 @@ #define INCLUDED_CHART2_SOURCE_INC_NUMBERFORMATTERWRAPPER_HXX #include "charttoolsdllapi.hxx" -#include <svl/zforlist.hxx> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> +#include <tools/solar.h> +#include <tools/date.hxx> + +class SvNumberFormatter; +class Color; namespace chart { diff --git a/chart2/source/inc/ObjectIdentifier.hxx b/chart2/source/inc/ObjectIdentifier.hxx index 8cb3c3c4ad37..79fb15232c81 100644 --- a/chart2/source/inc/ObjectIdentifier.hxx +++ b/chart2/source/inc/ObjectIdentifier.hxx @@ -19,20 +19,22 @@ #ifndef INCLUDED_CHART2_SOURCE_INC_OBJECTIDENTIFIER_HXX #define INCLUDED_CHART2_SOURCE_INC_OBJECTIDENTIFIER_HXX -#include <com/sun/star/chart2/XChartType.hpp> -#include <com/sun/star/chart2/XDiagram.hpp> -#include <com/sun/star/chart2/XCoordinateSystem.hpp> -#include <com/sun/star/chart2/XDataSeries.hpp> -#include <com/sun/star/chart2/XChartDocument.hpp> #include "TitleHelper.hxx" #include "charttoolsdllapi.hxx" -#include <ChartModel.hxx> #include <rtl/ustring.hxx> -#include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/awt/Point.hpp> -#include <com/sun/star/drawing/XShape.hpp> + +namespace chart { class ChartModel; } +namespace com { namespace sun { namespace star { namespace awt { struct Point; } } } } +namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } +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 XCoordinateSystem; } } } } +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 drawing { class XShape; } } } } +namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } } namespace chart { diff --git a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx index 06cdc5080316..c3306d3c6ee4 100644 --- a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx +++ b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_SOURCE_INC_POTENTIALREGRESSIONCURVECALCULATOR_HXX #include "RegressionCurveCalculator.hxx" -#include "charttoolsdllapi.hxx" namespace chart { diff --git a/chart2/source/inc/PropertyHelper.hxx b/chart2/source/inc/PropertyHelper.hxx index ae84a8c2aac8..ddf941a6d3e5 100644 --- a/chart2/source/inc/PropertyHelper.hxx +++ b/chart2/source/inc/PropertyHelper.hxx @@ -21,11 +21,12 @@ #include <com/sun/star/beans/Property.hpp> #include <com/sun/star/uno/Any.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include "charttoolsdllapi.hxx" #include <unordered_map> +namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } + namespace chart { diff --git a/chart2/source/inc/RangeHighlighter.hxx b/chart2/source/inc/RangeHighlighter.hxx index 01f408116bc8..acb79c80e302 100644 --- a/chart2/source/inc/RangeHighlighter.hxx +++ b/chart2/source/inc/RangeHighlighter.hxx @@ -22,8 +22,7 @@ #include "MutexContainer.hxx" #include <cppuhelper/compbase.hxx> #include <com/sun/star/chart2/data/XRangeHighlighter.hpp> -#include <com/sun/star/view/XSelectionSupplier.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/view/XSelectionChangeListener.hpp> namespace com { namespace sun { namespace star { namespace chart2 { @@ -32,6 +31,9 @@ namespace chart2 { class XAxis; }}}} +namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } +namespace com { namespace sun { namespace star { namespace view { class XSelectionSupplier; } } } } + namespace chart { diff --git a/chart2/source/inc/ReferenceSizeProvider.hxx b/chart2/source/inc/ReferenceSizeProvider.hxx index a12b2f2800f8..59b11ead29f5 100644 --- a/chart2/source/inc/ReferenceSizeProvider.hxx +++ b/chart2/source/inc/ReferenceSizeProvider.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_SOURCE_INC_REFERENCESIZEPROVIDER_HXX #include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/awt/Size.hpp> #include "charttoolsdllapi.hxx" @@ -28,6 +27,10 @@ namespace com { namespace sun { namespace star { namespace chart2 { class XTitle; class XTitled; + class XChartDocument; +} +namespace beans { + class XPropertySet; } }}} diff --git a/chart2/source/inc/RegressionCurveCalculator.hxx b/chart2/source/inc/RegressionCurveCalculator.hxx index 18c220f981be..553e1e3fc7c6 100644 --- a/chart2/source/inc/RegressionCurveCalculator.hxx +++ b/chart2/source/inc/RegressionCurveCalculator.hxx @@ -23,7 +23,9 @@ #include <rtl/ustrbuf.hxx> #include <com/sun/star/chart2/XRegressionCurveCalculator.hpp> -#include <com/sun/star/util/XNumberFormatter.hpp> + +namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; } } } } +namespace com { namespace sun { namespace star { namespace util { class XNumberFormatter; } } } } namespace chart { diff --git a/chart2/source/inc/RegressionCurveHelper.hxx b/chart2/source/inc/RegressionCurveHelper.hxx index dad317be913f..f5b3549df6fc 100644 --- a/chart2/source/inc/RegressionCurveHelper.hxx +++ b/chart2/source/inc/RegressionCurveHelper.hxx @@ -19,19 +19,20 @@ #ifndef INCLUDED_CHART2_SOURCE_INC_REGRESSIONCURVEHELPER_HXX #define INCLUDED_CHART2_SOURCE_INC_REGRESSIONCURVEHELPER_HXX -#include <com/sun/star/chart2/XRegressionCurve.hpp> -#include <com/sun/star/chart2/XRegressionCurveCalculator.hpp> -#include <com/sun/star/chart2/XRegressionCurveContainer.hpp> -#include <com/sun/star/chart2/data/XDataSource.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/frame/XModel.hpp> #include <svx/chrtitem.hxx> #include "charttoolsdllapi.hxx" #include <vector> +namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } +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 XRegressionCurve; } } } } +namespace com { namespace sun { namespace star { namespace chart2 { class XRegressionCurveCalculator; } } } } +namespace com { namespace sun { namespace star { namespace chart2 { class XRegressionCurveContainer; } } } } +namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XDataSource; } } } } } +namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } + namespace chart { diff --git a/chart2/source/inc/RelativePositionHelper.hxx b/chart2/source/inc/RelativePositionHelper.hxx index 54cf312b10bc..36933110f059 100644 --- a/chart2/source/inc/RelativePositionHelper.hxx +++ b/chart2/source/inc/RelativePositionHelper.hxx @@ -21,12 +21,13 @@ #define INCLUDED_CHART2_SOURCE_INC_RELATIVEPOSITIONHELPER_HXX #include <com/sun/star/chart2/RelativePosition.hpp> -#include <com/sun/star/chart2/RelativeSize.hpp> #include <com/sun/star/drawing/Alignment.hpp> #include <com/sun/star/awt/Point.hpp> -#include <com/sun/star/awt/Size.hpp> #include "charttoolsdllapi.hxx" +namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } } +namespace com { namespace sun { namespace star { namespace chart2 { struct RelativeSize; } } } } + namespace chart { diff --git a/chart2/source/inc/RelativeSizeHelper.hxx b/chart2/source/inc/RelativeSizeHelper.hxx index 0bb50bcac168..22bb89ac7bb4 100644 --- a/chart2/source/inc/RelativeSizeHelper.hxx +++ b/chart2/source/inc/RelativeSizeHelper.hxx @@ -19,10 +19,12 @@ #ifndef INCLUDED_CHART2_SOURCE_INC_RELATIVESIZEHELPER_HXX #define INCLUDED_CHART2_SOURCE_INC_RELATIVESIZEHELPER_HXX -#include <com/sun/star/awt/Size.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include "charttoolsdllapi.hxx" +namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } } +namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } +namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } } + namespace chart { diff --git a/chart2/source/inc/SceneProperties.hxx b/chart2/source/inc/SceneProperties.hxx index bb2cc8b02001..9553a5a60d4a 100644 --- a/chart2/source/inc/SceneProperties.hxx +++ b/chart2/source/inc/SceneProperties.hxx @@ -22,10 +22,11 @@ #include "PropertyHelper.hxx" #include "FastPropertyIdRanges.hxx" #include "charttoolsdllapi.hxx" -#include <com/sun/star/beans/Property.hpp> #include <vector> +namespace com { namespace sun { namespace star { namespace beans { struct Property; } } } } + namespace chart { diff --git a/chart2/source/inc/StatisticsHelper.hxx b/chart2/source/inc/StatisticsHelper.hxx index 1c75344131d1..369b41ec5b43 100644 --- a/chart2/source/inc/StatisticsHelper.hxx +++ b/chart2/source/inc/StatisticsHelper.hxx @@ -19,12 +19,18 @@ #ifndef INCLUDED_CHART2_SOURCE_INC_STATISTICSHELPER_HXX #define INCLUDED_CHART2_SOURCE_INC_STATISTICSHELPER_HXX -#include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/chart2/data/XDataSource.hpp> -#include <com/sun/star/chart2/data/XDataProvider.hpp> -#include <com/sun/star/chart2/XDataSeries.hpp> +#include <com/sun/star/uno/Reference.h> +#include <rtl/ustring.hxx> #include "charttoolsdllapi.hxx" +namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } +namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } } +namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XDataProvider; } } } } } +namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XDataSequence; } } } } } +namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XDataSource; } } } } } +namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XLabeledDataSequence; } } } } } +namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } } + namespace chart { diff --git a/chart2/source/inc/ThreeDHelper.hxx b/chart2/source/inc/ThreeDHelper.hxx index 1b90ce394569..fedf0d0df998 100644 --- a/chart2/source/inc/ThreeDHelper.hxx +++ b/chart2/source/inc/ThreeDHelper.hxx @@ -20,10 +20,12 @@ #ifndef INCLUDED_CHART2_SOURCE_INC_THREEDHELPER_HXX #define INCLUDED_CHART2_SOURCE_INC_THREEDHELPER_HXX -#include <com/sun/star/chart2/XDiagram.hpp> #include <com/sun/star/drawing/CameraGeometry.hpp> #include "charttoolsdllapi.hxx" +namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } +namespace com { namespace sun { namespace star { namespace chart2 { class XDiagram; } } } } + namespace chart { diff --git a/chart2/source/inc/TitleHelper.hxx b/chart2/source/inc/TitleHelper.hxx index 17f89136d609..62068c4237a9 100644 --- a/chart2/source/inc/TitleHelper.hxx +++ b/chart2/source/inc/TitleHelper.hxx @@ -19,14 +19,15 @@ #ifndef INCLUDED_CHART2_SOURCE_INC_TITLEHELPER_HXX #define INCLUDED_CHART2_SOURCE_INC_TITLEHELPER_HXX -#include "ReferenceSizeProvider.hxx" +#include <com/sun/star/uno/Reference.h> +#include <rtl/ustring.hxx> #include "charttoolsdllapi.hxx" -#include <com/sun/star/chart2/XTitled.hpp> -#include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/chart2/XDiagram.hpp> -#include <ChartModel.hxx> +namespace chart { class ChartModel; } +namespace chart { class ReferenceSizeProvider; } +namespace com { namespace sun { namespace star { namespace chart2 { class XTitle; } } } } +namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } namespace chart { diff --git a/chart2/source/inc/UncachedDataSequence.hxx b/chart2/source/inc/UncachedDataSequence.hxx index 08b06103dc46..f9a910a4803c 100644 --- a/chart2/source/inc/UncachedDataSequence.hxx +++ b/chart2/source/inc/UncachedDataSequence.hxx @@ -28,8 +28,6 @@ // interfaces and types #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/chart2/XInternalDataProvider.hpp> #include <com/sun/star/chart2/data/XDataSequence.hpp> #include <com/sun/star/chart2/data/XNumericalDataSequence.hpp> #include <com/sun/star/chart2/data/XTextualDataSequence.hpp> @@ -38,6 +36,9 @@ #include <com/sun/star/util/XCloneable.hpp> #include <com/sun/star/util/XModifiable.hpp> +namespace com { namespace sun { namespace star { namespace beans { class XPropertySetInfo; } } } } +namespace com { namespace sun { namespace star { namespace chart2 { class XInternalDataProvider; } } } } + namespace chart { diff --git a/chart2/source/inc/UserDefinedProperties.hxx b/chart2/source/inc/UserDefinedProperties.hxx index 6551a206b1e0..b2f700813311 100644 --- a/chart2/source/inc/UserDefinedProperties.hxx +++ b/chart2/source/inc/UserDefinedProperties.hxx @@ -21,10 +21,11 @@ #include "FastPropertyIdRanges.hxx" #include "charttoolsdllapi.hxx" -#include <com/sun/star/beans/Property.hpp> #include <vector> +namespace com { namespace sun { namespace star { namespace beans { struct Property; } } } } + namespace chart { diff --git a/chart2/source/inc/WrappedProperty.hxx b/chart2/source/inc/WrappedProperty.hxx index b11ee8af312b..231a0ed3f21f 100644 --- a/chart2/source/inc/WrappedProperty.hxx +++ b/chart2/source/inc/WrappedProperty.hxx @@ -19,13 +19,18 @@ #ifndef INCLUDED_CHART2_SOURCE_INC_WRAPPEDPROPERTY_HXX #define INCLUDED_CHART2_SOURCE_INC_WRAPPEDPROPERTY_HXX -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/beans/XPropertyState.hpp> +#include <com/sun/star/beans/PropertyState.hpp> +#include <com/sun/star/uno/Any.hxx> +#include <rtl/ustring.hxx> #include "charttoolsdllapi.hxx" #include <map> #include <memory> +namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } +namespace com { namespace sun { namespace star { namespace beans { class XPropertyState; } } } } +namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } } + namespace chart { diff --git a/chart2/source/inc/WrappedPropertySet.hxx b/chart2/source/inc/WrappedPropertySet.hxx index 25ea8f5cbf92..b0ea15f0ef00 100644 --- a/chart2/source/inc/WrappedPropertySet.hxx +++ b/chart2/source/inc/WrappedPropertySet.hxx @@ -26,13 +26,14 @@ #include <com/sun/star/beans/XMultiPropertyStates.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> -#include <com/sun/star/beans/Property.hpp> #include <cppuhelper/implbase.hxx> -#include <cppuhelper/propshlp.hxx> #include <memory> #include <vector> +namespace cppu { class IPropertyArrayHelper; } +namespace cppu { class OPropertyArrayHelper; } + namespace chart { |