include/IwyuFilter_include.yaml | 5 +++++
include/sot/exchange.hxx | 6 +-----
include/sot/filelist.hxx | 3 ++-
include/sot/formats.hxx | 2 +-
include/sot/stg.hxx | 18 ++++--------------
include/sot/storage.hxx | 9 +++++----
include/sot/storinfo.hxx | 6 ++++--
include/svtools/transfer.hxx | 1 +
sc/source/ui/inc/areasave.hxx | 1 +
sot/inc/sysformats.hxx | 2 ++
sot/source/base/formats.cxx | 1 +
sot/source/unoolestorage/xolesimplestorage.hxx | 2 ++
12 files changed, 29 insertions(+), 27 deletions(-)
New commits:
commit 50823d893807d590d20ca8ee97a9a345d5df4ac3
Author: Gabor Kelemen <kelem...@ubuntu.com>
AuthorDate: Fri Oct 26 20:14:08 2018 +0200
Commit: Miklos Vajna <vmik...@collabora.co.uk>
CommitDate: Mon Nov 5 10:09:53 2018 +0100
tdf#42949 Fix IWYU warnings in include/sot/*
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: Ic5d0dd8c712e74825ed0d0de6bf366568ca48f25
Reviewed-on: https://gerrit.libreoffice.org/62460
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index f3513cba7d5f..cdcaee4bfe10 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -209,6 +209,11 @@ blacklist:
- com/sun/star/lang/XServiceInfo.hpp
- com/sun/star/rendering/XBezierPolyPolygon2D.hpp
- com/sun/star/rendering/XLinePolyPolygon2D.hpp
+ include/sot/exchange.hxx:
+ # Needed for template
+ - o3tl/typed_flags_set.hxx
+ # Used in a macro #define
+ - com/sun/star/datatransfer/dnd/DNDConstants.hpp
include/tools/debug.hxx:
# Used behind #ifndef
- tools/toolsdllapi.h
diff --git a/include/sot/exchange.hxx b/include/sot/exchange.hxx
index 3ea611799506..15279ebab582 100644
--- a/include/sot/exchange.hxx
+++ b/include/sot/exchange.hxx
@@ -20,22 +20,18 @@
#ifndef INCLUDED_SOT_EXCHANGE_HXX
#define INCLUDED_SOT_EXCHANGE_HXX
-#include <list>
#include <vector>
-#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/datatransfer/DataFlavor.hpp>
#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
#include <sot/sotdllapi.h>
#include <sot/formats.hxx>
-#include <tools/solar.h>
#include <o3tl/typed_flags_set.hxx>
-class SotDataObject;
-
namespace com { namespace sun { namespace star { namespace datatransfer {
class XTransferable;
} } } }
+namespace com { namespace sun { namespace star { namespace uno { template
<typename > class Reference; } } } }
struct DataFlavorEx : public css::datatransfer::DataFlavor
{
diff --git a/include/sot/filelist.hxx b/include/sot/filelist.hxx
index d8895644e4ae..f853fa4757d7 100644
--- a/include/sot/filelist.hxx
+++ b/include/sot/filelist.hxx
@@ -21,9 +21,10 @@
#define INCLUDED_SOT_FILELIST_HXX
#include <sot/sotdllapi.h>
-#include <tools/stream.hxx>
+#include <rtl/ustring.hxx>
#include <vector>
+class SvStream;
class SOT_DLLPUBLIC FileList
{
diff --git a/include/sot/formats.hxx b/include/sot/formats.hxx
index a1f5f8858335..968af5232c79 100644
--- a/include/sot/formats.hxx
+++ b/include/sot/formats.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SOT_FORMATS_HXX
#define INCLUDED_SOT_FORMATS_HXX
-#include <tools/solar.h>
+#include <sal/types.h>
// - predefined formats -
// Do NOT change the order of these values as the implementation depends on
them!
diff --git a/include/sot/stg.hxx b/include/sot/stg.hxx
index b932f9139b09..d692403b9a72 100644
--- a/include/sot/stg.hxx
+++ b/include/sot/stg.hxx
@@ -20,28 +20,18 @@
#ifndef INCLUDED_SOT_STG_HXX
#define INCLUDED_SOT_STG_HXX
-#include <com/sun/star/uno/Any.h>
-#include <com/sun/star/uno/Reference.h>
-
-#include <com/sun/star/io/XInputStream.hpp>
-
-#include <com/sun/star/ucb/XCommandEnvironment.hpp>
-
-#include <com/sun/star/embed/XStorage.hpp>
-
-
#include <tools/solar.h>
#include <tools/stream.hxx>
#include <tools/globname.hxx>
#include <sot/storinfo.hxx>
#include <sot/sotdllapi.h>
-class Storage;
-class StorageStream;
+namespace com { namespace sun { namespace star { namespace ucb { class
XProgressHandler; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class Any; }
} } }
+namespace com { namespace sun { namespace star { namespace uno { template
<typename > class Reference; } } } }
+
class StgIo;
class StgDirEntry;
-class StgStrm;
-class SvGlobalName;
typedef struct SvGUID ClsId;
class SOT_DLLPUBLIC StorageBase : public SvRefBase
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index 83437604d164..6a7e25af9dfb 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -20,18 +20,19 @@
#ifndef INCLUDED_SOT_STORAGE_HXX
#define INCLUDED_SOT_STORAGE_HXX
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/embed/XStorage.hpp>
#include <sot/object.hxx>
#include <tools/stream.hxx>
+#include <tools/globname.hxx>
#include <vcl/errcode.hxx>
#include <sot/storinfo.hxx>
#include <sot/sotdllapi.h>
+namespace com { namespace sun { namespace star { namespace embed { class
XStorage; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class Any; }
} } }
+namespace com { namespace sun { namespace star { namespace uno { template
<typename > class Reference; } } } }
+
enum class SotClipboardFormatId : sal_uInt32;
-class SotStorage;
class BaseStorageStream;
class SOT_DLLPUBLIC SotStorageStream : virtual public SotObject, public
SvStream
{
diff --git a/include/sot/storinfo.hxx b/include/sot/storinfo.hxx
index 004101d8c22c..b9a3c4fe13d2 100644
--- a/include/sot/storinfo.hxx
+++ b/include/sot/storinfo.hxx
@@ -20,13 +20,15 @@
#ifndef INCLUDED_SOT_STORINFO_HXX
#define INCLUDED_SOT_STORINFO_HXX
-#include <tools/globname.hxx>
+#include <rtl/ustring.hxx>
#include <tools/solar.h>
#include <vector>
#include <sot/sotdllapi.h>
-#include <sot/exchange.hxx>
+#include <sot/formats.hxx>
class StgDirEntry;
+class SvStream;
+
class SvStorageInfo
{
friend class SotStorage;
diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx
index dfd6e1b77dc0..24ddf24be61f 100644
--- a/include/svtools/transfer.hxx
+++ b/include/svtools/transfer.hxx
@@ -25,6 +25,7 @@
#include <tools/gen.hxx>
#include <tools/link.hxx>
#include <tools/ref.hxx>
+#include <tools/solar.h>
#include <sot/formats.hxx>
#include <sot/exchange.hxx>
#include <cppuhelper/implbase.hxx>
diff --git a/sc/source/ui/inc/areasave.hxx b/sc/source/ui/inc/areasave.hxx
index cf4cbc587810..817832cce920 100644
--- a/sc/source/ui/inc/areasave.hxx
+++ b/sc/source/ui/inc/areasave.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_SC_SOURCE_UI_INC_AREASAVE_HXX
#include <address.hxx>
+#include <tools/solar.h>
#include <vector>
diff --git a/sot/inc/sysformats.hxx b/sot/inc/sysformats.hxx
index 38276e7e4f9c..a34375df3d8b 100644
--- a/sot/inc/sysformats.hxx
+++ b/sot/inc/sysformats.hxx
@@ -25,6 +25,8 @@
#endif
#include <sot/sotdllapi.h>
+#include <sot/exchange.hxx>
+#include <sot/formats.hxx>
struct SotAction_Impl
{
diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index 2ee87e71458d..9b7770f146ef 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.cxx
@@ -27,6 +27,7 @@
#include <comphelper/fileformat.h>
#include <tools/globname.hxx>
+#include <tools/stream.hxx>
#include <com/sun/star/datatransfer/DataFlavor.hpp>
#include <com/sun/star/datatransfer/UnsupportedFlavorException.hpp>
#include <com/sun/star/datatransfer/XTransferable.hpp>
diff --git a/sot/source/unoolestorage/xolesimplestorage.hxx
b/sot/source/unoolestorage/xolesimplestorage.hxx
index 13ba9d01e5d8..3cd4d86c011e 100644
--- a/sot/source/unoolestorage/xolesimplestorage.hxx
+++ b/sot/source/unoolestorage/xolesimplestorage.hxx
@@ -22,6 +22,8 @@
#include <sal/config.h>
+#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/io/XStream.hpp>
#include <com/sun/star/embed/XOLESimpleStorage.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/lang/XComponent.hpp>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
