From 162b729b05ea727d6191647605bbaaa9c8dab275 Mon Sep 17 00:00:00 2001 From: Gabor Kelemen Date: Thu, 14 Jun 2018 21:56:01 +0200 Subject: tdf#42949 Fix IWYU warnings in chart2/source/inc/chartview/ Found with bin/find-unneeded-includes Only removal proposals are dealt with here. The fallout of this resulted in a lot of headers added back to chart2/inc/ChartView.hxx Change-Id: Ie0e3b156b8b9fa0ea7745ee8cf9d7dd0e942bf91 Reviewed-on: https://gerrit.libreoffice.org/55826 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- chart2/IwyuFilter_chart2.yaml | 11 ++++++++++ chart2/inc/ChartView.hxx | 17 ++++++++------- .../controller/dialogs/dlg_InsertErrorBars.cxx | 1 + .../itemsetwrapper/AxisItemConverter.cxx | 2 ++ .../controller/main/ChartController_Properties.cxx | 1 + .../source/inc/chartview/ExplicitValueProvider.hxx | 24 ++++++++++++++-------- 6 files changed, 40 insertions(+), 16 deletions(-) (limited to 'chart2') diff --git a/chart2/IwyuFilter_chart2.yaml b/chart2/IwyuFilter_chart2.yaml index 0283ca1619ea..8cf43a2fe5ae 100644 --- a/chart2/IwyuFilter_chart2.yaml +++ b/chart2/IwyuFilter_chart2.yaml @@ -30,6 +30,17 @@ blacklist: # base class has to be a complete type - com/sun/star/util/XModeChangeBroadcaster.hpp - com/sun/star/util/XUpdatable2.hpp + - com/sun/star/beans/XPropertySet.hpp + - com/sun/star/datatransfer/XTransferable.hpp + - com/sun/star/lang/XInitialization.hpp + - com/sun/star/lang/XMultiServiceFactory.hpp + - com/sun/star/lang/XServiceInfo.hpp + - com/sun/star/lang/XUnoTunnel.hpp + - com/sun/star/qa/XDumper.hpp + - com/sun/star/util/XModifyListener.hpp + chart2/source/inc/chartview/ExplicitValueProvider.hxx: + # base class has to be a complete type + - memory chart2/source/inc/BaseGFXHelper.hxx: # base class has to be a complete type - com/sun/star/awt/Rectangle.hpp diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx index 6f3813a72b7b..0736062c201e 100644 --- a/chart2/inc/ChartView.hxx +++ b/chart2/inc/ChartView.hxx @@ -21,9 +21,19 @@ #include #include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include #include #include @@ -31,17 +41,10 @@ #include -namespace com { namespace sun { namespace star { namespace datatransfer { class XTransferable; } } } } namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } } namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } } namespace com { namespace sun { namespace star { namespace io { class XOutputStream; } } } } -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 lang { class XUnoTunnel; } } } } -namespace com { namespace sun { namespace star { namespace qa { class XDumper; } } } } namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } -namespace com { namespace sun { namespace star { namespace util { class XModifyListener; } } } } namespace com { namespace sun { namespace star { namespace util { class XUpdatable2; } } } } class SdrPage; diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx index e70a22f5e717..dc93eff7d44b 100644 --- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx @@ -19,6 +19,7 @@ #include #include +#include #include #include #include diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx index b0ba96674cf9..11182a850be4 100644 --- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx @@ -22,6 +22,7 @@ #include #include #include +#include #include #include "SchWhichPairs.hxx" #include @@ -34,6 +35,7 @@ #include #include #include +#include #include #include #include diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index 3b4b777c3855..ff78fbf7e9d7 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include diff --git a/chart2/source/inc/chartview/ExplicitValueProvider.hxx b/chart2/source/inc/chartview/ExplicitValueProvider.hxx index afe0507d67d2..241fe10ead99 100644 --- a/chart2/source/inc/chartview/ExplicitValueProvider.hxx +++ b/chart2/source/inc/chartview/ExplicitValueProvider.hxx @@ -19,20 +19,26 @@ #ifndef INCLUDED_CHART2_SOURCE_INC_CHARTVIEW_EXPLICITVALUEPROVIDER_HXX #define INCLUDED_CHART2_SOURCE_INC_CHARTVIEW_EXPLICITVALUEPROVIDER_HXX -#include - -#include -#include -#include -#include #include -#include -#include #include -#include #include +namespace chart { class ChartModel; } +namespace chart { struct ExplicitIncrementData; } +namespace chart { struct ExplicitScaleData; } +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 uno { class XInterface; } } } } +namespace com { namespace sun { namespace star { namespace uno { template class Reference; } } } } +namespace com { namespace sun { namespace star { namespace uno { template class Sequence; } } } } +namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; } } } } + namespace chart { -- cgit