diff options
42 files changed, 172 insertions, 79 deletions
diff --git a/chart2/IwyuFilter_chart2.yaml b/chart2/IwyuFilter_chart2.yaml index f826ca6128ac..622c3fdb0e93 100644 --- a/chart2/IwyuFilter_chart2.yaml +++ b/chart2/IwyuFilter_chart2.yaml @@ -231,3 +231,28 @@ blacklist: - com/sun/star/io/XActiveDataSource.hpp - com/sun/star/lang/XMultiServiceFactory.hpp - com/sun/star/lang/XServiceInfo.hpp + chart2/source/view/inc/3DChartObjects.hxx: + # base class has to be a complete type + - boost/shared_array.hpp + - map + chart2/source/view/inc/Linear3DTransformation.hxx: + # base class has to be a complete type + - com/sun/star/chart2/XTransformation.hpp + chart2/source/view/inc/GL3DRenderer.hxx: + # base class has to be a complete type + - boost/shared_array.hpp + - map + - vector + chart2/source/view/inc/GL3DBarChart.hxx: + # base class has to be a complete type + - deque + - memory + - vector + - GL3DPlotterBase.hxx + - vcl/idle.hxx + chart2/source/view/inc/VLineProperties.hxx: + # base class has to be a complete type + - com/sun/star/uno/Reference.h + chart2/source/view/inc/VPolarTransformation.hxx: + # base class has to be a complete type + - com/sun/star/chart2/XTransformation.hpp diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx index dcd679c814fd..e56608fd0b5c 100644 --- a/chart2/source/view/axes/VCartesianGrid.cxx +++ b/chart2/source/view/axes/VCartesianGrid.cxx @@ -26,6 +26,7 @@ #include <AxisHelper.hxx> #include <com/sun/star/drawing/PointSequenceSequence.hpp> #include <com/sun/star/drawing/LineStyle.hpp> +#include <com/sun/star/chart2/XTransformation.hpp> #include <memory> #include <vector> diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx index 063697cc400a..f4e051b47ee4 100644 --- a/chart2/source/view/axes/VCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCoordinateSystem.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <BaseGFXHelper.hxx> #include <VCoordinateSystem.hxx> #include "VCartesianCoordinateSystem.hxx" #include "VPolarCoordinateSystem.hxx" diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx index 2a8d773244e0..22d952b8eeff 100644 --- a/chart2/source/view/charttypes/AreaChart.cxx +++ b/chart2/source/view/charttypes/AreaChart.cxx @@ -21,6 +21,7 @@ #include <PlottingPositionHelper.hxx> #include <AbstractShapeFactory.hxx> #include <CommonConverters.hxx> +#include <ExplicitCategoriesProvider.hxx> #include <ViewDefines.hxx> #include <ObjectIdentifier.hxx> #include "Splines.hxx" @@ -40,6 +41,7 @@ #include <com/sun/star/drawing/DoubleSequence.hpp> #include <com/sun/star/drawing/NormalsKind.hpp> +#include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/lang/XServiceName.hpp> namespace chart diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx index 17407d866a33..ec9940cf6b04 100644 --- a/chart2/source/view/charttypes/BarChart.cxx +++ b/chart2/source/view/charttypes/BarChart.cxx @@ -33,6 +33,7 @@ #include <com/sun/star/chart/DataLabelPlacement.hpp> +#include <com/sun/star/chart2/XTransformation.hpp> #include <com/sun/star/chart2/DataPointGeometry3D.hpp> #include <rtl/math.hxx> #include <unordered_set> diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx index ced8ddb2f657..ffd37cc57097 100644 --- a/chart2/source/view/charttypes/BubbleChart.cxx +++ b/chart2/source/view/charttypes/BubbleChart.cxx @@ -35,6 +35,7 @@ #include <com/sun/star/drawing/DoubleSequence.hpp> #include <com/sun/star/drawing/NormalsKind.hpp> #include <com/sun/star/lang/XServiceName.hpp> +#include <com/sun/star/drawing/XShapes.hpp> namespace chart { diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx index 1419c9ef4968..3b8bfd338a1d 100644 --- a/chart2/source/view/charttypes/CandleStickChart.cxx +++ b/chart2/source/view/charttypes/CandleStickChart.cxx @@ -20,6 +20,7 @@ #include "CandleStickChart.hxx" #include <ShapeFactory.hxx> #include <CommonConverters.hxx> +#include <ExplicitCategoriesProvider.hxx> #include <ObjectIdentifier.hxx> #include <LabelPositionHelper.hxx> #include "BarPositionHelper.hxx" diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx index 60309d08ad2a..644b168798e5 100644 --- a/chart2/source/view/charttypes/GL3DBarChart.cxx +++ b/chart2/source/view/charttypes/GL3DBarChart.cxx @@ -8,7 +8,8 @@ */ #include <GL3DBarChart.hxx> - +#include <vcl/opengl/OpenGLContext.hxx> +#include <vcl/idle.hxx> #include <epoxy/gl.h> #include <cmath> @@ -19,6 +20,8 @@ #include <GL3DRenderer.hxx> #include <ExplicitCategoriesProvider.hxx> #include <DataSeriesHelper.hxx> +#include <VDataSeries.hxx> +#include <salhelper/thread.hxx> #include <osl/time.h> #ifdef _WIN32 diff --git a/chart2/source/view/charttypes/NetChart.cxx b/chart2/source/view/charttypes/NetChart.cxx index 40cbf6a641ea..cbecb881b759 100644 --- a/chart2/source/view/charttypes/NetChart.cxx +++ b/chart2/source/view/charttypes/NetChart.cxx @@ -20,6 +20,7 @@ #include "NetChart.hxx" #include <PlottingPositionHelper.hxx> #include <AbstractShapeFactory.hxx> +#include <ExplicitCategoriesProvider.hxx> #include <CommonConverters.hxx> #include <ViewDefines.hxx> #include <ObjectIdentifier.hxx> @@ -39,6 +40,7 @@ #include <com/sun/star/drawing/DoubleSequence.hpp> #include <com/sun/star/drawing/NormalsKind.hpp> +#include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/lang/XServiceName.hpp> namespace chart diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index f3f1ef3e1cf9..7c24f5e0c4a3 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <BaseGFXHelper.hxx> +#include <VLineProperties.hxx> #include "PieChart.hxx" #include <PlottingPositionHelper.hxx> #include <AbstractShapeFactory.hxx> diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index f9c3ad0e94c6..011381e4db94 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -19,11 +19,13 @@ #include <memory> #include <VSeriesPlotter.hxx> +#include <VLineProperties.hxx> #include <AbstractShapeFactory.hxx> #include <chartview/ExplicitValueProvider.hxx> #include <svl/zformat.hxx> #include <CommonConverters.hxx> +#include <ExplicitCategoriesProvider.hxx> #include <ViewDefines.hxx> #include <ObjectIdentifier.hxx> #include <StatisticsHelper.hxx> @@ -52,6 +54,7 @@ #include <unonames.hxx> #include <SpecialCharacters.hxx> +#include <com/sun/star/chart2/DataPointLabel.hpp> #include <com/sun/star/chart/ErrorBarStyle.hpp> #include <com/sun/star/chart/TimeUnit.hpp> #include <com/sun/star/chart2/XDataPointCustomLabelField.hpp> diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx index 3baf5373e593..a545e84a485b 100644 --- a/chart2/source/view/diagram/VDiagram.cxx +++ b/chart2/source/view/diagram/VDiagram.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <AbstractShapeFactory.hxx> #include <VDiagram.hxx> #include <PropertyMapper.hxx> #include <ViewDefines.hxx> diff --git a/chart2/source/view/inc/3DChartObjects.hxx b/chart2/source/view/inc/3DChartObjects.hxx index 432137747424..15c0b22c3c9c 100644 --- a/chart2/source/view/inc/3DChartObjects.hxx +++ b/chart2/source/view/inc/3DChartObjects.hxx @@ -12,9 +12,7 @@ #include <glm/glm.hpp> #include <tools/color.hxx> -#include <vcl/bitmapex.hxx> -#include <vcl/opengl/OpenGLContext.hxx> #include "GL3DRenderer.hxx" #include <boost/shared_array.hpp> diff --git a/chart2/source/view/inc/AbstractShapeFactory.hxx b/chart2/source/view/inc/AbstractShapeFactory.hxx index e281e6291ebf..bc276de6fa0f 100644 --- a/chart2/source/view/inc/AbstractShapeFactory.hxx +++ b/chart2/source/view/inc/AbstractShapeFactory.hxx @@ -11,25 +11,26 @@ #define INCLUDED_CHART2_SOURCE_VIEW_INC_ABSTRACTSHAPEFACTORY_HXX #include "PropertyMapper.hxx" -#include "VLineProperties.hxx" -#include <BaseGFXHelper.hxx> +#include <basegfx/range/b2irectangle.hxx> #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/awt/Point.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/chart2/XFormattedString.hpp> -#include <com/sun/star/drawing/Direction3D.hpp> -#include <com/sun/star/drawing/HomogenMatrix.hpp> #include <com/sun/star/drawing/PointSequenceSequence.hpp> -#include <com/sun/star/drawing/PolyPolygonShape3D.hpp> -#include <com/sun/star/drawing/Position3D.hpp> -#include <com/sun/star/drawing/XDrawPage.hpp> -#include <com/sun/star/drawing/XShapes2.hpp> -#include <com/sun/star/graphic/XGraphic.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <rtl/ustring.hxx> class OpenGLWindow; +namespace chart { struct VLineProperties; } +namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } +namespace com { namespace sun { namespace star { namespace chart2 { class XFormattedString; } } } } +namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } } +namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } } +namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } } +namespace com { namespace sun { namespace star { namespace drawing { struct HomogenMatrix; } } } } +namespace com { namespace sun { namespace star { namespace drawing { struct PolyPolygonShape3D; } } } } +namespace com { namespace sun { namespace star { namespace drawing { struct Position3D; } } } } +namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; } } } } +namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } +namespace com { namespace sun { namespace star { namespace drawing { struct Direction3D; } } } } namespace chart { diff --git a/chart2/source/view/inc/Clipping.hxx b/chart2/source/view/inc/Clipping.hxx index e99c1c1d90f7..9241fddd99a8 100644 --- a/chart2/source/view/inc/Clipping.hxx +++ b/chart2/source/view/inc/Clipping.hxx @@ -21,7 +21,8 @@ #define INCLUDED_CHART2_SOURCE_VIEW_INC_CLIPPING_HXX #include <basegfx/range/b2drectangle.hxx> -#include <com/sun/star/drawing/PolyPolygonShape3D.hpp> + +namespace com { namespace sun { namespace star { namespace drawing { struct PolyPolygonShape3D; } } } } namespace chart { diff --git a/chart2/source/view/inc/DateHelper.hxx b/chart2/source/view/inc/DateHelper.hxx index 099985533853..bfd549b22142 100644 --- a/chart2/source/view/inc/DateHelper.hxx +++ b/chart2/source/view/inc/DateHelper.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_CHART2_SOURCE_VIEW_INC_DATEHELPER_HXX #define INCLUDED_CHART2_SOURCE_VIEW_INC_DATEHELPER_HXX -#include <com/sun/star/chart2/XScaling.hpp> #include <tools/date.hxx> namespace chart diff --git a/chart2/source/view/inc/GL3DBarChart.hxx b/chart2/source/view/inc/GL3DBarChart.hxx index 0c244a335b5a..bb31428d7db1 100644 --- a/chart2/source/view/inc/GL3DBarChart.hxx +++ b/chart2/source/view/inc/GL3DBarChart.hxx @@ -15,18 +15,19 @@ #include <deque> #include <memory> #include <vector> -#include "VDataSeries.hxx" #include <glm/glm.hpp> -#include <vcl/timer.hxx> #include <vcl/idle.hxx> #include <vcl/openglwin.hxx> #include <rtl/ref.hxx> -#include <salhelper/thread.hxx> + #include <osl/conditn.hxx> +namespace com { namespace sun { namespace star { namespace chart2 { class XChartType; } } } } +class Timer; + namespace chart { class ExplicitCategoriesProvider; diff --git a/chart2/source/view/inc/GL3DPlotterBase.hxx b/chart2/source/view/inc/GL3DPlotterBase.hxx index c403389fc8f4..33c5deda360d 100644 --- a/chart2/source/view/inc/GL3DPlotterBase.hxx +++ b/chart2/source/view/inc/GL3DPlotterBase.hxx @@ -10,13 +10,13 @@ #ifndef INCLUDED_CHART2_SOURCE_VIEW_INC_GL3DPLOTTERBASE_HXX #define INCLUDED_CHART2_SOURCE_VIEW_INC_GL3DPLOTTERBASE_HXX -#include "VDataSeries.hxx" #include <vector> #include <memory> namespace chart { class ExplicitCategoriesProvider; +class VDataSeries; class GL3DPlotterBase { diff --git a/chart2/source/view/inc/GL3DRenderer.hxx b/chart2/source/view/inc/GL3DRenderer.hxx index 9dc860229aee..2fcef5c309e5 100644 --- a/chart2/source/view/inc/GL3DRenderer.hxx +++ b/chart2/source/view/inc/GL3DRenderer.hxx @@ -15,14 +15,14 @@ #include <glm/gtx/euler_angles.hpp> #include <glm/gtx/quaternion.hpp> -#include <com/sun/star/awt/Point.hpp> #include <boost/shared_array.hpp> #include <tools/gen.hxx> +#include <tools/color.hxx> +#include <string.h> -#include <vcl/bitmapex.hxx> +#include <epoxy/gl.h> #include <vector> -#include <list> #include <map> namespace chart { diff --git a/chart2/source/view/inc/LabelPositionHelper.hxx b/chart2/source/view/inc/LabelPositionHelper.hxx index 36b2720dc845..48b5ab72c73a 100644 --- a/chart2/source/view/inc/LabelPositionHelper.hxx +++ b/chart2/source/view/inc/LabelPositionHelper.hxx @@ -23,8 +23,11 @@ #include "LabelAlignment.hxx" #include "PropertyMapper.hxx" #include <com/sun/star/awt/Point.hpp> -#include <com/sun/star/drawing/Position3D.hpp> -#include <com/sun/star/drawing/XShapes.hpp> + +namespace com { namespace sun { namespace star { namespace drawing { struct Position3D; } } } } +namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } } +namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } } +namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } } namespace chart { diff --git a/chart2/source/view/inc/LegendEntryProvider.hxx b/chart2/source/view/inc/LegendEntryProvider.hxx index 4b0d3c597d6f..3ad8a94b8832 100644 --- a/chart2/source/view/inc/LegendEntryProvider.hxx +++ b/chart2/source/view/inc/LegendEntryProvider.hxx @@ -19,16 +19,19 @@ #ifndef INCLUDED_CHART2_SOURCE_VIEW_INC_LEGENDENTRYPROVIDER_HXX #define INCLUDED_CHART2_SOURCE_VIEW_INC_LEGENDENTRYPROVIDER_HXX -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/chart/ChartLegendExpansion.hpp> -#include <com/sun/star/chart2/XFormattedString2.hpp> -#include <com/sun/star/drawing/XShape.hpp> -#include <com/sun/star/drawing/XShapes.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> - +#include <com/sun/star/awt/Size.hpp> +#include <com/sun/star/uno/Reference.h> +#include <com/sun/star/uno/Sequence.h> #include <vector> +namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } +namespace com { namespace sun { namespace star { namespace chart2 { class XFormattedString2; } } } } +namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } } +namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } } +namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } + namespace chart { diff --git a/chart2/source/view/inc/PlotterBase.hxx b/chart2/source/view/inc/PlotterBase.hxx index a6753561348e..788992dc3de3 100644 --- a/chart2/source/view/inc/PlotterBase.hxx +++ b/chart2/source/view/inc/PlotterBase.hxx @@ -19,18 +19,16 @@ #ifndef INCLUDED_CHART2_SOURCE_VIEW_INC_PLOTTERBASE_HXX #define INCLUDED_CHART2_SOURCE_VIEW_INC_PLOTTERBASE_HXX -#include <chartview/ExplicitScaleValues.hxx> +#include <com/sun/star/uno/Reference.h> +#include <rtl/ustring.hxx> +#include <vector> -#include <com/sun/star/drawing/HomogenMatrix.hpp> -#include <com/sun/star/drawing/XShapes.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/drawing/Position3D.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/chart2/XTransformation.hpp> +namespace com { namespace sun { namespace star { namespace drawing { struct HomogenMatrix; } } } } +namespace com { namespace sun { namespace star { namespace drawing { struct Position3D; } } } } +namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } } +namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } -#include <vector> +namespace chart { struct ExplicitScaleData; } namespace chart { diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx b/chart2/source/view/inc/PlottingPositionHelper.hxx index bbfa8eebc7bd..bce3ceefeb9b 100644 --- a/chart2/source/view/inc/PlottingPositionHelper.hxx +++ b/chart2/source/view/inc/PlottingPositionHelper.hxx @@ -19,18 +19,20 @@ #ifndef INCLUDED_CHART2_SOURCE_VIEW_INC_PLOTTINGPOSITIONHELPER_HXX #define INCLUDED_CHART2_SOURCE_VIEW_INC_PLOTTINGPOSITIONHELPER_HXX -#include "LabelAlignment.hxx" #include <chartview/ExplicitScaleValues.hxx> #include <basegfx/range/b2drectangle.hxx> #include <rtl/math.hxx> -#include <com/sun/star/chart2/XTransformation.hpp> #include <com/sun/star/drawing/Direction3D.hpp> -#include <com/sun/star/drawing/HomogenMatrix.hpp> -#include <com/sun/star/drawing/PolyPolygonShape3D.hpp> #include <com/sun/star/drawing/Position3D.hpp> -#include <com/sun/star/drawing/XShapes.hpp> #include <basegfx/matrix/b3dhommatrix.hxx> +#include <com/sun/star/awt/Point.hpp> +#include <com/sun/star/uno/Sequence.h> + +namespace com { namespace sun { namespace star { namespace chart2 { class XTransformation; } } } } +namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } } +namespace com { namespace sun { namespace star { namespace drawing { struct HomogenMatrix; } } } } +namespace com { namespace sun { namespace star { namespace drawing { struct PolyPolygonShape3D; } } } } namespace chart { diff --git a/chart2/source/view/inc/PolarLabelPositionHelper.hxx b/chart2/source/view/inc/PolarLabelPositionHelper.hxx index 593a35b52fd5..9119889643c4 100644 --- a/chart2/source/view/inc/PolarLabelPositionHelper.hxx +++ b/chart2/source/view/inc/PolarLabelPositionHelper.hxx @@ -22,7 +22,6 @@ #include "LabelPositionHelper.hxx" #include <com/sun/star/awt/Point.hpp> -#include <com/sun/star/drawing/Position3D.hpp> namespace chart { diff --git a/chart2/source/view/inc/PropertyMapper.hxx b/chart2/source/view/inc/PropertyMapper.hxx index 20f2356d4347..94b3a1c6b60b 100644 --- a/chart2/source/view/inc/PropertyMapper.hxx +++ b/chart2/source/view/inc/PropertyMapper.hxx @@ -23,11 +23,13 @@ #include <map> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/drawing/XShape.hpp> +#include <com/sun/star/uno/Sequence.h> +#include <com/sun/star/uno/Reference.h> #include <charttoolsdllapi.hxx> +namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } + namespace chart { diff --git a/chart2/source/view/inc/ScaleAutomatism.hxx b/chart2/source/view/inc/ScaleAutomatism.hxx index 2819a70eb1cc..df2e203bc0d6 100644 --- a/chart2/source/view/inc/ScaleAutomatism.hxx +++ b/chart2/source/view/inc/ScaleAutomatism.hxx @@ -19,11 +19,13 @@ #ifndef INCLUDED_CHART2_SOURCE_VIEW_INC_SCALEAUTOMATISM_HXX #define INCLUDED_CHART2_SOURCE_VIEW_INC_SCALEAUTOMATISM_HXX -#include <chartview/ExplicitScaleValues.hxx> #include <com/sun/star/chart2/ScaleData.hpp> #include <tools/date.hxx> +namespace chart { struct ExplicitIncrementData; } +namespace chart { struct ExplicitScaleData; } + namespace chart { diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx index 7a4a7110a2e4..ba571bd6992c 100644 --- a/chart2/source/view/inc/VCoordinateSystem.hxx +++ b/chart2/source/view/inc/VCoordinateSystem.hxx @@ -20,22 +20,26 @@ #define INCLUDED_CHART2_SOURCE_VIEW_INC_VCOORDINATESYSTEM_HXX #include "MinimumAndMaximumSupplier.hxx" -#include "ScaleAutomatism.hxx" #include <ThreeDHelper.hxx> -#include <ExplicitCategoriesProvider.hxx> #include <chartview/ExplicitScaleValues.hxx> - -#include <com/sun/star/chart2/XCoordinateSystem.hpp> -#include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/drawing/HomogenMatrix.hpp> -#include <com/sun/star/drawing/XShapes.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <map> #include <memory> #include <vector> +namespace chart { class ExplicitCategoriesProvider; } +namespace chart { class ScaleAutomatism; } +namespace com { namespace sun { namespace star { namespace awt { struct Rectangle; } } } } +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 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 drawing { class XShapes; } } } } +namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } + + namespace chart { diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx index 1566c642c745..4a20eb79bfea 100644 --- a/chart2/source/view/inc/VDataSeries.hxx +++ b/chart2/source/view/inc/VDataSeries.hxx @@ -21,22 +21,21 @@ #include "PropertyMapper.hxx" -#include <com/sun/star/chart2/DataPointLabel.hpp> -#include <com/sun/star/chart2/Symbol.hpp> #include <com/sun/star/chart2/StackingDirection.hpp> -#include <com/sun/star/chart2/data/XLabeledDataSequence.hpp> -#include <com/sun/star/chart2/XChartType.hpp> -#include <com/sun/star/chart2/XDataSeries.hpp> -#include <com/sun/star/drawing/HomogenMatrix.hpp> #include <com/sun/star/drawing/PolyPolygonShape3D.hpp> -#include <com/sun/star/drawing/XShape.hpp> -#include <com/sun/star/drawing/XShapes.hpp> -#include <cppuhelper/weakref.hxx> +#include <com/sun/star/awt/Size.hpp> #include <memory> -#include <vector> #include <map> +namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } +namespace com { namespace sun { namespace star { namespace chart2 { class XChartType; } } } } +namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } } +namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XDataSequence; } } } } } +namespace com { namespace sun { namespace star { namespace chart2 { struct DataPointLabel; } } } } +namespace com { namespace sun { namespace star { namespace chart2 { struct Symbol; } } } } +namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } } + namespace chart { diff --git a/chart2/source/view/inc/VDiagram.hxx b/chart2/source/view/inc/VDiagram.hxx index f867a0a2f4b1..4c960776a59e 100644 --- a/chart2/source/view/inc/VDiagram.hxx +++ b/chart2/source/view/inc/VDiagram.hxx @@ -19,11 +19,17 @@ #ifndef INCLUDED_CHART2_SOURCE_VIEW_INC_VDIAGRAM_HXX #define INCLUDED_CHART2_SOURCE_VIEW_INC_VDIAGRAM_HXX -#include <com/sun/star/drawing/HomogenMatrix.hpp> #include <com/sun/star/drawing/XShapes.hpp> -#include <com/sun/star/chart2/XDiagram.hpp> -#include "AbstractShapeFactory.hxx" #include <basegfx/range/b2irectangle.hxx> +#include <com/sun/star/drawing/Direction3D.hpp> +#include <com/sun/star/awt/Size.hpp> +#include <com/sun/star/awt/Point.hpp> + +namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } +namespace com { namespace sun { namespace star { namespace chart2 { class XDiagram; } } } } +namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } +namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } } + namespace chart { diff --git a/chart2/source/view/inc/VLegendSymbolFactory.hxx b/chart2/source/view/inc/VLegendSymbolFactory.hxx index e5ff577bfb07..6690b9464966 100644 --- a/chart2/source/view/inc/VLegendSymbolFactory.hxx +++ b/chart2/source/view/inc/VLegendSymbolFactory.hxx @@ -20,9 +20,14 @@ #define INCLUDED_CHART2_SOURCE_VIEW_INC_VLEGENDSYMBOLFACTORY_HXX #include "LegendEntryProvider.hxx" -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/drawing/XShapes.hpp> +#include <com/sun/star/uno/Reference.h> + +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 drawing { class XShape; } } } } +namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } } +namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } +namespace com { namespace sun { namespace star { namespace uno { class Any; } } } } namespace chart { diff --git a/chart2/source/view/inc/VLineProperties.hxx b/chart2/source/view/inc/VLineProperties.hxx index 2e16ed29c8af..e2fe6e5e37c3 100644 --- a/chart2/source/view/inc/VLineProperties.hxx +++ b/chart2/source/view/inc/VLineProperties.hxx @@ -20,7 +20,10 @@ #ifndef INCLUDED_CHART2_SOURCE_VIEW_INC_VLINEPROPERTIES_HXX #define INCLUDED_CHART2_SOURCE_VIEW_INC_VLINEPROPERTIES_HXX -#include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/uno/Any.h> +#include <com/sun/star/uno/Reference.h> + +namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } namespace chart { diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx index 6613596cbb74..afe4fb9bdcea 100644 --- a/chart2/source/view/inc/VSeriesPlotter.hxx +++ b/chart2/source/view/inc/VSeriesPlotter.hxx @@ -25,10 +25,15 @@ #include "LabelAlignment.hxx" #include "MinimumAndMaximumSupplier.hxx" #include "LegendEntryProvider.hxx" -#include <ExplicitCategoriesProvider.hxx> -#include <com/sun/star/chart2/XChartType.hpp> #include <com/sun/star/drawing/Direction3D.hpp> +namespace com { namespace sun { namespace star { namespace awt { struct Point; } } } } +namespace com { namespace sun { namespace star { namespace chart2 { class XChartType; } } } } + + +namespace chart { class ExplicitCategoriesProvider; } +namespace chart { struct ExplicitScaleData; } + namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; diff --git a/chart2/source/view/main/AbstractShapeFactory.cxx b/chart2/source/view/main/AbstractShapeFactory.cxx index 87a09efa1810..840878e2200f 100644 --- a/chart2/source/view/main/AbstractShapeFactory.cxx +++ b/chart2/source/view/main/AbstractShapeFactory.cxx @@ -25,6 +25,8 @@ #include <com/sun/star/drawing/ShadeMode.hpp> #include <com/sun/star/drawing/TextFitToSizeType.hpp> #include <com/sun/star/drawing/TextureProjectionMode.hpp> +#include <com/sun/star/drawing/XShapes.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/text/XText.hpp> #include <com/sun/star/uno/Any.hxx> @@ -35,6 +37,7 @@ #include <svx/svdopath.hxx> #include <vcl/svapp.hxx> +#include <BaseGFXHelper.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b3dhommatrix.hxx> diff --git a/chart2/source/view/main/DataPointSymbolSupplier.cxx b/chart2/source/view/main/DataPointSymbolSupplier.cxx index 54ba3f7eb8c6..fa0f4abffa8e 100644 --- a/chart2/source/view/main/DataPointSymbolSupplier.cxx +++ b/chart2/source/view/main/DataPointSymbolSupplier.cxx @@ -19,6 +19,7 @@ #include <chartview/DataPointSymbolSupplier.hxx> #include <AbstractShapeFactory.hxx> +#include <com/sun/star/drawing/Position3D.hpp> namespace chart { diff --git a/chart2/source/view/main/LabelPositionHelper.cxx b/chart2/source/view/main/LabelPositionHelper.cxx index 29dfc3259d4b..111a396a4b49 100644 --- a/chart2/source/view/main/LabelPositionHelper.cxx +++ b/chart2/source/view/main/LabelPositionHelper.cxx @@ -25,6 +25,7 @@ #include <RelativeSizeHelper.hxx> #include <com/sun/star/drawing/TextVerticalAdjust.hpp> #include <com/sun/star/drawing/TextHorizontalAdjust.hpp> +#include <com/sun/star/drawing/XShape.hpp> namespace chart { diff --git a/chart2/source/view/main/PlottingPositionHelper.cxx b/chart2/source/view/main/PlottingPositionHelper.cxx index 8232ec5a6591..9ad4f4465e53 100644 --- a/chart2/source/view/main/PlottingPositionHelper.cxx +++ b/chart2/source/view/main/PlottingPositionHelper.cxx @@ -31,6 +31,7 @@ #include <com/sun/star/chart2/AxisType.hpp> #include <com/sun/star/drawing/DoubleSequence.hpp> #include <com/sun/star/drawing/Position3D.hpp> +#include <com/sun/star/drawing/XShapes.hpp> #include <rtl/math.hxx> diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx index 6241563e82fa..4a4c65833c59 100644 --- a/chart2/source/view/main/PropertyMapper.cxx +++ b/chart2/source/view/main/PropertyMapper.cxx @@ -21,6 +21,7 @@ #include <unonames.hxx> #include <com/sun/star/beans/XMultiPropertySet.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/drawing/TextVerticalAdjust.hpp> #include <com/sun/star/drawing/TextHorizontalAdjust.hpp> diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx index 738a52a3cabb..f92742727165 100644 --- a/chart2/source/view/main/ShapeFactory.cxx +++ b/chart2/source/view/main/ShapeFactory.cxx @@ -23,8 +23,10 @@ #include <CommonConverters.hxx> #include <RelativeSizeHelper.hxx> #include <PropertyMapper.hxx> +#include <VLineProperties.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> +#include <com/sun/star/chart2/XFormattedString.hpp> #include <com/sun/star/drawing/CircleKind.hpp> #include <com/sun/star/drawing/DoubleSequence.hpp> #include <com/sun/star/drawing/FlagSequence.hpp> @@ -40,7 +42,11 @@ #include <com/sun/star/drawing/TextHorizontalAdjust.hpp> #include <com/sun/star/drawing/TextureProjectionMode.hpp> #include <com/sun/star/drawing/TextVerticalAdjust.hpp> +#include <com/sun/star/drawing/XShapes2.hpp> +#include <com/sun/star/graphic/XGraphic.hpp> +#include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/style/ParagraphAdjust.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/text/XText.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Any.hxx> diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index f1b06799bed9..80655b8bd31e 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -28,6 +28,7 @@ #include <unonames.hxx> #include <com/sun/star/chart/MissingValueTreatment.hpp> +#include <com/sun/star/chart2/DataPointLabel.hpp> #include <com/sun/star/chart2/Symbol.hpp> #include <rtl/math.hxx> diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx index 15494a12f27c..17889044e591 100644 --- a/chart2/source/view/main/VLegend.cxx +++ b/chart2/source/view/main/VLegend.cxx @@ -36,6 +36,7 @@ #include <com/sun/star/chart/ChartLegendExpansion.hpp> #include <com/sun/star/chart2/LegendPosition.hpp> #include <com/sun/star/chart2/RelativePosition.hpp> +#include <com/sun/star/chart2/XFormattedString2.hpp> #include <com/sun/star/chart2/data/XPivotTableDataProvider.hpp> #include <com/sun/star/chart2/data/PivotTableFieldEntry.hpp> #include <rtl/ustrbuf.hxx> diff --git a/chart2/source/view/main/VLegendSymbolFactory.cxx b/chart2/source/view/main/VLegendSymbolFactory.cxx index f2f49f22e6d6..cae5ee197144 100644 --- a/chart2/source/view/main/VLegendSymbolFactory.cxx +++ b/chart2/source/view/main/VLegendSymbolFactory.cxx @@ -22,7 +22,10 @@ #include <AbstractShapeFactory.hxx> #include <ObjectIdentifier.hxx> #include <com/sun/star/drawing/LineStyle.hpp> +#include <com/sun/star/drawing/Position3D.hpp> #include <com/sun/star/chart2/Symbol.hpp> +#include <com/sun/star/drawing/XShapes.hpp> +#include <com/sun/star/drawing/Direction3D.hpp> #include <tools/diagnose_ex.h> using namespace ::com::sun::star; diff --git a/chart2/source/view/main/VLineProperties.cxx b/chart2/source/view/main/VLineProperties.cxx index e694410ad298..2f79f0e56391 100644 --- a/chart2/source/view/main/VLineProperties.cxx +++ b/chart2/source/view/main/VLineProperties.cxx @@ -19,6 +19,7 @@ #include <VLineProperties.hxx> #include <com/sun/star/drawing/LineStyle.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> namespace chart { |