[Libreoffice-commits] core.git: chart2/inc chart2/IwyuFilter_chart2.yaml chart2/source

Gabor Kelemen kelemeng at ubuntu.com
Fri Jun 22 15:32:17 UTC 2018 

 chart2/IwyuFilter_chart2.yaml                                 |   11 ++++
 chart2/inc/ChartView.hxx                                      |   17 ++++---
 chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx      |    1 
 chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx |    2 
 chart2/source/controller/main/ChartController_Properties.cxx  |    1 
 chart2/source/inc/chartview/ExplicitValueProvider.hxx         |   24 ++++++----
 6 files changed, 40 insertions(+), 16 deletions(-)

New commits:
commit 162b729b05ea727d6191647605bbaaa9c8dab275
Author: Gabor Kelemen <kelemeng at ubuntu.com>
Date:   Thu Jun 14 21:56:01 2018 +0200

    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 <vmiklos at collabora.co.uk>

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 <chartview/ExplicitValueProvider.hxx>
 #include <cppuhelper/implbase.hxx>
+#include <cppuhelper/interfacecontainer.h>
 
 #include <svl/lstner.hxx>
+#include <com/sun/star/awt/Size.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/datatransfer/XTransferable.hpp>
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XUnoTunnel.hpp>
+#include <com/sun/star/qa/XDumper.hpp>
 #include <com/sun/star/util/XModeChangeBroadcaster.hpp>
+#include <com/sun/star/util/XModifyListener.hpp>
 #include <com/sun/star/util/XUpdatable2.hpp>
 
 #include <vector>
@@ -31,17 +41,10 @@
 
 #include <vcl/timer.hxx>
 
-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 <dlg_InsertErrorBars.hxx>
 #include <res_ErrorBar.hxx>
+#include <chartview/ExplicitScaleValues.hxx>
 #include <chartview/ExplicitValueProvider.hxx>
 #include <ChartModelHelper.hxx>
 #include <ObjectIdentifier.hxx>
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 <CharacterPropertyItemConverter.hxx>
 #include <GraphicPropertyItemConverter.hxx>
 #include <chartview/ChartSfxItemIds.hxx>
+#include <chartview/ExplicitScaleValues.hxx>
 #include <chartview/ExplicitValueProvider.hxx>
 #include "SchWhichPairs.hxx"
 #include <ChartModelHelper.hxx>
@@ -34,6 +35,7 @@
 #include <com/sun/star/chart/ChartAxisLabelPosition.hpp>
 #include <com/sun/star/chart/ChartAxisMarkPosition.hpp>
 #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/AxisOrientation.hpp>
 #include <com/sun/star/chart2/AxisType.hpp>
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 <chartview/DrawModelWrapper.hxx>
 #include <chartview/ChartSfxItemIds.hxx>
 #include <ObjectIdentifier.hxx>
+#include <chartview/ExplicitScaleValues.hxx>
 #include <chartview/ExplicitValueProvider.hxx>
 #include <dlg_ObjectProperties.hxx>
 #include <dlg_View3D.hxx>
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 <chartview/ExplicitScaleValues.hxx>
-
-#include <com/sun/star/chart2/XAxis.hpp>
-#include <com/sun/star/chart2/XCoordinateSystem.hpp>
-#include <com/sun/star/chart2/XDataSeries.hpp>
-#include <com/sun/star/chart2/XDiagram.hpp>
 #include <com/sun/star/awt/Rectangle.hpp>
-#include <com/sun/star/drawing/XShape.hpp>
-#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <chartview/chartviewdllapi.hxx>
-#include <ChartModel.hxx>
 
 #include <memory>
 
+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 <typename > class Reference; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
+namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; } } } }
+
 namespace chart
 {

More information about the Libreoffice-commits mailing list