From 9c7372392793463babc31dc3de51af9be828aa8e Mon Sep 17 00:00:00 2001
From: Gabor Kelemen <kelemeng@ubuntu.com>
Date: Sun, 3 Jun 2018 16:05:34 +0200
Subject: tdf#42949 Fix IWYU warnings in chart2/inc/*

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: Id7cc673f4241aa0aa39b492f4fa501226d8e51f3
Reviewed-on: https://gerrit.libreoffice.org/55246
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
---
 chart2/IwyuFilter_chart2.yaml | 29 +++++++++++++++++++++++++++++
 chart2/inc/ChartModel.hxx     | 17 ++++++++---------
 chart2/inc/ChartView.hxx      | 25 +++++++++++++------------
 3 files changed, 50 insertions(+), 21 deletions(-)

(limited to 'chart2')

diff --git a/chart2/IwyuFilter_chart2.yaml b/chart2/IwyuFilter_chart2.yaml
index 622c3fdb0e93..ac219664f71c 100644
--- a/chart2/IwyuFilter_chart2.yaml
+++ b/chart2/IwyuFilter_chart2.yaml
@@ -1,6 +1,35 @@
 ---
 assumeFilename: chart2/source/controller/main/ChartWindow.cxx
 blacklist:
+    chart2/inc/ChartModel.hxx:
+    # base class has to be a complete type
+    - com/sun/star/chart2/X3DChartWindowProvider.hpp
+    - com/sun/star/chart2/XChartDocument.hpp
+    - com/sun/star/chart2/XTitled.hpp
+    - com/sun/star/chart2/data/XDataReceiver.hpp
+    - com/sun/star/chart2/data/XDataSource.hpp
+    - com/sun/star/container/XChild.hpp
+    - com/sun/star/datatransfer/XTransferable.hpp
+    - com/sun/star/document/XDocumentPropertiesSupplier.hpp
+    - com/sun/star/document/XStorageBasedDocument.hpp
+    - com/sun/star/document/XUndoManagerSupplier.hpp
+    - com/sun/star/embed/XVisualObject.hpp
+    - com/sun/star/frame/XLoadable.hpp
+    - com/sun/star/frame/XStorable2.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/XCloneable.hpp
+    - com/sun/star/util/XCloseable.hpp
+    - com/sun/star/util/XModifiable.hpp
+    - com/sun/star/util/XNumberFormatsSupplier.hpp
+    - com/sun/star/util/XUpdatable.hpp
+    chart2/inc/ChartView.hxx:
+    # base class has to be a complete type
+    - com/sun/star/util/XModeChangeBroadcaster.hpp
+    - com/sun/star/util/XUpdatable2.hpp
     chart2/source/inc/BaseGFXHelper.hxx:
     # base class has to be a complete type
     - com/sun/star/awt/Rectangle.hpp
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx
index 83dca2872772..880cebccedbf 100644
--- a/chart2/inc/ChartModel.hxx
+++ b/chart2/inc/ChartModel.hxx
@@ -23,18 +23,15 @@
 
 #include <LifeTime.hxx>
 
-#include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/frame/XStorable2.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/util/XUpdatable.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/document/XUndoManagerSupplier.hpp>
-#include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/embed/XVisualObject.hpp>
 #include <com/sun/star/document/XStorageBasedDocument.hpp>
@@ -42,13 +39,9 @@
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/chart2/data/XDataSource.hpp>
-#include <com/sun/star/chart2/XChartTypeTemplate.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/qa/XDumper.hpp>
-#include <com/sun/star/awt/XRequestCallback.hpp>
 
 // public API
-#include <com/sun/star/chart2/data/XDataProvider.hpp>
 #include <com/sun/star/chart2/data/XDataReceiver.hpp>
 
 #include <com/sun/star/chart2/XChartDocument.hpp>
@@ -56,8 +49,6 @@
 #include <com/sun/star/chart2/X3DChartWindowProvider.hpp>
 
 #include <com/sun/star/frame/XLoadable.hpp>
-#include <com/sun/star/embed/XEmbeddedObject.hpp>
-#include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 
 #include <osl/mutex.hxx>
@@ -68,6 +59,14 @@
 
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace awt { class XRequestCallback; } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { class XChartTypeTemplate; } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XDataProvider; } } } } }
+namespace com { namespace sun { namespace star { namespace document { class XFilter; } } } }
+namespace com { namespace sun { namespace star { namespace embed { class XStorage; } } } }
+namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+
 class SvNumberFormatter;
 class OpenGLWindow;
 
diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index 1509a8e5faac..6f3813a72b7b 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -19,30 +19,31 @@
 #ifndef INCLUDED_CHART2_INC_CHARTVIEW_HXX
 #define INCLUDED_CHART2_INC_CHARTVIEW_HXX
 
-#include "ChartModel.hxx"
 #include <chartview/ExplicitValueProvider.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <cppuhelper/interfacecontainer.hxx>
 
 #include <svl/lstner.hxx>
-#include <com/sun/star/datatransfer/XTransferable.hpp>
-#include <com/sun/star/drawing/XDrawPage.hpp>
-#include <com/sun/star/io/XOutputStream.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/uno/XComponentContext.hpp>
-#include <com/sun/star/util/XModifyListener.hpp>
 #include <com/sun/star/util/XModeChangeBroadcaster.hpp>
 #include <com/sun/star/util/XUpdatable2.hpp>
-#include <com/sun/star/qa/XDumper.hpp>
 
 #include <vector>
 #include <memory>
 
 #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;
 
 namespace chart {
-- 
cgit