diff options
author | Gabor Kelemen <kelemeng@ubuntu.com> | 2018-08-22 00:10:54 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-08-28 09:45:02 +0200 |
commit | d26d9fd652a07fb8c708c162355a15ec3b3f72d0 (patch) | |
tree | a7a5b793744a5fc8cfd26b6269157560dd24df76 | |
parent | 24534b101c713a04c9ab12570d9124037643e644 (diff) |
tdf#42949 Fix IWYU warnings in chart2/source/inc/[l-z]*
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Some only-recently analyzed files were cleaned.
Also tried harder to use more fw decls instead of blacklisting
Change-Id: Ie4f8eb7065e44a2b5208d6da4fa8e3681a31820b
Reviewed-on: https://gerrit.libreoffice.org/59420
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
105 files changed, 239 insertions, 111 deletions
diff --git a/chart2/IwyuFilter_chart2.yaml b/chart2/IwyuFilter_chart2.yaml index 07848d8a6622..dddaf9547596 100644 --- a/chart2/IwyuFilter_chart2.yaml +++ b/chart2/IwyuFilter_chart2.yaml @@ -87,18 +87,13 @@ blacklist: - com/sun/star/lang/XInitialization.hpp - com/sun/star/lang/XServiceInfo.hpp - com/sun/star/util/XCloneable.hpp - chart2/source/inc/MediaDescriptorHelper.hxx: + chart2/source/inc/LabeledDataSequence.hxx: # base class has to be a complete type - - com/sun/star/beans/PropertyValue.hpp - - com/sun/star/embed/XStorage.hpp - - com/sun/star/io/XInputStream.hpp - - com/sun/star/io/XOutputStream.hpp - - com/sun/star/io/XStream.hpp + - com/sun/star/chart2/data/XLabeledDataSequence2.hpp + - com/sun/star/lang/XServiceInfo.hpp chart2/source/inc/ModifyListenerHelper.hxx: # base class has to be a complete type - - com/sun/star/uno/XWeak.hpp - com/sun/star/util/XModifyListener.hpp - - cppuhelper/weakref.hxx chart2/source/inc/NameContainer.hxx: # base class has to be a complete type - com/sun/star/container/XNameContainer.hpp @@ -107,51 +102,26 @@ blacklist: chart2/source/inc/NumberFormatterWrapper.hxx: # base class has to be a complete type - com/sun/star/util/XNumberFormatsSupplier.hpp - - svl/zforlist.hxx chart2/source/inc/PropertyHelper.hxx: # base class has to be a complete type - - com/sun/star/lang/XMultiServiceFactory.hpp - com/sun/star/uno/Any.hxx chart2/source/inc/PopupRequest.hxx: # base class has to be a complete type - com/sun/star/awt/XRequestCallback.hpp chart2/source/inc/RangeHighlighter.hxx: # base class has to be a complete type - - com/sun/star/beans/XPropertySet.hpp - com/sun/star/chart2/data/XRangeHighlighter.hpp - - com/sun/star/view/XSelectionSupplier.hpp - chart2/source/inc/RelativePositionHelper.hxx: - # base class has to be a complete type - - com/sun/star/awt/Size.hpp - - com/sun/star/chart2/RelativeSize.hpp - chart2/source/inc/RelativeSizeHelper.hxx: + - com/sun/star/view/XSelectionChangeListener.hpp + chart2/source/inc/RegressionCurveCalculator.hxx: # base class has to be a complete type - - com/sun/star/awt/Size.hpp - - com/sun/star/beans/XPropertySet.hpp + - com/sun/star/chart2/XRegressionCurveCalculator.hpp chart2/source/inc/Scaling.hxx: # base class has to be a complete type - com/sun/star/chart2/XScaling.hpp - com/sun/star/lang/XServiceInfo.hpp - com/sun/star/lang/XServiceName.hpp - chart2/source/inc/StatisticsHelper.hxx: - # base class has to be a complete type - - com/sun/star/chart2/XDataSeries.hpp - - com/sun/star/chart2/data/XDataProvider.hpp - - com/sun/star/chart2/data/XDataSource.hpp - - com/sun/star/uno/Sequence.hxx - chart2/source/inc/SceneProperties.hxx: - # base class has to be a complete type - - com/sun/star/beans/Property.hpp - chart2/source/inc/ThreeDHelper.hxx: - # base class has to be a complete type - - com/sun/star/chart2/XDiagram.hpp - chart2/source/inc/UserDefinedProperties.hxx: - # base class has to be a complete type - - com/sun/star/beans/Property.hpp chart2/source/inc/UncachedDataSequence.hxx: # base class has to be a complete type - - com/sun/star/beans/XPropertySet.hpp - - com/sun/star/chart2/XInternalDataProvider.hpp - com/sun/star/chart2/data/XDataSequence.hpp - com/sun/star/chart2/data/XNumericalDataSequence.hpp - com/sun/star/chart2/data/XTextualDataSequence.hpp @@ -165,16 +135,13 @@ blacklist: - com/sun/star/util/XModifyListener.hpp - com/sun/star/view/XSelectionChangeListener.hpp chart2/source/inc/WrappedProperty.hxx: - # base class has to be a complete type - - com/sun/star/beans/XPropertySet.hpp - - com/sun/star/beans/XPropertyState.hpp + # Needed for implicit dtor + - com/sun/star/uno/Any.hxx chart2/source/inc/WrappedPropertySet.hxx: # base class has to be a complete type - - com/sun/star/beans/Property.hpp - com/sun/star/beans/XMultiPropertySet.hpp - com/sun/star/beans/XMultiPropertyStates.hpp - com/sun/star/beans/XPropertySet.hpp - - cppuhelper/propshlp.hxx - com/sun/star/beans/XPropertyState.hpp chart2/source/model/inc/BaseCoordinateSystem.hxx: # base class has to be a complete type @@ -359,6 +326,10 @@ blacklist: - com/sun/star/frame/XLayoutManagerListener.hpp - com/sun/star/ui/XContextMenuInterception.hpp - com/sun/star/util/XModeChangeListener.hpp + - com/sun/star/lang/XMultiServiceFactory.hpp + - com/sun/star/lang/XServiceInfo.hpp + - com/sun/star/util/XCloseListener.hpp + - com/sun/star/util/XModifyListener.hpp chart2/source/controller/inc/ItemPropertyMap.hxx: # base class has to be a complete type - map diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index f090ddd8b454..b21cc823a4f5 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> +#include <com/sun/star/chart2/XChartDocument.hpp> #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <vcl/svapp.hxx> diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx index ad95e10110b3..a126bc134cfb 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/lang/XInitialization.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <vcl/svapp.hxx> #include <rtl/ustrbuf.hxx> diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.cxx b/chart2/source/controller/accessibility/AccessibleChartShape.cxx index f6bbc1993292..55b66c7e6b6a 100644 --- a/chart2/source/controller/accessibility/AccessibleChartShape.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartShape.cxx @@ -21,6 +21,7 @@ #include <ObjectHierarchy.hxx> #include <ObjectIdentifier.hxx> +#include <com/sun/star/awt/XWindow.hpp> #include <toolkit/helper/vclunohelper.hxx> #include <svx/ShapeTypeHandler.hxx> #include <svx/AccessibleShape.hxx> diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx index e998a7a5b7d6..977d32f204e6 100644 --- a/chart2/source/controller/accessibility/AccessibleChartView.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> +#include <com/sun/star/chart2/XChartDocument.hpp> #include <rtl/ustring.hxx> #include <vcl/window.hxx> diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx index da0ca6a3131f..c04474627727 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx @@ -56,6 +56,7 @@ #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <comphelper/sequence.hxx> #include <cppuhelper/exc_hlp.hxx> +#include <cppuhelper/propshlp.hxx> using namespace ::com::sun::star; using namespace ::chart::wrapper; diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index 1e6960a6bc29..85073ee957fe 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -55,6 +55,7 @@ #include <com/sun/star/chart2/RelativePosition.hpp> #include <com/sun/star/chart/ChartSolidType.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <LinePropertiesHelper.hxx> #include <FillProperties.hxx> diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index 90187cca0391..cd1ccd00ce51 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -36,6 +36,7 @@ #include <algorithm> #include <rtl/ustrbuf.hxx> +#include <cppuhelper/propshlp.hxx> using namespace ::com::sun::star; using ::com::sun::star::beans::Property; diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx index cf94d36b66af..e85ba63674ca 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx @@ -25,6 +25,7 @@ #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> diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx index 5762f5fea185..5b2fcd4330a5 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx @@ -20,6 +20,8 @@ #include "WrappedAutomaticPositionProperties.hxx" #include <FastPropertyIdRanges.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> +#include <com/sun/star/beans/XPropertyState.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/chart2/RelativePosition.hpp> #include <tools/diagnose_ex.h> diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx index 35dc3f20e3f2..1a0010ee17b1 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx @@ -21,6 +21,7 @@ #define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDAUTOMATICPOSITIONPROPERTIES_HXX #include <WrappedProperty.hxx> +#include <com/sun/star/beans/Property.hpp> #include <vector> namespace chart diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx index 538a65d49bb2..a3654434f66d 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx @@ -21,6 +21,7 @@ #include <AxisHelper.hxx> #include <ChartModelHelper.hxx> #include <TitleHelper.hxx> +#include <osl/diagnose.h> using namespace ::com::sun::star; using ::com::sun::star::uno::Any; diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx index 9163af43cbe8..91ea634ebaf2 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx @@ -20,6 +20,8 @@ #include "WrappedCharacterHeightProperty.hxx" #include <RelativeSizeHelper.hxx> #include "ReferenceSizePropertyProvider.hxx" +#include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/beans/XPropertyState.hpp> #include <osl/diagnose.h> using namespace ::com::sun::star; diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx index 863d109bf5ca..90cd4d122b69 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx @@ -21,6 +21,7 @@ #include <FastPropertyIdRanges.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> +#include <com/sun/star/beans/XPropertyState.hpp> #include <tools/diagnose_ex.h> using namespace ::com::sun::star; diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx index f71cb2977d66..7c7a398cef9a 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx @@ -33,6 +33,7 @@ #include <com/sun/star/chart/ChartRegressionCurveType.hpp> #include <com/sun/star/chart2/data/XDataProvider.hpp> #include <com/sun/star/chart2/data/XRangeXMLConversion.hpp> +#include <com/sun/star/chart2/XRegressionCurveContainer.hpp> #include <utility> using namespace ::com::sun::star; diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx index f6af402eca65..92027e68a312 100644 --- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx +++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx @@ -21,6 +21,7 @@ #include <ResId.hxx> #include <strings.hrc> #include <AxisHelper.hxx> +#include <ChartModel.hxx> #include <ChartModelHelper.hxx> #include <DiagramHelper.hxx> #include <DataSeriesHelper.hxx> diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx index 324d743ee23d..96750c37d54e 100644 --- a/chart2/source/controller/inc/AccessibleBase.hxx +++ b/chart2/source/controller/inc/AccessibleBase.hxx @@ -30,12 +30,15 @@ #include <comphelper/accessibleeventnotifier.hxx> #include <cppuhelper/compbase.hxx> #include <rtl/ref.hxx> +#include <tools/color.hxx> #include <map> #include <vector> +#include <memory> #include <MutexContainer.hxx> +namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } } namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } } namespace com { namespace sun { namespace star { namespace view { class XSelectionSupplier; } } } } namespace utl { class AccessibleStateSetHelper; } diff --git a/chart2/source/controller/inc/ChartController.hxx b/chart2/source/controller/inc/ChartController.hxx index b6c9db260d15..3397a1bcf5d1 100644 --- a/chart2/source/controller/inc/ChartController.hxx +++ b/chart2/source/controller/inc/ChartController.hxx @@ -31,7 +31,11 @@ #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/ui/XContextMenuInterception.hpp> #include <com/sun/star/util/XModeChangeListener.hpp> +#include <com/sun/star/util/XCloseListener.hpp> +#include <com/sun/star/util/XModifyListener.hpp> #include <com/sun/star/frame/XLayoutManagerListener.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <memory> #include <set> @@ -51,12 +55,8 @@ namespace com { namespace sun { namespace star { namespace frame { class XContro namespace com { namespace sun { namespace star { namespace frame { class XDispatch; } } } } namespace com { namespace sun { namespace star { namespace frame { class XLayoutManagerEventBroadcaster; } } } } namespace com { namespace sun { namespace star { namespace lang { class XInitialization; } } } } -namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } -namespace com { namespace sun { namespace star { namespace lang { class XServiceInfo; } } } } namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } namespace com { namespace sun { namespace star { namespace util { class XCloseable; } } } } -namespace com { namespace sun { namespace star { namespace util { class XCloseListener; } } } } -namespace com { namespace sun { namespace star { namespace util { class XModifyListener; } } } } namespace com { namespace sun { namespace star { namespace view { class XSelectionSupplier; } } } } diff --git a/chart2/source/controller/inc/PositionAndSizeHelper.hxx b/chart2/source/controller/inc/PositionAndSizeHelper.hxx index f1236e68b851..f65b333c3407 100644 --- a/chart2/source/controller/inc/PositionAndSizeHelper.hxx +++ b/chart2/source/controller/inc/PositionAndSizeHelper.hxx @@ -23,6 +23,7 @@ #include <ObjectIdentifier.hxx> namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace com { namespace sun { namespace star { namespace awt { struct Rectangle; } } } } namespace chart { diff --git a/chart2/source/controller/inc/TitleDialogData.hxx b/chart2/source/controller/inc/TitleDialogData.hxx index 6deeb2050b1d..446f71cc8f93 100644 --- a/chart2/source/controller/inc/TitleDialogData.hxx +++ b/chart2/source/controller/inc/TitleDialogData.hxx @@ -20,8 +20,8 @@ #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_TITLEDIALOGDATA_HXX #include <ReferenceSizeProvider.hxx> - #include <memory> +#include <com/sun/star/uno/Sequence.hxx> namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx index 97bb032a02c7..2e6ac7beed6c 100644 --- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx +++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx @@ -23,6 +23,7 @@ #include <sfx2/tabdlg.hxx> namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; } } } } +class Graphic; namespace chart { diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx index 39ed990d3141..ffd3dbf5f8c8 100644 --- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx @@ -33,6 +33,7 @@ #include <svl/stritem.hxx> #include <com/sun/star/beans/XPropertyState.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/chart2/XFormattedString.hpp> #include <tools/diagnose_ex.h> diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx index 05a516b085e9..494aee798ac9 100644 --- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx @@ -42,6 +42,7 @@ #include <com/sun/star/chart2/FillBitmap.hpp> #include <com/sun/star/awt/Gradient.hpp> #include <com/sun/star/container/XNameAccess.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <tools/diagnose_ex.h> using namespace ::com::sun::star; diff --git a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx index 98dc4d56791a..f08370c548ae 100644 --- a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx +++ b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx @@ -31,6 +31,8 @@ #include <AxisHelper.hxx> #include <chartview/ExplicitValueProvider.hxx> #include <DiagramHelper.hxx> +#include <com/sun/star/chart2/XChartDocument.hpp> +#include <com/sun/star/util/XNumberFormatsSupplier.hpp> using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx index f987739e4d98..39838143aac0 100644 --- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx @@ -38,6 +38,7 @@ #include <com/sun/star/chart2/DataPointLabel.hpp> #include <com/sun/star/chart2/XInternalDataProvider.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> +#include <com/sun/star/chart2/XRegressionCurveContainer.hpp> #include <com/sun/star/chart/ErrorBarStyle.hpp> #include <com/sun/star/lang/XServiceName.hpp> #include <tools/diagnose_ex.h> diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index d5905ea28ecb..cd9e889066e3 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -26,6 +26,7 @@ #include <servicenames.hxx> #include <ResId.hxx> #include <dlg_DataSource.hxx> +#include <ChartModel.hxx> #include <ChartModelHelper.hxx> #include "ControllerCommandDispatch.hxx" #include <strings.hrc> diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index d0fb2d10e323..929c50f2322a 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -28,6 +28,7 @@ #include <dlg_ObjectProperties.hxx> #include <ChartWindow.hxx> +#include <ChartModel.hxx> #include <ChartModelHelper.hxx> #include <AxisHelper.hxx> #include <TitleHelper.hxx> @@ -53,6 +54,8 @@ #include <LegendHelper.hxx> #include <com/sun/star/chart2/XRegressionCurve.hpp> +#include <com/sun/star/chart2/XRegressionCurveContainer.hpp> +#include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart/ErrorBarStyle.hpp> #include <svx/ActionDescriptionProvider.hxx> diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx index cac61217b4a0..31576ed554d9 100644 --- a/chart2/source/controller/main/ChartController_Position.cxx +++ b/chart2/source/controller/main/ChartController_Position.cxx @@ -22,6 +22,7 @@ #include <ChartWindow.hxx> #include <DrawViewWrapper.hxx> #include <PositionAndSizeHelper.hxx> +#include <ChartModel.hxx> #include <ChartModelHelper.hxx> #include "UndoGuard.hxx" #include <ObjectNameProvider.hxx> diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index 52481313769f..b561f959c0d9 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -54,6 +54,7 @@ #include <RegressionCurveHelper.hxx> #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/util/CloseVetoException.hpp> +#include <com/sun/star/chart2/XRegressionCurveContainer.hpp> #include <memory> diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx index acaac25d4668..ef1df6ae35d2 100644 --- a/chart2/source/controller/main/ChartController_TextEdit.cxx +++ b/chart2/source/controller/main/ChartController_TextEdit.cxx @@ -36,6 +36,7 @@ #include <svx/dialogs.hrc> #include <vcl/svapp.hxx> #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/chart2/XTitled.hpp> #include <svl/stritem.hxx> #include <editeng/fontitem.hxx> #include <memory> diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index 90cc52855380..d91807f1e593 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -19,6 +19,7 @@ #include <ChartController.hxx> #include <ChartWindow.hxx> +#include <ChartModel.hxx> #include <ChartModelHelper.hxx> #include <TitleHelper.hxx> #include <ThreeDHelper.hxx> @@ -50,6 +51,8 @@ #include <com/sun/star/drawing/TextVerticalAdjust.hpp> #include <com/sun/star/drawing/TextHorizontalAdjust.hpp> #include <com/sun/star/chart/ErrorBarStyle.hpp> +#include <com/sun/star/chart2/XRegressionCurveContainer.hpp> +#include <com/sun/star/chart2/XChartDocument.hpp> #include <editeng/editview.hxx> #include <editeng/outliner.hxx> diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 0bbe37e0cf5e..f7e4a415290a 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -23,6 +23,7 @@ #include <ChartWindow.hxx> #include <ResId.hxx> #include <CommonConverters.hxx> +#include <ChartModel.hxx> #include <ChartModelHelper.hxx> #include <DiagramHelper.hxx> #include <TitleHelper.hxx> @@ -50,6 +51,7 @@ #include <com/sun/star/chart2/RelativeSize.hpp> #include <com/sun/star/chart2/XRegressionCurveContainer.hpp> #include <com/sun/star/chart2/data/XPivotTableDataProvider.hpp> +#include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/awt/PopupMenuDirection.hpp> #include <com/sun/star/frame/DispatchHelper.hpp> @@ -57,6 +59,7 @@ #include <com/sun/star/frame/XPopupMenuController.hpp> #include <com/sun/star/util/XUpdatable.hpp> #include <com/sun/star/awt/Rectangle.hpp> +#include <com/sun/star/qa/XDumper.hpp> #include <comphelper/lok.hxx> #include <comphelper/propertysequence.hxx> diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx index 4f22c0d224d7..a8f39ee5c989 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.cxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx @@ -30,6 +30,7 @@ #include <RegressionCurveHelper.hxx> #include <DataSeriesHelper.hxx> #include <StatisticsHelper.hxx> +#include <ReferenceSizeProvider.hxx> #include "ShapeController.hxx" #include <vcl/svapp.hxx> @@ -41,6 +42,7 @@ #include <com/sun/star/chart2/XChartType.hpp> #include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/chart2/XRegressionCurve.hpp> +#include <com/sun/star/chart2/XRegressionCurveContainer.hpp> #include <com/sun/star/chart2/data/XDatabaseDataProvider.hpp> #include <com/sun/star/chart2/XDataProviderAccess.hpp> diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index fd43b5457bf3..f10ae63f92af 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -34,6 +34,7 @@ #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> namespace chart { diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx index 5870669c797d..f80d42378e55 100644 --- a/chart2/source/controller/main/ObjectHierarchy.cxx +++ b/chart2/source/controller/main/ObjectHierarchy.cxx @@ -39,6 +39,7 @@ #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> #include <com/sun/star/chart2/XChartTypeContainer.hpp> #include <com/sun/star/chart2/XDataSeriesContainer.hpp> +#include <com/sun/star/chart2/XRegressionCurveContainer.hpp> #include <com/sun/star/chart/ErrorBarStyle.hpp> #include <com/sun/star/container/XIndexAccess.hpp> diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/chart2/source/controller/main/StatusBarCommandDispatch.cxx index c265adca0336..63766b9b49ed 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.cxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.cxx @@ -20,7 +20,7 @@ #include "StatusBarCommandDispatch.hxx" #include <ObjectNameProvider.hxx> #include <com/sun/star/util/XModifyBroadcaster.hpp> - +#include <com/sun/star/chart2/XChartDocument.hpp> using namespace ::com::sun::star; diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx b/chart2/source/controller/sidebar/ChartAreaPanel.cxx index 49581374374e..cd222e37c547 100644 --- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx +++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx @@ -14,6 +14,8 @@ #include <PropertyHelper.hxx> #include <chartview/DrawModelWrapper.hxx> +#include <com/sun/star/util/XModifyBroadcaster.hpp> +#include <com/sun/star/chart2/XDiagram.hpp> #include <editeng/memberids.h> #include <svx/xfltrit.hxx> diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.cxx b/chart2/source/controller/sidebar/ChartAxisPanel.cxx index ec54b118b39f..7ce06619413b 100644 --- a/chart2/source/controller/sidebar/ChartAxisPanel.cxx +++ b/chart2/source/controller/sidebar/ChartAxisPanel.cxx @@ -20,6 +20,8 @@ #include <sfx2/sidebar/ControlFactory.hxx> #include <com/sun/star/chart/ChartAxisLabelPosition.hpp> +#include <com/sun/star/chart2/XCoordinateSystem.hpp> +#include <com/sun/star/util/XModifyBroadcaster.hpp> #include "ChartAxisPanel.hxx" #include <ChartController.hxx> diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.cxx b/chart2/source/controller/sidebar/ChartColorWrapper.cxx index f345e205194d..6c9744ffee02 100644 --- a/chart2/source/controller/sidebar/ChartColorWrapper.cxx +++ b/chart2/source/controller/sidebar/ChartColorWrapper.cxx @@ -10,6 +10,7 @@ #include "ChartColorWrapper.hxx" #include <ChartController.hxx> +#include <com/sun/star/chart2/XDiagram.hpp> #include <svx/tbcontrl.hxx> diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx index 4b3b5998abb5..c1b3794230e1 100644 --- a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx +++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/chart/ChartAxisLabelPosition.hpp> #include <com/sun/star/chart/ErrorBarStyle.hpp> +#include <com/sun/star/util/XModifyBroadcaster.hpp> #include "ChartErrorBarPanel.hxx" #include <ChartController.hxx> diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx b/chart2/source/controller/sidebar/ChartLinePanel.cxx index 84d1cd4c8f76..8f923bc04103 100644 --- a/chart2/source/controller/sidebar/ChartLinePanel.cxx +++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx @@ -23,6 +23,8 @@ #include <vcl/svapp.hxx> #include <com/sun/star/view/XSelectionSupplier.hpp> +#include <com/sun/star/util/XModifyBroadcaster.hpp> +#include <com/sun/star/chart2/XDiagram.hpp> namespace chart { namespace sidebar { diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx index edf0190d75fc..3d00b4e7bde4 100644 --- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx +++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx @@ -24,9 +24,11 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/chart/DataLabelPlacement.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/XChartTypeContainer.hpp> #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> +#include <com/sun/star/chart2/XRegressionCurveContainer.hpp> #include "ChartSeriesPanel.hxx" #include <ChartController.hxx> diff --git a/chart2/source/controller/uitest/uiobject.cxx b/chart2/source/controller/uitest/uiobject.cxx index 7ddb557ffe23..7dd9697ec217 100644 --- a/chart2/source/controller/uitest/uiobject.cxx +++ b/chart2/source/controller/uitest/uiobject.cxx @@ -14,6 +14,7 @@ #include <ChartController.hxx> #include <ObjectHierarchy.hxx> #include <chartview/ExplicitValueProvider.hxx> +#include <com/sun/star/chart2/XChartDocument.hpp> #include <vcl/svapp.hxx> 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 { diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx index ef13d50950b6..5c3e083b64f9 100644 --- a/chart2/source/model/main/Diagram.cxx +++ b/chart2/source/model/main/Diagram.cxx @@ -40,6 +40,7 @@ #include <com/sun/star/container/NoSuchElementException.hpp> #include <com/sun/star/drawing/CameraGeometry.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/drawing/HomogenMatrix.hpp> #include <cppuhelper/supportsservice.hxx> diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx index ee5e501da1f2..401dc6971dc9 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.cxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <tools/diagnose_ex.h> #include <algorithm> diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx index 67aa7078b50c..48a2b53f8be4 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.cxx +++ b/chart2/source/model/template/BarChartTypeTemplate.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/chart2/DataPointGeometry3D.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <tools/diagnose_ex.h> #include <algorithm> diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/chart2/source/model/template/BubbleChartTypeTemplate.cxx index 123e2ad67e7a..1f1800b07363 100644 --- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx +++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx @@ -28,6 +28,7 @@ #include <PropertyHelper.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <tools/diagnose_ex.h> #include <algorithm> diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx index 6e70e84bb36e..da606f6ce424 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <tools/diagnose_ex.h> #include <algorithm> diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx index 01e6ac21c641..7989a743529a 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.cxx +++ b/chart2/source/model/template/LineChartTypeTemplate.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <tools/diagnose_ex.h> #include <algorithm> diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx index a25b83233807..6993eaa6c40d 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.cxx +++ b/chart2/source/model/template/PieChartTypeTemplate.cxx @@ -33,6 +33,7 @@ #include <com/sun/star/chart2/XDataSeriesContainer.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> #include <rtl/math.hxx> diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx index 0505245e15e2..15399ce3821f 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <tools/diagnose_ex.h> #include <algorithm> diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx index 79231e6c8778..8073dca0614d 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.cxx +++ b/chart2/source/model/template/StockChartTypeTemplate.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/chart2/XDataSeriesContainer.hpp> #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <PropertyHelper.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/drawing/LineStyle.hpp> diff --git a/chart2/source/tools/DataSource.cxx b/chart2/source/tools/DataSource.cxx index 9d17d4b4b6e7..1e271a125407 100644 --- a/chart2/source/tools/DataSource.cxx +++ b/chart2/source/tools/DataSource.cxx @@ -20,6 +20,7 @@ #include <DataSource.hxx> #include <LabeledDataSequence.hxx> #include <cppuhelper/supportsservice.hxx> +#include <com/sun/star/uno/XComponentContext.hpp> using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx index 25fe68ea4409..5c8c534fb496 100644 --- a/chart2/source/tools/DiagramHelper.cxx +++ b/chart2/source/tools/DiagramHelper.cxx @@ -24,6 +24,7 @@ #include <AxisHelper.hxx> #include <ContainerHelper.hxx> #include <ChartTypeHelper.hxx> +#include <ChartModel.hxx> #include <ChartModelHelper.hxx> #include <CommonConverters.hxx> #include <ExplicitCategoriesProvider.hxx> diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx index 4e1f0b09b73f..59db1cd73c2f 100644 --- a/chart2/source/tools/LabeledDataSequence.cxx +++ b/chart2/source/tools/LabeledDataSequence.cxx @@ -21,6 +21,7 @@ #include <ModifyListenerHelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <tools/diagnose_ex.h> +#include <com/sun/star/uno/XComponentContext.hpp> using namespace ::com::sun::star; diff --git a/chart2/source/tools/LegendHelper.cxx b/chart2/source/tools/LegendHelper.cxx index d353d6741b28..a72479b37627 100644 --- a/chart2/source/tools/LegendHelper.cxx +++ b/chart2/source/tools/LegendHelper.cxx @@ -18,12 +18,14 @@ */ #include <LegendHelper.hxx> +#include <ChartModel.hxx> #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/XChartDocument.hpp> #include <com/sun/star/chart2/XLegend.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <tools/diagnose_ex.h> using namespace ::com::sun::star; diff --git a/chart2/source/tools/MediaDescriptorHelper.cxx b/chart2/source/tools/MediaDescriptorHelper.cxx index 7ae409976dd6..e7190453f3b3 100644 --- a/chart2/source/tools/MediaDescriptorHelper.cxx +++ b/chart2/source/tools/MediaDescriptorHelper.cxx @@ -18,6 +18,10 @@ */ #include <MediaDescriptorHelper.hxx> +#include <com/sun/star/beans/PropertyValue.hpp> +#include <com/sun/star/embed/XStorage.hpp> +#include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/uno/Any.hxx> using namespace ::com::sun::star; diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx index b4c9840f5848..c8aca33c28cc 100644 --- a/chart2/source/tools/ObjectIdentifier.cxx +++ b/chart2/source/tools/ObjectIdentifier.cxx @@ -23,6 +23,7 @@ #include <ObjectIdentifier.hxx> #include <TitleHelper.hxx> +#include <ChartModel.hxx> #include <ChartModelHelper.hxx> #include <AxisHelper.hxx> #include <servicenames_charttypes.hxx> @@ -36,6 +37,8 @@ #include <com/sun/star/chart2/XDataSeriesContainer.hpp> #include <com/sun/star/chart2/XAxis.hpp> #include <com/sun/star/chart2/XRegressionCurveContainer.hpp> +#include <com/sun/star/awt/Point.hpp> +#include <com/sun/star/drawing/XShape.hpp> #include <rtl/ustrbuf.hxx> #include <tools/diagnose_ex.h> diff --git a/chart2/source/tools/PropertyHelper.cxx b/chart2/source/tools/PropertyHelper.cxx index 6cb9061f0202..93a515fc6d0c 100644 --- a/chart2/source/tools/PropertyHelper.cxx +++ b/chart2/source/tools/PropertyHelper.cxx @@ -21,6 +21,7 @@ #include <ContainerHelper.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/container/XNameContainer.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <osl/diagnose.h> #include <tools/diagnose_ex.h> diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx index 7b47dff7eb93..7cd340b5b32a 100644 --- a/chart2/source/tools/RangeHighlighter.cxx +++ b/chart2/source/tools/RangeHighlighter.cxx @@ -26,9 +26,13 @@ #include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/chart/ErrorBarStyle.hpp> +#include <com/sun/star/chart2/XCoordinateSystem.hpp> +#include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/drawing/XShape.hpp> +#include <com/sun/star/view/XSelectionSupplier.hpp> #include <comphelper/sequence.hxx> #include <tools/diagnose_ex.h> +#include <tools/color.hxx> using namespace ::com::sun::star; diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx index 35eb59470535..096c92ae5447 100644 --- a/chart2/source/tools/RegressionCurveHelper.cxx +++ b/chart2/source/tools/RegressionCurveHelper.cxx @@ -35,6 +35,8 @@ #include <DiagramHelper.hxx> #include <com/sun/star/chart2/AxisType.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> +#include <com/sun/star/chart2/XRegressionCurveCalculator.hpp> +#include <com/sun/star/chart2/XRegressionCurveContainer.hpp> #include <tools/diagnose_ex.h> #include <comphelper/property.hxx> diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx index d4b0d360359e..6856b071476c 100644 --- a/chart2/source/tools/RegressionCurveModel.cxx +++ b/chart2/source/tools/RegressionCurveModel.cxx @@ -27,6 +27,7 @@ #include <ModifyListenerHelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <rtl/math.hxx> #include <rtl/ustrbuf.hxx> #include <tools/diagnose_ex.h> diff --git a/chart2/source/tools/RelativePositionHelper.cxx b/chart2/source/tools/RelativePositionHelper.cxx index 0b07d362b183..deb3e5ca5a2c 100644 --- a/chart2/source/tools/RelativePositionHelper.cxx +++ b/chart2/source/tools/RelativePositionHelper.cxx @@ -18,6 +18,8 @@ */ #include <RelativePositionHelper.hxx> +#include <com/sun/star/chart2/RelativeSize.hpp> +#include <com/sun/star/awt/Size.hpp> #include <rtl/math.hxx> #include <osl/diagnose.h> diff --git a/chart2/source/tools/RelativeSizeHelper.cxx b/chart2/source/tools/RelativeSizeHelper.cxx index 8a2ae608630d..a142d5b293e8 100644 --- a/chart2/source/tools/RelativeSizeHelper.cxx +++ b/chart2/source/tools/RelativeSizeHelper.cxx @@ -18,6 +18,8 @@ */ #include <RelativeSizeHelper.hxx> +#include <com/sun/star/awt/Size.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> #include <tools/diagnose_ex.h> #include <vector> diff --git a/chart2/source/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx index 4adb3865ce7d..25e27438c259 100644 --- a/chart2/source/tools/StatisticsHelper.cxx +++ b/chart2/source/tools/StatisticsHelper.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/chart2/data/LabeledDataSequence.hpp> #include <com/sun/star/chart2/data/XNumericalDataSequence.hpp> +#include <com/sun/star/chart2/data/XDataProvider.hpp> #include <com/sun/star/chart2/data/XDataSink.hpp> #include <com/sun/star/chart/ErrorBarStyle.hpp> #include <tools/diagnose_ex.h> diff --git a/chart2/source/tools/TitleHelper.cxx b/chart2/source/tools/TitleHelper.cxx index 0487fa6f51e2..a388d5e74677 100644 --- a/chart2/source/tools/TitleHelper.cxx +++ b/chart2/source/tools/TitleHelper.cxx @@ -18,9 +18,11 @@ */ #include <TitleHelper.hxx> +#include <ChartModel.hxx> #include <ChartModelHelper.hxx> #include <AxisHelper.hxx> #include <DiagramHelper.hxx> +#include <ReferenceSizeProvider.hxx> #include <com/sun/star/chart2/FormattedString.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> #include <rtl/ustrbuf.hxx> diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx index f88987a05dd1..d4d2b150a269 100644 --- a/chart2/source/tools/UncachedDataSequence.cxx +++ b/chart2/source/tools/UncachedDataSequence.cxx @@ -25,6 +25,7 @@ #include <cppuhelper/supportsservice.hxx> #include <algorithm> #include <com/sun/star/beans/PropertyAttribute.hpp> +#include <com/sun/star/chart2/XInternalDataProvider.hpp> #include <rtl/math.hxx> #include <tools/diagnose_ex.h> diff --git a/chart2/source/tools/UserDefinedProperties.cxx b/chart2/source/tools/UserDefinedProperties.cxx index 91738c1bd38d..733f8de11549 100644 --- a/chart2/source/tools/UserDefinedProperties.cxx +++ b/chart2/source/tools/UserDefinedProperties.cxx @@ -18,6 +18,7 @@ */ #include <UserDefinedProperties.hxx> +#include <com/sun/star/beans/Property.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/container/XNameContainer.hpp> diff --git a/chart2/source/tools/WrappedDefaultProperty.cxx b/chart2/source/tools/WrappedDefaultProperty.cxx index 8c274e5ff76a..74d2b4b0aae0 100644 --- a/chart2/source/tools/WrappedDefaultProperty.cxx +++ b/chart2/source/tools/WrappedDefaultProperty.cxx @@ -20,6 +20,9 @@ #include <WrappedDefaultProperty.hxx> #include <tools/diagnose_ex.h> +#include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/beans/XPropertyState.hpp> + using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; diff --git a/chart2/source/tools/WrappedProperty.cxx b/chart2/source/tools/WrappedProperty.cxx index b7671619acc1..4f4d2bbb090c 100644 --- a/chart2/source/tools/WrappedProperty.cxx +++ b/chart2/source/tools/WrappedProperty.cxx @@ -19,6 +19,8 @@ #include <WrappedProperty.hxx> #include <com/sun/star/drawing/LineStyle.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/beans/XPropertyState.hpp> #include <tools/diagnose_ex.h> using namespace ::com::sun::star; diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx index 3857343885d1..c099bc76dfc6 100644 --- a/chart2/source/tools/WrappedPropertySet.cxx +++ b/chart2/source/tools/WrappedPropertySet.cxx @@ -18,6 +18,7 @@ */ #include <WrappedPropertySet.hxx> +#include <cppuhelper/propshlp.hxx> #include <tools/solar.h> #include <tools/diagnose_ex.h> diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx index f77b02a792eb..007247c387fa 100644 --- a/chart2/source/view/axes/VPolarGrid.cxx +++ b/chart2/source/view/axes/VPolarGrid.cxx @@ -27,6 +27,8 @@ #include "Tickmarks_Equidistant.hxx" #include <com/sun/star/drawing/LineStyle.hpp> +#include <osl/diagnose.h> + #include <vector> namespace chart diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx index 4c3726b9bbe0..c7932cbe590a 100644 --- a/chart2/source/view/charttypes/AreaChart.cxx +++ b/chart2/source/view/charttypes/AreaChart.cxx @@ -39,11 +39,13 @@ #include <editeng/unoprnms.hxx> #include <rtl/math.hxx> #include <sal/log.hxx> +#include <osl/diagnose.h> #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> +#include <com/sun/star/beans/XPropertySet.hpp> namespace chart { diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx index eff88ac355b7..f8c66bce3cdd 100644 --- a/chart2/source/view/charttypes/BubbleChart.cxx +++ b/chart2/source/view/charttypes/BubbleChart.cxx @@ -33,10 +33,12 @@ #include <editeng/unoprnms.hxx> #include <rtl/math.hxx> #include <sal/log.hxx> +#include <osl/diagnose.h> #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> +#include <com/sun/star/beans/XPropertySet.hpp> namespace chart { diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx index 80b65eb9c78b..3342bee2df56 100644 --- a/chart2/source/view/charttypes/CandleStickChart.cxx +++ b/chart2/source/view/charttypes/CandleStickChart.cxx @@ -28,9 +28,11 @@ #include <FormattedStringHelper.hxx> #include <DataSeriesHelper.hxx> #include <DateHelper.hxx> +#include <com/sun/star/beans/XPropertySet.hpp> #include <rtl/math.hxx> #include <editeng/unoprnms.hxx> #include <sal/log.hxx> +#include <osl/diagnose.h> namespace chart { diff --git a/chart2/source/view/charttypes/NetChart.cxx b/chart2/source/view/charttypes/NetChart.cxx index 6ebca9bfbebf..d08547f54b88 100644 --- a/chart2/source/view/charttypes/NetChart.cxx +++ b/chart2/source/view/charttypes/NetChart.cxx @@ -37,6 +37,7 @@ #include <editeng/unoprnms.hxx> #include <rtl/math.hxx> +#include <osl/diagnose.h> #include <com/sun/star/drawing/DoubleSequence.hpp> #include <com/sun/star/drawing/NormalsKind.hpp> diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index b5737f80055b..febee25a0806 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -31,8 +31,11 @@ #include <com/sun/star/chart2/XColorScheme.hpp> #include <com/sun/star/container/XChild.hpp> +#include <com/sun/star/drawing/XShape.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> #include <rtl/math.hxx> #include <sal/log.hxx> +#include <osl/diagnose.h> #include <tools/helpers.hxx> #include <memory> diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx index ba571bd6992c..a9af6553a7ea 100644 --- a/chart2/source/view/inc/VCoordinateSystem.hxx +++ b/chart2/source/view/inc/VCoordinateSystem.hxx @@ -23,6 +23,7 @@ #include <ThreeDHelper.hxx> #include <chartview/ExplicitScaleValues.hxx> #include <com/sun/star/drawing/HomogenMatrix.hpp> +#include <com/sun/star/uno/Sequence.h> #include <map> #include <memory> diff --git a/chart2/source/view/main/LabelPositionHelper.cxx b/chart2/source/view/main/LabelPositionHelper.cxx index 432af9b81c6e..377acbff4966 100644 --- a/chart2/source/view/main/LabelPositionHelper.cxx +++ b/chart2/source/view/main/LabelPositionHelper.cxx @@ -23,6 +23,7 @@ #include <PropertyMapper.hxx> #include <ShapeFactory.hxx> #include <RelativeSizeHelper.hxx> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/TextVerticalAdjust.hpp> #include <com/sun/star/drawing/TextHorizontalAdjust.hpp> #include <com/sun/star/drawing/XShape.hpp> diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index 22237347db42..ec17514df816 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -30,9 +30,13 @@ #include <com/sun/star/chart/MissingValueTreatment.hpp> #include <com/sun/star/chart2/DataPointLabel.hpp> #include <com/sun/star/chart2/Symbol.hpp> +#include <com/sun/star/chart2/XDataSeries.hpp> +#include <com/sun/star/chart2/XRegressionCurveCalculator.hpp> #include <rtl/math.hxx> #include <sal/log.hxx> +#include <osl/diagnose.h> +#include <tools/color.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/drawing/LineStyle.hpp> diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx index 52d2bf2d7a14..bb1b0621d931 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/RelativeSize.hpp> #include <com/sun/star/chart2/XFormattedString2.hpp> #include <com/sun/star/chart2/data/XPivotTableDataProvider.hpp> #include <com/sun/star/chart2/data/PivotTableFieldEntry.hpp> diff --git a/chart2/source/view/main/VLegendSymbolFactory.cxx b/chart2/source/view/main/VLegendSymbolFactory.cxx index 2db777910dae..c1727af3b09b 100644 --- a/chart2/source/view/main/VLegendSymbolFactory.cxx +++ b/chart2/source/view/main/VLegendSymbolFactory.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/chart2/Symbol.hpp> #include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/drawing/Direction3D.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> #include <tools/diagnose_ex.h> #include <sal/log.hxx> |