diff options
Diffstat (limited to 'chart2')
34 files changed, 46 insertions, 8 deletions
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx index b0a1d5f85746..b15f33f1871a 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx @@ -34,6 +34,9 @@ #include <com/sun/star/chart/ChartAxisPosition.hpp> #include <com/sun/star/chart/ChartAxisLabelPosition.hpp> #include <com/sun/star/chart/ChartAxisMarkPosition.hpp> +#include <com/sun/star/chart2/XAxis.hpp> +#include <com/sun/star/chart2/XDiagram.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <CharacterProperties.hxx> #include <LinePropertiesHelper.hxx> diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx index a4239d10ce22..7b9d07f002bb 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx @@ -19,6 +19,8 @@ #include "WrappedAxisAndGridExistenceProperties.hxx" #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/chart2/XAxis.hpp> +#include <com/sun/star/chart2/XDiagram.hpp> #include <AxisHelper.hxx> #include <WrappedProperty.hxx> #include "Chart2ModelContact.hxx" diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx index 2b599040dced..95759509c563 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/chart2/SymbolStyle.hpp> #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> +#include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/chart/ChartSymbolType.hpp> #include <com/sun/star/drawing/LineStyle.hpp> #include <vcl/GraphicLoader.hxx> diff --git a/chart2/source/controller/dialogs/TitleDialogData.cxx b/chart2/source/controller/dialogs/TitleDialogData.cxx index 907bc7324fda..e4e9099011a6 100644 --- a/chart2/source/controller/dialogs/TitleDialogData.cxx +++ b/chart2/source/controller/dialogs/TitleDialogData.cxx @@ -17,6 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <com/sun/star/frame/XModel.hpp> + #include <TitleDialogData.hxx> #include <TitleHelper.hxx> #include <ChartModelHelper.hxx> diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index bc85e6c418b0..3cb9598cb2e9 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -22,6 +22,7 @@ #include <comphelper/stl_types.hxx> #include <com/sun/star/awt/XWindow.hpp> +#include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/frame/XStorable.hpp> using namespace ::com::sun::star; diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx index 7acd590c6ed1..a7aeb35d72d6 100644 --- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx @@ -27,6 +27,7 @@ #include <AxisHelper.hxx> #include <ObjectNameProvider.hxx> +#include <com/sun/star/frame/XModel.hpp> #include <comphelper/servicehelper.hxx> using ::com::sun::star::uno::Reference; diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx index 311182615935..b81b7ecacbf1 100644 --- a/chart2/source/controller/dialogs/dlg_View3D.cxx +++ b/chart2/source/controller/dialogs/dlg_View3D.cxx @@ -25,6 +25,8 @@ #include "tp_3D_SceneIllumination.hxx" #include <ChartModelHelper.hxx> #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/chart2/XDiagram.hpp> +#include <com/sun/star/frame/XModel.hpp> namespace chart { diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx index 1168fe0f18c7..c24cf6fab0d9 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx @@ -22,7 +22,9 @@ #include <ThreeDHelper.hxx> #include <ControllerLockGuard.hxx> #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/chart2/XDiagram.hpp> #include <com/sun/star/drawing/ShadeMode.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <tools/diagnose_ex.h> #include <vcl/svapp.hxx> diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index eb22751a0ec3..d09fcf81ff87 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -28,7 +28,10 @@ #include "DialogModel.hxx" #include <TabPageNotifiable.hxx> #include <com/sun/star/chart2/XChartType.hpp> +#include <com/sun/star/chart2/XDataSeries.hpp> +#include <com/sun/star/chart2/XDataSeriesContainer.hpp> #include <com/sun/star/chart2/data/XDataProvider.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/chart2/data/XDataSink.hpp> diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx index 303af1ceb26f..d60b259dad62 100644 --- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx +++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx @@ -36,6 +36,7 @@ #include <editeng/fhgtitem.hxx> #include <com/sun/star/container/XChild.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <sfx2/objsh.hxx> diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx index 59ebe40c27fd..da0a880626b0 100644 --- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx @@ -37,6 +37,7 @@ #include <com/sun/star/chart/ChartAxisPosition.hpp> #include <com/sun/star/chart/TimeInterval.hpp> #include <com/sun/star/chart2/XAxis.hpp> +#include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart2/AxisOrientation.hpp> #include <com/sun/star/chart2/AxisType.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx index a931151e1c2c..4920d2b727e0 100644 --- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx @@ -37,7 +37,7 @@ #include <com/sun/star/chart2/Symbol.hpp> #include <com/sun/star/chart2/RelativePosition.hpp> #include <com/sun/star/beans/XPropertySet.hpp> - +#include <com/sun/star/frame/XModel.hpp> #include <svx/xflclit.hxx> #include <svl/eitem.hxx> #include <svl/intitem.hxx> diff --git a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx index 63ab0723ee34..244cbf9a23bb 100644 --- a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx +++ b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx @@ -30,6 +30,8 @@ #include <AxisHelper.hxx> #include <chartview/ExplicitValueProvider.hxx> #include <com/sun/star/chart2/XChartDocument.hpp> +#include <com/sun/star/chart2/XDataSeries.hpp> +#include <com/sun/star/chart2/XTitle.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/chart2/XAxis.hpp> diff --git a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx index 21ac2411bf0c..496b25e2692f 100644 --- a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx @@ -43,6 +43,7 @@ #include <com/sun/star/chart2/DataPointLabel.hpp> #include <com/sun/star/chart2/Symbol.hpp> #include <com/sun/star/chart2/RelativePosition.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <memory> using namespace com::sun::star; diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx index cb98c4e7462a..9814a5db6595 100644 --- a/chart2/source/controller/main/DragMethod_PieSegment.cxx +++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx @@ -25,6 +25,7 @@ #include <ObjectIdentifier.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/awt/Point.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <basegfx/matrix/b2dhommatrix.hxx> #include <tools/diagnose_ex.h> diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx index 6868f68a191e..7501f0bf7204 100644 --- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx +++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx @@ -31,6 +31,7 @@ #include <svx/scene3d.hxx> #include <basegfx/matrix/b3dhommatrix.hxx> #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <svx/sdr/contact/viewcontactofe3dscene.hxx> #include <drawinglayer/geometry/viewinformation3d.hxx> diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx index e872964a38b8..bf7c812b16b1 100644 --- a/chart2/source/controller/main/ObjectHierarchy.cxx +++ b/chart2/source/controller/main/ObjectHierarchy.cxx @@ -34,6 +34,7 @@ #include <algorithm> #include <iterator> +#include <com/sun/star/drawing/XDrawPage.hpp> #include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/chart2/XTitled.hpp> #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> diff --git a/chart2/source/controller/main/PositionAndSizeHelper.cxx b/chart2/source/controller/main/PositionAndSizeHelper.cxx index c1e0e14441bd..84e4325e3ef2 100644 --- a/chart2/source/controller/main/PositionAndSizeHelper.cxx +++ b/chart2/source/controller/main/PositionAndSizeHelper.cxx @@ -21,9 +21,10 @@ #include <ControllerLockGuard.hxx> #include <com/sun/star/chart2/LegendPosition.hpp> #include <com/sun/star/chart/ChartLegendExpansion.hpp> +#include <com/sun/star/chart2/XDiagram.hpp> #include <com/sun/star/chart2/RelativePosition.hpp> #include <com/sun/star/chart2/RelativeSize.hpp> - +#include <com/sun/star/frame/XModel.hpp> #include <tools/gen.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/awt/Rectangle.hpp> diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx index 5065a5768736..5475be204c00 100644 --- a/chart2/source/controller/main/SelectionHelper.cxx +++ b/chart2/source/controller/main/SelectionHelper.cxx @@ -22,6 +22,7 @@ #include <DiagramHelper.hxx> #include <ChartModelHelper.hxx> +#include <com/sun/star/frame/XModel.hpp> #include <svx/svdpage.hxx> #include <svx/svditer.hxx> #include <svx/obj3d.hxx> diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index 76559121c11c..8161717fe339 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -24,7 +24,7 @@ #include <dlg_ShapeFont.hxx> #include <dlg_ShapeParagraph.hxx> #include <chartview/DrawModelWrapper.hxx> - +#include <com/sun/star/drawing/XDrawPage.hpp> #include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/frame/CommandGroup.hpp> #include <com/sun/star/frame/XStorable.hpp> diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx index 6cb42ff88f61..e4bd85a3be34 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.cxx +++ b/chart2/source/controller/main/UndoCommandDispatch.cxx @@ -19,6 +19,7 @@ #include "UndoCommandDispatch.hxx" +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> #include <com/sun/star/document/UndoFailedException.hpp> #include <com/sun/star/document/XUndoManagerSupplier.hpp> diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx index ffc694fbd5df..dce1ffbb09d9 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.cxx +++ b/chart2/source/model/template/BarChartTypeTemplate.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/chart2/DataPointGeometry3D.hpp> +#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <tools/diagnose_ex.h> diff --git a/chart2/source/tools/ChartViewHelper.cxx b/chart2/source/tools/ChartViewHelper.cxx index 872960f17e41..a341f8894f14 100644 --- a/chart2/source/tools/ChartViewHelper.cxx +++ b/chart2/source/tools/ChartViewHelper.cxx @@ -20,6 +20,7 @@ #include <ChartViewHelper.hxx> #include <servicenames.hxx> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/XModifyListener.hpp> diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx index 3dbcd65f70a2..a772f11c5fb1 100644 --- a/chart2/source/tools/DataSeriesHelper.cxx +++ b/chart2/source/tools/DataSeriesHelper.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/chart2/AxisType.hpp> #include <com/sun/star/chart2/SymbolStyle.hpp> #include <com/sun/star/chart2/Symbol.hpp> +#include <com/sun/star/chart2/XDiagram.hpp> #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx index 5ac9ba648e60..5817db73a2e1 100644 --- a/chart2/source/tools/LifeTime.cxx +++ b/chart2/source/tools/LifeTime.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/util/CloseVetoException.hpp> #include <com/sun/star/util/XCloseListener.hpp> +#include <com/sun/star/util/XCloseable.hpp> #include <tools/diagnose_ex.h> #include <sal/log.hxx> diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx index ea49fc64a07f..9efdbc5d439b 100644 --- a/chart2/source/tools/RangeHighlighter.cxx +++ b/chart2/source/tools/RangeHighlighter.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/chart2/ScaleData.hpp> #include <com/sun/star/chart2/XAxis.hpp> +#include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/chart/ErrorBarStyle.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/drawing/XShape.hpp> diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx index 7cd07d911703..865acc660c08 100644 --- a/chart2/source/tools/ReferenceSizeProvider.cxx +++ b/chart2/source/tools/ReferenceSizeProvider.cxx @@ -22,7 +22,7 @@ #include <ChartModelHelper.hxx> #include <DiagramHelper.hxx> #include <AxisHelper.hxx> - +#include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart2/XTitled.hpp> #include <com/sun/star/chart2/XTitle.hpp> #include <com/sun/star/chart2/XDataSeries.hpp> diff --git a/chart2/source/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx index f90edf2fe15a..02dab3b9bd89 100644 --- a/chart2/source/tools/StatisticsHelper.cxx +++ b/chart2/source/tools/StatisticsHelper.cxx @@ -25,7 +25,7 @@ #include <rtl/math.hxx> #include <rtl/ustrbuf.hxx> #include <comphelper/processfactory.hxx> - +#include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/chart2/data/LabeledDataSequence.hpp> #include <com/sun/star/chart2/data/XNumericalDataSequence.hpp> #include <com/sun/star/chart2/data/XDataProvider.hpp> diff --git a/chart2/source/tools/WrappedDefaultProperty.cxx b/chart2/source/tools/WrappedDefaultProperty.cxx index 6638654e76c1..74d2b4b0aae0 100644 --- a/chart2/source/tools/WrappedDefaultProperty.cxx +++ b/chart2/source/tools/WrappedDefaultProperty.cxx @@ -21,8 +21,7 @@ #include <tools/diagnose_ex.h> #include <com/sun/star/beans/XPropertySet.hpp> - -namespace com::sun::star::beans { class XPropertyState; } +#include <com/sun/star/beans/XPropertyState.hpp> using namespace ::com::sun::star; diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx index 164a9147cc4f..6e6f40b65684 100644 --- a/chart2/source/view/axes/VAxisBase.cxx +++ b/chart2/source/view/axes/VAxisBase.cxx @@ -23,6 +23,7 @@ #include "Tickmarks.hxx" #include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/chart2/AxisType.hpp> +#include <com/sun/star/chart2/XAxis.hpp> #include <com/sun/star/chart2/data/XTextualDataSequence.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index 37c503eac30f..1c62bfb93903 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -29,7 +29,7 @@ #include "Tickmarks_Equidistant.hxx" #include <ExplicitCategoriesProvider.hxx> #include <com/sun/star/chart2/AxisType.hpp> - +#include <com/sun/star/chart2/XAxis.hpp> #include <rtl/math.hxx> #include <tools/diagnose_ex.h> #include <tools/color.hxx> diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx b/chart2/source/view/axes/VPolarAngleAxis.cxx index f9b7399694b0..1a93888b7428 100644 --- a/chart2/source/view/axes/VPolarAngleAxis.cxx +++ b/chart2/source/view/axes/VPolarAngleAxis.cxx @@ -25,6 +25,7 @@ #include <NumberFormatterWrapper.hxx> #include <PolarLabelPositionHelper.hxx> #include <PlottingPositionHelper.hxx> +#include <com/sun/star/chart2/XAxis.hpp> #include <tools/color.hxx> #include <memory> diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx index 4204ab3fecfa..a82c8896592b 100644 --- a/chart2/source/view/charttypes/CandleStickChart.cxx +++ b/chart2/source/view/charttypes/CandleStickChart.cxx @@ -25,6 +25,7 @@ #include "BarPositionHelper.hxx" #include <DateHelper.hxx> #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/drawing/XShape.hpp> #include <tools/diagnose_ex.h> #include <osl/diagnose.h> diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index 0e3829c00ab2..009552c1800f 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -27,6 +27,7 @@ #include <ObjectIdentifier.hxx> #include <com/sun/star/chart/DataLabelPlacement.hpp> +#include <com/sun/star/chart2/XChartType.hpp> #include <com/sun/star/chart2/XColorScheme.hpp> #include <com/sun/star/container/XChild.hpp> |