tdf#42949: clean up includes in include/oox/core using iwyu

This allows the headers in that folder to stand on their own and
not depend on any transitively included headers. All changes to
other files are needed to fix compiler errors related to missing
includes that occurred afterwards.

Change-Id: I2083b30763f0b2c1aacdff00226e5f567ae52db4
Reviewed-on: https://gerrit.libreoffice.org/24355
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>

15 files changed, 173 insertions, 41 deletions

diff --git a/include/oox/core/binarycodec.hxx b/include/oox/core/binarycodec.hxx
index 0bf2cd7892f5..56cea810c869 100644
--- a/include/oox/core/binarycodec.hxx
+++ b/include/oox/core/binarycodec.hxx
@@ -20,12 +20,15 @@
 #ifndef INCLUDED_OOX_CORE_BINARYCODEC_HXX
 #define INCLUDED_OOX_CORE_BINARYCODEC_HXX
 
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/beans/NamedValue.hpp>
-
+#include <com/sun/star/uno/Sequence.h>
+#include <oox/dllapi.h>
 #include <rtl/cipher.h>
 #include <rtl/digest.h>
-#include <oox/dllapi.h>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+    namespace beans { struct NamedValue; }
+} } }
 
 namespace oox { class AttributeList; }
 
diff --git a/include/oox/core/contexthandler.hxx b/include/oox/core/contexthandler.hxx
index 50b935d29ad8..38f723eb1030 100644
--- a/include/oox/core/contexthandler.hxx
+++ b/include/oox/core/contexthandler.hxx
@@ -20,15 +20,23 @@
 #ifndef INCLUDED_OOX_CORE_CONTEXTHANDLER_HXX
 #define INCLUDED_OOX_CORE_CONTEXTHANDLER_HXX
 
+#include <exception>
+#include <memory>
+
+#include <com/sun/star/uno/Any.h>
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/Sequence.h>
+#include <com/sun/star/xml/sax/SAXException.hpp>
 #include <com/sun/star/xml/sax/XFastContextHandler.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <rtl/ref.hxx>
-#include <oox/token/namespaces.hxx>
-#include <oox/token/tokens.hxx>
 #include <oox/dllapi.h>
-#include <memory>
+#include <rtl/ref.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
 
 namespace com { namespace sun { namespace star {
+    namespace xml { namespace sax { class XFastAttributeList; } }
     namespace xml { namespace sax { class XLocator; } }
 } } }
 
@@ -38,7 +46,6 @@ namespace oox {
 namespace core {
 
 class XmlFilterBase;
-class FragmentHandler;
 struct Relation;
 class Relations;
 
diff --git a/include/oox/core/contexthandler2.hxx b/include/oox/core/contexthandler2.hxx
index 20ab9ffdf25e..cca43cbe6ba5 100644
--- a/include/oox/core/contexthandler2.hxx
+++ b/include/oox/core/contexthandler2.hxx
@@ -20,12 +20,28 @@
 #ifndef INCLUDED_OOX_CORE_CONTEXTHANDLER2_HXX
 #define INCLUDED_OOX_CORE_CONTEXTHANDLER2_HXX
 
+#include <cstddef>
+#include <exception>
 #include <memory>
 #include <vector>
-#include <oox/helper/attributelist.hxx>
-#include <oox/helper/binaryinputstream.hxx>
+
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/xml/sax/SAXException.hpp>
 #include <oox/core/contexthandler.hxx>
 #include <oox/dllapi.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+    namespace xml { namespace sax { class XFastAttributeList; } }
+    namespace xml { namespace sax { class XFastContextHandler; } }
+} } }
+
+namespace oox {
+    class AttributeList;
+    class SequenceInputStream;
+}
 
 namespace oox {
 namespace core {
diff --git a/include/oox/core/fastparser.hxx b/include/oox/core/fastparser.hxx
index d8d2ced7ef08..f8fdad783f3e 100644
--- a/include/oox/core/fastparser.hxx
+++ b/include/oox/core/fastparser.hxx
@@ -20,8 +20,22 @@
 #ifndef INCLUDED_OOX_CORE_FASTPARSER_HXX
 #define INCLUDED_OOX_CORE_FASTPARSER_HXX
 
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/xml/sax/XFastParser.hpp>
+#include <com/sun/star/io/IOException.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/xml/sax/SAXException.hpp>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+    namespace io { class XInputStream; }
+    namespace uno { class XComponentContext; }
+    namespace xml { namespace sax { class XFastDocumentHandler; } }
+    namespace xml { namespace sax { class XFastParser; } }
+    namespace xml { namespace sax { class XFastTokenHandler; } }
+    namespace xml { namespace sax { struct InputSource; } }
+} } }
 
 namespace oox {
     struct NamespaceMap;
diff --git a/include/oox/core/fasttokenhandler.hxx b/include/oox/core/fasttokenhandler.hxx
index 339d3caa2d75..02e2be7a9eaf 100644
--- a/include/oox/core/fasttokenhandler.hxx
+++ b/include/oox/core/fasttokenhandler.hxx
@@ -20,10 +20,17 @@
 #ifndef INCLUDED_OOX_CORE_FASTTOKENHANDLER_HXX
 #define INCLUDED_OOX_CORE_FASTTOKENHANDLER_HXX
 
-#include <oox/dllapi.h>
+#include <exception>
+
 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/uno/Any.h>
+#include <com/sun/star/uno/Sequence.h>
+#include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
 #include <cppuhelper/implbase.hxx>
+#include <oox/dllapi.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
 #include <sax/fastattribs.hxx>
 
 namespace oox { class TokenMap; }
diff --git a/include/oox/core/filterbase.hxx b/include/oox/core/filterbase.hxx
index bed536660d7f..02f10a105575 100644
--- a/include/oox/core/filterbase.hxx
+++ b/include/oox/core/filterbase.hxx
@@ -20,40 +20,44 @@
 #ifndef INCLUDED_OOX_CORE_FILTERBASE_HXX
 #define INCLUDED_OOX_CORE_FILTERBASE_HXX
 
-#include <com/sun/star/beans/NamedValue.hpp>
+#include <exception>
+#include <memory>
+
 #include <com/sun/star/document/XExporter.hpp>
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/document/XImporter.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/io/XStream.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/uno/Any.h>
+#include <com/sun/star/uno/Exception.hpp>
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/Sequence.h>
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <comphelper/sequenceashashmap.hxx>
+#include <oox/dllapi.h>
 #include <oox/helper/binarystreambase.hxx>
 #include <oox/helper/storagebase.hxx>
-#include <oox/dllapi.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
 
 namespace com { namespace sun { namespace star {
-    namespace awt { struct DeviceInfo; }
+    namespace beans { struct PropertyValue; }
+    namespace drawing { class XShape; }
     namespace frame { class XFrame; }
     namespace frame { class XModel; }
-    namespace drawing { class XShape; }
-    namespace graphic { class XGraphic; }
     namespace io { class XInputStream; }
     namespace io { class XOutputStream; }
     namespace io { class XStream; }
-    namespace lang { class XMultiComponentFactory; }
+    namespace lang { class XComponent; }
     namespace lang { class XMultiServiceFactory; }
-    namespace task { class XInteractionHandler; }
     namespace task { class XStatusIndicator; }
     namespace uno { class XComponentContext; }
 } } }
 
 namespace comphelper {
-    class IDocPasswordVerifier;
+    class SequenceAsHashMap;
 }
 namespace utl {
     class MediaDescriptor;
diff --git a/include/oox/core/filterdetect.hxx b/include/oox/core/filterdetect.hxx
index 7c5552f5cbdb..6a1902d91697 100644
--- a/include/oox/core/filterdetect.hxx
+++ b/include/oox/core/filterdetect.hxx
@@ -20,16 +20,29 @@
 #ifndef INCLUDED_OOX_CORE_FILTERDETECT_HXX
 #define INCLUDED_OOX_CORE_FILTERDETECT_HXX
 
+#include <exception>
 #include <vector>
+
 #include <com/sun/star/document/XExtendedFilterDetection.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/uno/Any.h>
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/Sequence.h>
+#include <com/sun/star/xml/sax/SAXException.hpp>
 #include <com/sun/star/xml/sax/XFastDocumentHandler.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <oox/dllapi.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
 
 namespace com { namespace sun { namespace star {
+    namespace beans { struct PropertyValue; }
     namespace io { class XInputStream; }
     namespace uno { class XComponentContext; }
+    namespace xml { namespace sax { class XFastAttributeList; } }
+    namespace xml { namespace sax { class XFastContextHandler; } }
+    namespace xml { namespace sax { class XLocator; } }
 } } }
 
 namespace utl { class MediaDescriptor; }
diff --git a/include/oox/core/fragmenthandler.hxx b/include/oox/core/fragmenthandler.hxx
index 952d301b7965..7afdb79efd34 100644
--- a/include/oox/core/fragmenthandler.hxx
+++ b/include/oox/core/fragmenthandler.hxx
@@ -20,19 +20,33 @@
 #ifndef INCLUDED_OOX_CORE_FRAGMENTHANDLER_HXX
 #define INCLUDED_OOX_CORE_FRAGMENTHANDLER_HXX
 
+#include <exception>
+
+#include <com/sun/star/uno/Any.h>
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/Sequence.h>
+#include <com/sun/star/xml/sax/SAXException.hpp>
 #include <com/sun/star/xml/sax/XFastDocumentHandler.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <oox/core/contexthandler.hxx>
 #include <oox/core/relations.hxx>
 #include <oox/dllapi.h>
+#include <rtl/ref.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
 
 namespace com { namespace sun { namespace star {
     namespace io { class XInputStream; }
+    namespace xml { namespace sax { class XFastAttributeList; } }
+    namespace xml { namespace sax { class XFastContextHandler; } }
+    namespace xml { namespace sax { class XLocator; } }
 } } }
 
 namespace oox {
 namespace core {
 
+class XmlFilterBase;
 
 /** Base data of a fragment.
 
diff --git a/include/oox/core/fragmenthandler2.hxx b/include/oox/core/fragmenthandler2.hxx
index 8ec3c00474a3..7e529489978b 100644
--- a/include/oox/core/fragmenthandler2.hxx
+++ b/include/oox/core/fragmenthandler2.hxx
@@ -20,14 +20,34 @@
 #ifndef INCLUDED_OOX_CORE_FRAGMENTHANDLER2_HXX
 #define INCLUDED_OOX_CORE_FRAGMENTHANDLER2_HXX
 
+#include <exception>
+#include <vector>
+
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/xml/sax/SAXException.hpp>
+#include <oox/core/contexthandler.hxx>
 #include <oox/core/contexthandler2.hxx>
 #include <oox/core/fragmenthandler.hxx>
-#include <vector>
 #include <oox/dllapi.h>
+#include <rtl/ref.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+    namespace xml { namespace sax { class XFastAttributeList; } }
+    namespace xml { namespace sax { class XFastContextHandler; } }
+} } }
+
+namespace oox {
+    class AttributeList;
+    class SequenceInputStream;
+}
 
 namespace oox {
 namespace core {
 
+class XmlFilterBase;
 
 class OOX_DLLPUBLIC FragmentHandler2 : public FragmentHandler, public ContextHandler2Helper
 {
diff --git a/include/oox/core/recordparser.hxx b/include/oox/core/recordparser.hxx
index a9909a0db596..0f53c423b72e 100644
--- a/include/oox/core/recordparser.hxx
+++ b/include/oox/core/recordparser.hxx
@@ -21,17 +21,24 @@
 #define INCLUDED_OOX_CORE_RECORDPARSER_HXX
 
 #include <map>
+#include <memory>
+
 #include <com/sun/star/io/IOException.hpp>
+#include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/xml/sax/SAXException.hpp>
-#include <rtl/ref.hxx>
 #include <oox/helper/binaryinputstream.hxx>
 #include <oox/core/fragmenthandler.hxx>
+#include <rtl/ref.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
 
 namespace oox {
 namespace core {
 
-namespace prv { class Locator; }
-namespace prv { class ContextStack; }
+namespace prv {
+    class ContextStack;
+    class Locator;
+}
 
 
 struct RecordInputSource
diff --git a/include/oox/core/relations.hxx b/include/oox/core/relations.hxx
index 7663cb5a0597..d3303bd4e063 100644
--- a/include/oox/core/relations.hxx
+++ b/include/oox/core/relations.hxx
@@ -20,11 +20,13 @@
 #ifndef INCLUDED_OOX_CORE_RELATIONS_HXX
 #define INCLUDED_OOX_CORE_RELATIONS_HXX
 
-#include <oox/helper/helper.hxx>
-#include <oox/dllapi.h>
+#include <cstddef>
 #include <map>
 #include <memory>
 
+#include <oox/dllapi.h>
+#include <rtl/ustring.hxx>
+
 namespace oox {
 namespace core {
 
diff --git a/include/oox/core/relationshandler.hxx b/include/oox/core/relationshandler.hxx
index 8d1237adfbf4..325de5a7b072 100644
--- a/include/oox/core/relationshandler.hxx
+++ b/include/oox/core/relationshandler.hxx
@@ -20,11 +20,24 @@
 #ifndef INCLUDED_OOX_CORE_RELATIONSHANDLER_HXX
 #define INCLUDED_OOX_CORE_RELATIONSHANDLER_HXX
 
+#include <exception>
+
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/xml/sax/SAXException.hpp>
 #include <oox/core/fragmenthandler.hxx>
+#include <oox/core/relations.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+    namespace xml { namespace sax { class XFastAttributeList; } }
+    namespace xml { namespace sax { class XFastContextHandler; } }
+} } }
 
 namespace oox {
 namespace core {
 
+class XmlFilterBase;
 
 class RelationsFragment : public FragmentHandler
 {
diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx
index 841843980d81..5d0aae9d0d96 100644
--- a/include/oox/core/xmlfilterbase.hxx
+++ b/include/oox/core/xmlfilterbase.hxx
@@ -20,22 +20,28 @@
 #ifndef INCLUDED_OOX_CORE_XMLFILTERBASE_HXX
 #define INCLUDED_OOX_CORE_XMLFILTERBASE_HXX
 
-#include <com/sun/star/text/XText.hpp>
-#include <com/sun/star/text/XTextCursor.hpp>
-#include <com/sun/star/text/XTextField.hpp>
-#include <rtl/ref.hxx>
-#include <rtl/string.hxx>
-#include <rtl/ustring.hxx>
+#include <memory>
+#include <vector>
+
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/RuntimeException.hpp>
 #include <oox/core/filterbase.hxx>
 #include <oox/core/relations.hxx>
 #include <oox/dllapi.h>
+#include <oox/helper/storagebase.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
 
 namespace com { namespace sun { namespace star {
-    namespace container { class XNameContainer; }
     namespace document { class XDocumentProperties; }
+    namespace io { class XInputStream; }
+    namespace io { class XOutputStream; }
+    namespace io { class XStream; }
+    namespace text { class XText; }
+    namespace text { class XTextCursor; }
+    namespace text { class XTextField; }
+    namespace uno { class XComponentContext; }
     namespace xml { namespace dom { class XDocument; } }
-    namespace xml { namespace sax { class XLocator; } }
-    namespace xml { namespace sax { class XFastDocumentHandler; } }
     namespace xml { namespace sax { class XFastSAXSerializable; } }
 } } }
 
@@ -49,12 +55,16 @@ namespace oox {
     namespace vml { class Drawing; }
 }
 
+namespace rtl { template <class reference_type> class Reference; }
+
 namespace sax_fastparser {
     class FastSerializerHelper;
 
     typedef std::shared_ptr< FastSerializerHelper > FSHelperPtr;
 }
 
+namespace utl { class MediaDescriptor; }
+
 namespace oox {
 namespace core {
 
diff --git a/include/oox/vml/vmlshapecontext.hxx b/include/oox/vml/vmlshapecontext.hxx
index 4636b0fdbc5c..3c6e3df3c8aa 100644
--- a/include/oox/vml/vmlshapecontext.hxx
+++ b/include/oox/vml/vmlshapecontext.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_OOX_VML_VMLSHAPECONTEXT_HXX
 
 #include <oox/core/contexthandler2.hxx>
+#include <oox/helper/helper.hxx>
 
 namespace oox {
 namespace vml {
diff --git a/include/oox/vml/vmltextboxcontext.hxx b/include/oox/vml/vmltextboxcontext.hxx
index 7d90e43e1c3a..e0806e624e38 100644
--- a/include/oox/vml/vmltextboxcontext.hxx
+++ b/include/oox/vml/vmltextboxcontext.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_OOX_VML_VMLTEXTBOXCONTEXT_HXX
 
 #include <oox/core/contexthandler2.hxx>
+#include <oox/helper/attributelist.hxx>
 #include <oox/vml/vmltextbox.hxx>
 
 namespace oox {