From b3c4dbf459065ae7d6a68dd565da741ed18bd608 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Wed, 6 Jun 2018 21:54:47 +0200
Subject: Fix IWYU warnings

Change-Id: I0442d201a5175a9929d3ea79d79f80db7930b565
Reviewed-on: https://gerrit.libreoffice.org/55394
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
---
 sw/IwyuFilter_sw.yaml                              |  1 +
 sw/source/filter/ww8/docxsdrexport.cxx             |  1 -
 sw/source/filter/ww8/rtfattributeoutput.cxx        |  2 --
 writerfilter/IwyuFilter_writerfilter.yaml          |  3 +++
 .../source/rtftok/rtfdispatchdestination.cxx       |  1 +
 writerfilter/source/rtftok/rtfdispatchflag.cxx     |  1 +
 writerfilter/source/rtftok/rtfdispatchvalue.cxx    |  3 ++-
 writerfilter/source/rtftok/rtfdocumentimpl.cxx     |  4 +--
 writerfilter/source/rtftok/rtfdocumentimpl.hxx     | 24 +++++++++++++++---
 writerfilter/source/rtftok/rtfsdrimport.cxx        |  1 +
 writerfilter/source/rtftok/rtfsdrimport.hxx        | 28 ++++++++++++++++++---
 writerfilter/source/rtftok/rtfvalue.cxx            |  1 +
 writerfilter/source/rtftok/rtfvalue.hxx            | 20 +++++++++++++--
 writerperfect/source/writer/EPUBExportFilter.cxx   |  1 -
 writerperfect/source/writer/EPUBExportFilter.hxx   | 15 ++++++++++-
 xmlsecurity/IwyuFilter_xmlsecurity.yaml            |  5 ++++
 xmlsecurity/inc/documentsignaturemanager.hxx       | 29 +++++++++++++++++++---
 .../source/helper/documentsignaturemanager.cxx     |  3 +--
 18 files changed, 120 insertions(+), 23 deletions(-)
 create mode 100644 xmlsecurity/IwyuFilter_xmlsecurity.yaml

diff --git a/sw/IwyuFilter_sw.yaml b/sw/IwyuFilter_sw.yaml
index 5d491b10155c..cd278aba47b6 100644
--- a/sw/IwyuFilter_sw.yaml
+++ b/sw/IwyuFilter_sw.yaml
@@ -250,4 +250,5 @@ blacklist:
     - com/sun/star/text/XDocumentIndexMark.hpp
     sw/qa/extras/rtfexport/rtfexport.cxx:
     # complete type is wanted
+    - com/sun/star/awt/XBitmap.hpp
     - com/sun/star/text/XTextColumns.hpp
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx
index 75e05dd3b22c..8acb92e3e9ac 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -31,7 +31,6 @@
 #include <ndtxt.hxx>
 #include <txatbase.hxx>
 #include <fmtfsize.hxx>
-#include <drawdoc.hxx>
 #include <frmatr.hxx>
 #include "docxattributeoutput.hxx"
 #include "docxexportfilter.hxx"
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index e44a7dd85a96..84cd1067c534 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -65,7 +65,6 @@
 #include <filter/msfilter/rtfutil.hxx>
 #include <sfx2/sfxbasemodel.hxx>
 #include <svx/xflgrit.hxx>
-#include <drawdoc.hxx>
 #include <docufld.hxx>
 #include <fmtclds.hxx>
 #include <fmtrowsplt.hxx>
@@ -82,7 +81,6 @@
 #include <ndole.hxx>
 #include <lineinfo.hxx>
 #include <rtf.hxx>
-#include <IDocumentDrawModelAccess.hxx>
 #include <IDocumentSettingAccess.hxx>
 #include <vcl/cvtgrf.hxx>
 #include <oox/mathml/export.hxx>
diff --git a/writerfilter/IwyuFilter_writerfilter.yaml b/writerfilter/IwyuFilter_writerfilter.yaml
index 1397a6e48f53..ac1671096241 100644
--- a/writerfilter/IwyuFilter_writerfilter.yaml
+++ b/writerfilter/IwyuFilter_writerfilter.yaml
@@ -6,3 +6,6 @@ blacklist:
     # the case for all of LO's supported platforms.
     # See <https://github.com/include-what-you-use/include-what-you-use/issues/175>.
     - dmapper/GraphicZOrderHelper.hxx
+    writerfilter/source/rtftok/rtfvalue.cxx:
+    # complete type is needed
+    - com/sun/star/embed/XEmbeddedObject.hpp
diff --git a/writerfilter/source/rtftok/rtfdispatchdestination.cxx b/writerfilter/source/rtftok/rtfdispatchdestination.cxx
index d67c043c08b2..ef6525ca1b2b 100644
--- a/writerfilter/source/rtftok/rtfdispatchdestination.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchdestination.cxx
@@ -12,6 +12,7 @@
 #include <com/sun/star/document/DocumentProperties.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include <filter/msfilter/escherex.hxx>
 #include <rtl/character.hxx>
diff --git a/writerfilter/source/rtftok/rtfdispatchflag.cxx b/writerfilter/source/rtftok/rtfdispatchflag.cxx
index a50165506f81..6099d4e23bc4 100644
--- a/writerfilter/source/rtftok/rtfdispatchflag.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchflag.cxx
@@ -13,6 +13,7 @@
 #include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp>
 #include <com/sun/star/text/RelOrientation.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include <filter/msfilter/escherex.hxx>
 
diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
index 11fe8e6237bd..b605a6ea534a 100644
--- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
@@ -9,8 +9,9 @@
 
 #include "rtfdocumentimpl.hxx"
 
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/text/WrapTextMode.hpp>
-
+#include <com/sun/star/document/XDocumentProperties.hpp>
 #include <comphelper/sequence.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <osl/thread.h>
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 14eba29aa4a5..8445b5c9a292 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -10,7 +10,6 @@
 #include "rtfdocumentimpl.hxx"
 #include <memory>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/graphic/GraphicProvider.hpp>
 #include <com/sun/star/io/WrongFormatException.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/text/WrapTextMode.hpp>
@@ -21,7 +20,6 @@
 #include <filter/msfilter/util.hxx>
 #include <filter/msfilter/rtfutil.hxx>
 #include <comphelper/string.hxx>
-#include <vcl/GraphicObject.hxx>
 #include <tools/globname.hxx>
 #include <tools/datetimeutils.hxx>
 #include <comphelper/classids.hxx>
@@ -35,6 +33,8 @@
 #include <rtl/uri.hxx>
 #include <rtl/tencinfo.h>
 #include <oox/helper/graphichelper.hxx>
+#include <vcl/wmfexternal.hxx>
+#include <vcl/graph.hxx>
 #include "rtfsdrimport.hxx"
 #include "rtfreferenceproperties.hxx"
 #include "rtfskipdestination.hxx"
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index b5386a30181b..3f4503f5f680 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -15,9 +15,6 @@
 #include <vector>
 #include <boost/optional.hpp>
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/text/WrapTextMode.hpp>
 #include <oox/mathml/importutils.hxx>
 #include <rtl/strbuf.hxx>
@@ -34,6 +31,27 @@ namespace oox
 {
 class GraphicHelper;
 }
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace beans
+{
+class XPropertySet;
+}
+namespace document
+{
+class XDocumentProperties;
+}
+namespace lang
+{
+class XMultiServiceFactory;
+}
+}
+}
+}
 
 namespace writerfilter
 {
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index b15b79d2ac6a..f5a96a3efada 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/text/WritingMode.hpp>
 #include <com/sun/star/text/TextContentAnchorType.hpp>
 #include <com/sun/star/text/XTextRange.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <ooxml/resourceids.hxx>
 #include <filter/msfilter/escherex.hxx>
 #include <filter/msfilter/util.hxx>
diff --git a/writerfilter/source/rtftok/rtfsdrimport.hxx b/writerfilter/source/rtftok/rtfsdrimport.hxx
index e2923c3a0885..75c9249306cf 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.hxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.hxx
@@ -14,10 +14,30 @@
 #include <vector>
 
 #include <dmapper/GraphicZOrderHelper.hxx>
-#include <com/sun/star/drawing/XShapes.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
+
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace beans
+{
+class XPropertySet;
+struct PropertyValue;
+}
+namespace drawing
+{
+class XShape;
+class XShapes;
+}
+namespace lang
+{
+class XComponent;
+}
+}
+}
+}
 
 namespace writerfilter
 {
diff --git a/writerfilter/source/rtftok/rtfvalue.cxx b/writerfilter/source/rtftok/rtfvalue.cxx
index 4b4366c31b61..c378364952bf 100644
--- a/writerfilter/source/rtftok/rtfvalue.cxx
+++ b/writerfilter/source/rtftok/rtfvalue.cxx
@@ -9,6 +9,7 @@
 
 #include "rtfreferenceproperties.hxx"
 #include "rtfdocumentimpl.hxx"
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
 
 using namespace com::sun::star;
 
diff --git a/writerfilter/source/rtftok/rtfvalue.hxx b/writerfilter/source/rtftok/rtfvalue.hxx
index 97eaa6d8f96b..644cb7693d5f 100644
--- a/writerfilter/source/rtftok/rtfvalue.hxx
+++ b/writerfilter/source/rtftok/rtfvalue.hxx
@@ -11,8 +11,24 @@
 #define INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFVALUE_HXX
 
 #include <dmapper/resourcemodel.hxx>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/embed/XEmbeddedObject.hpp>
+
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace embed
+{
+class XEmbeddedObject;
+}
+namespace io
+{
+class XInputStream;
+}
+}
+}
+}
 
 namespace writerfilter
 {
diff --git a/writerperfect/source/writer/EPUBExportFilter.cxx b/writerperfect/source/writer/EPUBExportFilter.cxx
index e24bb1e54859..49dee6bce595 100644
--- a/writerperfect/source/writer/EPUBExportFilter.cxx
+++ b/writerperfect/source/writer/EPUBExportFilter.cxx
@@ -19,7 +19,6 @@
 #include <com/sun/star/text/XPageCursor.hpp>
 #include <com/sun/star/text/XTextViewCursorSupplier.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 
 #include <comphelper/genericpropertyset.hxx>
 #include <comphelper/propertysetinfo.hxx>
diff --git a/writerperfect/source/writer/EPUBExportFilter.hxx b/writerperfect/source/writer/EPUBExportFilter.hxx
index c8c37f25e652..1b9f830300fe 100644
--- a/writerperfect/source/writer/EPUBExportFilter.hxx
+++ b/writerperfect/source/writer/EPUBExportFilter.hxx
@@ -17,7 +17,20 @@
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/document/XExporter.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
+
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace uno
+{
+class XComponentContext;
+}
+}
+}
+}
 
 namespace writerperfect
 {
diff --git a/xmlsecurity/IwyuFilter_xmlsecurity.yaml b/xmlsecurity/IwyuFilter_xmlsecurity.yaml
new file mode 100644
index 000000000000..fd05174b9891
--- /dev/null
+++ b/xmlsecurity/IwyuFilter_xmlsecurity.yaml
@@ -0,0 +1,5 @@
+---
+blacklist:
+    xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx:
+    # complete type is needed
+    - com/sun/star/security/DocumentSignatureInformation.hpp
diff --git a/xmlsecurity/inc/documentsignaturemanager.hxx b/xmlsecurity/inc/documentsignaturemanager.hxx
index f88820f03803..b5c6b1b985c7 100644
--- a/xmlsecurity/inc/documentsignaturemanager.hxx
+++ b/xmlsecurity/inc/documentsignaturemanager.hxx
@@ -26,12 +26,33 @@
 
 #include <svl/sigstruct.hxx>
 #include "xmlsignaturehelper.hxx"
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/embed/XStorage.hpp>
-#include <com/sun/star/graphic/XGraphic.hpp>
 #include "documentsignaturehelper.hxx"
-#include <com/sun/star/beans/PropertyValue.hpp>
 
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace beans
+{
+struct PropertyValue;
+}
+namespace embed
+{
+class XStorage;
+}
+namespace graphic
+{
+class XGraphic;
+}
+namespace uno
+{
+class XComponentContext;
+}
+}
+}
+}
 class PDFSignatureHelper;
 
 /// Manages signatures (addition, removal), used by DigitalSignaturesDialog.
diff --git a/xmlsecurity/source/helper/documentsignaturemanager.cxx b/xmlsecurity/source/helper/documentsignaturemanager.cxx
index c88c18964b22..2b24e03d587b 100644
--- a/xmlsecurity/source/helper/documentsignaturemanager.cxx
+++ b/xmlsecurity/source/helper/documentsignaturemanager.cxx
@@ -29,12 +29,11 @@
 #include <com/sun/star/embed/XTransactedObject.hpp>
 #include <com/sun/star/xml/crypto/SEInitializer.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/graphic/XGraphic.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
 
 #include <comphelper/base64.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <sax/tools/converter.hxx>
 #include <tools/datetime.hxx>
 #include <o3tl/make_unique.hxx>
 
-- 
cgit