tdf#42949 Fix IWYU warnings in include/oox

Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I89303217fd1141b2cfe248e5e6c0818ba01cf9d9 Reviewed-on: https://gerrit.libreoffice.org/75178 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-07-07 16:28:12 +02:00
parent 0ee0ca3036
commit ef8f88a7df
31 changed files with 13 additions and 58 deletions
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -1059,3 +1059,6 @@ blacklist:
    include/svx/svdtext.hxx:
    # TODO too many replacements would be needed
    - tools/weakbase.hxx
+    include/oox/helper/helper.hxx:
+    # OSL_BIGENDIAN is being checked
+    - osl/endian.h
--- a/include/oox/core/contexthandler.hxx
+++ b/include/oox/core/contexthandler.hxx
@@ -20,14 +20,11 @@
 #ifndef INCLUDED_OOX_CORE_CONTEXTHANDLER_HXX
 #define INCLUDED_OOX_CORE_CONTEXTHANDLER_HXX

-#include <exception>
 #include <memory>

 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/xml/sax/SAXException.hpp>
 #include <com/sun/star/xml/sax/XFastContextHandler.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <oox/dllapi.h>
--- a/include/oox/core/contexthandler2.hxx
+++ b/include/oox/core/contexthandler2.hxx
@@ -21,13 +21,10 @@
 #define INCLUDED_OOX_CORE_CONTEXTHANDLER2_HXX

 #include <cstddef>
-#include <exception>
 #include <memory>
 #include <vector>

 #include <com/sun/star/uno/Reference.hxx>
-#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>
--- a/include/oox/core/fastparser.hxx
+++ b/include/oox/core/fastparser.hxx
@@ -20,11 +20,7 @@
 #ifndef INCLUDED_OOX_CORE_FASTPARSER_HXX
 #define INCLUDED_OOX_CORE_FASTPARSER_HXX

-#include <com/sun/star/io/IOException.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/xml/sax/SAXException.hpp>
 #include <rtl/ustring.hxx>
 #include <rtl/ref.hxx>
 #include <sal/types.h>
--- a/include/oox/core/fasttokenhandler.hxx
+++ b/include/oox/core/fasttokenhandler.hxx
@@ -20,12 +20,9 @@
 #ifndef INCLUDED_OOX_CORE_FASTTOKENHANDLER_HXX
 #define INCLUDED_OOX_CORE_FASTTOKENHANDLER_HXX

-#include <exception>
-
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <oox/dllapi.h>
--- a/include/oox/core/filterbase.hxx
+++ b/include/oox/core/filterbase.hxx
@@ -20,19 +20,15 @@
 #ifndef INCLUDED_OOX_CORE_FILTERBASE_HXX
 #define INCLUDED_OOX_CORE_FILTERBASE_HXX

-#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/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/implbase.hxx>
--- a/include/oox/core/filterdetect.hxx
+++ b/include/oox/core/filterdetect.hxx
@@ -20,16 +20,13 @@
 #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.hxx>
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/xml/sax/SAXException.hpp>
 #include <com/sun/star/xml/sax/XFastDocumentHandler.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <oox/dllapi.h>
--- a/include/oox/core/fragmenthandler.hxx
+++ b/include/oox/core/fragmenthandler.hxx
@@ -20,13 +20,9 @@
 #ifndef INCLUDED_OOX_CORE_FRAGMENTHANDLER_HXX
 #define INCLUDED_OOX_CORE_FRAGMENTHANDLER_HXX

-#include <exception>
-
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#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>
--- a/include/oox/core/fragmenthandler2.hxx
+++ b/include/oox/core/fragmenthandler2.hxx
@@ -20,12 +20,9 @@
 #ifndef INCLUDED_OOX_CORE_FRAGMENTHANDLER2_HXX
 #define INCLUDED_OOX_CORE_FRAGMENTHANDLER2_HXX

-#include <exception>
 #include <vector>

 #include <com/sun/star/uno/Reference.hxx>
-#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>
--- a/include/oox/core/recordparser.hxx
+++ b/include/oox/core/recordparser.hxx
@@ -23,9 +23,6 @@
 #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 <oox/helper/binaryinputstream.hxx>
 #include <oox/core/fragmenthandler.hxx>
 #include <rtl/ref.hxx>
--- a/include/oox/core/relationshandler.hxx
+++ b/include/oox/core/relationshandler.hxx
@@ -20,11 +20,7 @@
 #ifndef INCLUDED_OOX_CORE_RELATIONSHANDLER_HXX
 #define INCLUDED_OOX_CORE_RELATIONSHANDLER_HXX

-#include <exception>
-
 #include <com/sun/star/uno/Reference.hxx>
-#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>
--- a/include/oox/core/xmlfilterbase.hxx
+++ b/include/oox/core/xmlfilterbase.hxx
@@ -24,7 +24,6 @@
 #include <vector>

 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <oox/core/filterbase.hxx>
 #include <oox/core/relations.hxx>
 #include <oox/dllapi.h>
--- a/include/oox/crypto/CryptTools.hxx
+++ b/include/oox/crypto/CryptTools.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_OOX_CRYPTO_CRYPTTOOLS_HXX
 #define INCLUDED_OOX_CRYPTO_CRYPTTOOLS_HXX

-#include <config_oox.h>
 #include <oox/dllapi.h>
 #include <sal/types.h>

--- a/include/oox/crypto/DocumentEncryption.hxx
+++ b/include/oox/crypto/DocumentEncryption.hxx
@@ -15,7 +15,6 @@

 #include <com/sun/star/uno/Reference.hxx>
 #include <oox/crypto/Standard2007Engine.hxx>
-#include <oox/crypto/AgileEngine.hxx>
 #include <rtl/ustring.hxx>

 namespace com { namespace sun { namespace star {
--- a/include/oox/crypto/Standard2007Engine.hxx
+++ b/include/oox/crypto/Standard2007Engine.hxx
@@ -14,7 +14,6 @@
 #include <oox/dllapi.h>
 #include <oox/crypto/CryptoEngine.hxx>
 #include <filter/msfilter/mscodec.hxx>
-#include <rtl/digest.h>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>

--- a/include/oox/drawingml/diagram/diagram.hxx
+++ b/include/oox/drawingml/diagram/diagram.hxx
@@ -21,8 +21,8 @@
 #define INCLUDED_OOX_DRAWINGML_DIAGRAM_DIAGRAM_HXX

 #include <rtl/ustring.hxx>
-#include <oox/drawingml/shape.hxx>
 #include <oox/core/xmlfilterbase.hxx>
+#include <oox/drawingml/drawingmltypes.hxx>

 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/uno/Reference.hxx>
--- a/include/oox/drawingml/shapepropertymap.hxx
+++ b/include/oox/drawingml/shapepropertymap.hxx
@@ -20,9 +20,6 @@
 #ifndef INCLUDED_OOX_DRAWINGML_SHAPEPROPERTYMAP_HXX
 #define INCLUDED_OOX_DRAWINGML_SHAPEPROPERTYMAP_HXX

-#include <cstddef>
-#include <vector>
-
 #include <com/sun/star/uno/Any.hxx>
 #include <o3tl/enumarray.hxx>
 #include <oox/dllapi.h>
--- a/include/oox/dump/xlsbdumper.hxx
+++ b/include/oox/dump/xlsbdumper.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_OOX_DUMP_XLSBDUMPER_HXX
 #define INCLUDED_OOX_DUMP_XLSBDUMPER_HXX

-#include <memory>
-
 #include <com/sun/star/uno/Reference.hxx>
 #include <oox/dump/dumperbase.hxx>
 #include <rtl/ustring.hxx>
--- a/include/oox/export/utils.hxx
+++ b/include/oox/export/utils.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_OOX_EXPORT_UTILS_HXX

 #include <rtl/string.hxx>
-#include <rtl/textenc.h>
 #include <sal/types.h>

 inline OString I32SHEX(sal_Int32 x)
--- a/include/oox/helper/graphichelper.hxx
+++ b/include/oox/helper/graphichelper.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_OOX_HELPER_GRAPHICHELPER_HXX
 #define INCLUDED_OOX_HELPER_GRAPHICHELPER_HXX

-#include <deque>
 #include <map>

 #include <com/sun/star/awt/DeviceInfo.hpp>
--- a/include/oox/helper/helper.hxx
+++ b/include/oox/helper/helper.hxx
@@ -22,13 +22,11 @@

 #include <sal/config.h>

-#include <algorithm>
 #include <cstring>
 #include <limits>

 #include <osl/endian.h>
 #include <rtl/math.hxx>
-#include <rtl/string.hxx>
 #include <rtl/textenc.h>
 #include <sal/macros.h>
 #include <sal/types.h>
--- a/include/oox/ole/olehelper.hxx
+++ b/include/oox/ole/olehelper.hxx
@@ -25,7 +25,6 @@
 #include <oox/dllapi.h>
 #include <oox/helper/binarystreambase.hxx>
 #include <oox/helper/graphichelper.hxx>
-#include <oox/helper/helper.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 #include <tools/ref.hxx>
--- a/include/oox/ppt/pptimport.hxx
+++ b/include/oox/ppt/pptimport.hxx
@@ -20,13 +20,11 @@
 #ifndef INCLUDED_OOX_PPT_PPTIMPORT_HXX
 #define INCLUDED_OOX_PPT_PPTIMPORT_HXX

-#include <exception>
 #include <map>
 #include <memory>
 #include <vector>

 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <oox/core/filterbase.hxx>
 #include <oox/core/xmlfilterbase.hxx>
--- a/include/oox/shape/ShapeFilterBase.hxx
+++ b/include/oox/shape/ShapeFilterBase.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_OOX_SHAPE_SHAPEFILTERBASE_HXX

 #include <memory>
-#include <rtl/ref.hxx>
 #include <oox/dllapi.h>
 #include <oox/vml/vmldrawing.hxx>
 #include <oox/core/xmlfilterbase.hxx>
--- a/include/oox/vml/vmlinputstream.hxx
+++ b/include/oox/vml/vmlinputstream.hxx
@@ -20,15 +20,9 @@
 #ifndef INCLUDED_OOX_VML_VMLINPUTSTREAM_HXX
 #define INCLUDED_OOX_VML_VMLINPUTSTREAM_HXX

-#include <exception>
-
-#include <com/sun/star/io/BufferSizeExceededException.hpp>
-#include <com/sun/star/io/IOException.hpp>
-#include <com/sun/star/io/NotConnectedException.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <rtl/string.hxx>
--- a/oox/source/core/fastparser.cxx
+++ b/oox/source/core/fastparser.cxx
@@ -19,6 +19,7 @@

 #include <sal/config.h>

+#include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/xml/sax/FastParser.hpp>
 #include <oox/core/fastparser.hxx>

--- a/oox/source/core/recordparser.cxx
+++ b/oox/source/core/recordparser.cxx
@@ -20,7 +20,9 @@
 #include <oox/core/recordparser.hxx>

 #include <vector>
+#include <com/sun/star/io/IOException.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/xml/sax/SAXException.hpp>
 #include <com/sun/star/xml/sax/XLocator.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <osl/diagnose.h>
--- a/oox/source/crypto/CryptTools.cxx
+++ b/oox/source/crypto/CryptTools.cxx
@@ -12,6 +12,8 @@
 #include <filter/msfilter/mscodec.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>

+#include <config_oox.h>
+
 #if USE_TLS_OPENSSL
 #include <openssl/evp.h>
 #include <openssl/sha.h>
--- a/oox/source/docprop/ooxmldocpropimport.cxx
+++ b/oox/source/docprop/ooxmldocpropimport.cxx
@@ -24,6 +24,8 @@
 #include <com/sun/star/embed/XHierarchicalStorageAccess.hpp>
 #include <com/sun/star/embed/XRelationshipAccess.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
+#include <com/sun/star/io/IOException.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <oox/core/fastparser.hxx>
 #include <oox/core/relations.hxx>
 #include <oox/helper/containerhelper.hxx>
--- a/oox/source/drawingml/textparagraphpropertiescontext.cxx
+++ b/oox/source/drawingml/textparagraphpropertiescontext.cxx
@@ -21,6 +21,7 @@

 #include <com/sun/star/text/WritingMode2.hpp>
 #include <com/sun/star/style/ParagraphAdjust.hpp>
+#include <com/sun/star/xml/sax/SAXException.hpp>

 #include <svx/unopage.hxx>
 #include <sal/log.hxx>
--- a/oox/source/vml/vmlinputstream.cxx
+++ b/oox/source/vml/vmlinputstream.cxx
@@ -19,6 +19,7 @@

 #include <oox/vml/vmlinputstream.hxx>

+#include <com/sun/star/io/IOException.hpp>
 #include <com/sun/star/io/XTextInputStream2.hpp>
 #include <map>
 #include <string.h>