sw: fix some IWYU warnings

Change-Id: Idff219e1c8f18adaa0f445a5469650c7793cae3a
Reviewed-on: https://gerrit.libreoffice.org/53066
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>

13 files changed, 32 insertions, 43 deletions

diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 3a7ecbd9e030..6ecf2ce5e75b 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -29,16 +29,12 @@
 #include "tblenum.hxx"
 #include "tox.hxx"
 
-#include <com/sun/star/linguistic2/ProofreadingResult.hpp>
-#include <com/sun/star/linguistic2/XSpellAlternatives.hpp>
-
 #include <memory>
 #include <vector>
 #include <set>
 
 namespace tools { class PolyPolygon; }
 class SwDoc;
-class DateTime;
 class CommandExtTextInputData;
 
 class SvNumberFormatter;
@@ -47,8 +43,6 @@ class SfxItemSet;
 class SfxWatermarkItem;
 class SvxAutoCorrect;
 
-class SwField;
-class SwFieldType;
 class SwDDEFieldType;
 class SwDBManager;
 
@@ -61,11 +55,7 @@ class SwNumRule;
 
 class SwTextFormatColl;
 class SwGrfNode;
-class SwFlyFrameFormat;
 
-class SwFrameFormat;
-class SwCharFormat;
-class SwExtTextInput;
 class Graphic;
 class GraphicObject;
 class GraphicAttr;
@@ -103,6 +93,8 @@ enum class GraphicType;
 namespace com { namespace sun { namespace star { namespace uno {
     template < class > class Sequence;
 }}}}
+namespace com { namespace sun { namespace star { namespace linguistic2 { class XSpellAlternatives; } } } }
+namespace com { namespace sun { namespace star { namespace linguistic2 { struct ProofreadingResult; } } } }
 
 namespace svx{
     struct SpellPortion;
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index f9a731ef96d1..e530385297cc 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SW_INC_FESH_HXX
 
 #include <com/sun/star/text/RelOrientation.hpp>
-#include <com/sun/star/embed/XEmbeddedObject.hpp>
 
 #include <svx/svdobj.hxx>
 #include "swdllapi.h"
@@ -45,10 +44,7 @@ class SwTableAutoFormat;
 class SwFrame;
 class SwFormatFrameSize;
 class SwFormatRowSplit;
-class SdrObject;
-class Color;
 class Outliner;
-class SotDataObject;
 class SwFrameFormat;
 struct SwSortOptions;
 class SdrMarkList;
@@ -58,6 +54,7 @@ namespace svx
 {
     class ISdrObjectFilter;
 }
+namespace com { namespace sun { namespace star { namespace embed { class XEmbeddedObject; } } } }
 
 // return values for GetFrameType() and GetSelFrameType().
 //! values can be combined via logical or
diff --git a/sw/inc/finalthreadmanager.hxx b/sw/inc/finalthreadmanager.hxx
index 009a18e6ab4e..b23204529298 100644
--- a/sw/inc/finalthreadmanager.hxx
+++ b/sw/inc/finalthreadmanager.hxx
@@ -25,12 +25,13 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/util/XJobManager.hpp>
 #include <com/sun/star/frame/XTerminateListener2.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <o3tl/deleter.hxx>
 #include <osl/mutex.hxx>
 #include <list>
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+
 class CancelJobsThread;
 class TerminateOfficeThread;
 class SwPauseThreadStarting;
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 44e06c2c34be..247a221cdbc5 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -22,14 +22,14 @@
 #include <i18nlangtag/lang.h>
 #include "swdllapi.h"
 #include "calbck.hxx"
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/uno/Any.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <editeng/svxenum.hxx>
 #include <vector>
 
 class SwDoc;
 class SvNumberFormatter;
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class Any; } } } }
 
 enum class SwFieldIds : sal_uInt16 {
 /// For old documents the Field-Which IDs must be preserved !!!
diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx
index 7ba785232232..cc4c365b1238 100644
--- a/sw/inc/fmtfld.hxx
+++ b/sw/inc/fmtfld.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_SW_INC_FMTFLD_HXX
 #define INCLUDED_SW_INC_FMTFLD_HXX
 
-#include <com/sun/star/text/XTextField.hpp>
-
 #include <cppuhelper/weakref.hxx>
 #include <svl/poolitem.hxx>
 #include <svl/SfxBroadcaster.hxx>
@@ -33,6 +31,7 @@ class SwField;
 class SwTextField;
 class SwView;
 class SwFieldType;
+namespace com { namespace sun { namespace star { namespace text { class XTextField; } } } }
 
 // ATT_FLD
 class SW_DLLPUBLIC SwFormatField
diff --git a/sw/inc/iodetect.hxx b/sw/inc/iodetect.hxx
index 388e7d9e7a29..e5223cdb7000 100644
--- a/sw/inc/iodetect.hxx
+++ b/sw/inc/iodetect.hxx
@@ -24,7 +24,6 @@
 #include <rtl/ustring.hxx>
 #include <tools/lineend.hxx>
 #include <tools/solar.h>
-#include <com/sun/star/embed/XStorage.hpp>
 #include "swdllapi.h"
 
 #define FILTER_RTF      "RTF"       ///< RTF filter
@@ -48,6 +47,8 @@ class SfxFilter;
 class SfxFilterContainer;
 class SotStorage;
 class SvStream;
+namespace com { namespace sun { namespace star { namespace embed { class XStorage; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename> class Reference; } } } }
 
 struct SwIoDetect
 {
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index 104b3eb68dd6..98480259db0d 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -23,15 +23,13 @@
 #include <sfx2/lnkbase.hxx>
 #include <vcl/GraphicObject.hxx>
 #include "ndnotxt.hxx"
-#include <com/sun/star/embed/XStorage.hpp>
 #include <memory>
 
 class SwAsyncRetrieveInputStreamThreadConsumer;
 
 class SwGrfFormatColl;
 class SwDoc;
-class GraphicAttr;
-class SotStorage;
+namespace com { namespace sun { namespace star { namespace embed { class XStorage; } } } }
 
 // SwGrfNode
 class SW_DLLPUBLIC SwGrfNode: public SwNoTextNode
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index f6a52d6ab4c9..225e0521530a 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -22,7 +22,6 @@
 #include <memory>
 
 #include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/embed/XStorage.hpp>
 #include <sot/storage.hxx>
 #include <tools/date.hxx>
 #include <tools/time.hxx>
@@ -53,6 +52,7 @@ namespace mark
 class IMark;
 }
 }
+namespace com { namespace sun { namespace star { namespace embed { class XStorage; } } } }
 
 // Defines the count of chars at which a paragraph read via ASCII/W4W-Reader
 // is forced to wrap. It has to be always greater than 200!!!
diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx
index f5813c9ee9b7..11b39a10fa3a 100644
--- a/sw/inc/splargs.hxx
+++ b/sw/inc/splargs.hxx
@@ -24,7 +24,6 @@
 
 #include <com/sun/star/linguistic2/XSpellAlternatives.hpp>
 #include <com/sun/star/linguistic2/XSpellChecker1.hpp>
-#include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
 
 #include <functional>
 
@@ -32,6 +31,7 @@ class SwTextFrame;
 class SwTextNode;
 class SwIndex;
 namespace vcl { class Font; }
+namespace com { namespace sun { namespace star { namespace linguistic2 { class XHyphenatedWord; } } } }
 
 struct SwArgsBase     // used for text conversion (Hangul/Hanja, ...)
 {
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 92699b35f7ee..14d352f4e481 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -23,9 +23,6 @@
 #include <sfx2/sfxdlg.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.h>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XNamed.hpp>
 #include <boost/optional.hpp>
 #include "dbmgr.hxx"
 #include <cnttab.hxx>
@@ -34,15 +31,11 @@
 class SfxViewFrame;
 class SfxBindings;
 class SfxItemSet;
-class ResId;
 namespace vcl { class Window; }
-class SfxItemPool;
 class SfxStyleSheetBase;
 class SwGlossaryHdl;
 class SwField;
 
-class SwLabFormatPage;
-class SwLabRec;
 class SwAsciiOptions;
 class SwDocShell;
 class SvStream;
@@ -51,16 +44,12 @@ class SfxRequest;
 class SwView;
 class SwTableAutoFormat;
 class SwTOXMgr;
-class SwForm;
-struct CurTOXType;
 class SwTOXDescription;
 class SwTOXBase;
 class SwSectionData;
 struct SwDBData;
-class SwField;
 class Printer;
 class SwLabItem;
-class SwDBManager;
 class SwTableFUNC;
 class SwChildWinWrapper;
 struct SfxChildWinInfo;
@@ -73,7 +62,7 @@ enum class SfxStyleFamily;
 
 namespace com{namespace sun{namespace star{
     namespace frame{
-        class XFrame;
+        class XModel;
     }
     namespace sdbcx{
     class XColumnsSupplier;
@@ -83,6 +72,8 @@ namespace com{namespace sun{namespace star{
     class XConnection;
     class XResultSet;
     }
+    namespace container { class XNameAccess; }
+    namespace container { class XNamed; }
 }}}
 
 typedef   void (*SwLabDlgMethod) (css::uno::Reference< css::frame::XModel> const & xModel, const SwLabItem& rItem);
@@ -351,7 +342,6 @@ public:
 #define RET_TARGET_CREATED      103
 #define RET_REMOVE_TARGET       104
 
-class SwView;
 class SwMailMergeConfigItem;
 
 class AbstractMailMergeWizard : public VclAbstractDialog2
diff --git a/sw/inc/swacorr.hxx b/sw/inc/swacorr.hxx
index fc39a81a72bc..6d4771f14986 100644
--- a/sw/inc/swacorr.hxx
+++ b/sw/inc/swacorr.hxx
@@ -23,11 +23,11 @@
 #include <editeng/svxacorr.hxx>
 
 #include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/embed/XStorage.hpp>
 
 #include "swdllapi.h"
 
 class SwXMLTextBlocks;
+namespace com { namespace sun { namespace star { namespace embed { class XStorage; } } } }
 
 class SW_DLLPUBLIC SwAutoCorrect : public SvxAutoCorrect
 {
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index 7302281e7f66..e70599f85a21 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -31,8 +31,6 @@
 #include "swdllapi.h"
 #include "shellid.hxx"
 #include "fldupde.hxx"
-#include <com/sun/star/linguistic2/XLinguServiceEventListener.hpp>
-#include <com/sun/star/linguistic2/XLanguageGuessing.hpp>
 
 class Color;
 class SfxItemSet;
@@ -68,6 +66,8 @@ enum class SvViewOpt {
 namespace com{ namespace sun{ namespace star{ namespace scanner{
     class XScannerManager2;
 }}}}
+namespace com { namespace sun { namespace star { namespace linguistic2 { class XLanguageGuessing; } } } }
+namespace com { namespace sun { namespace star { namespace linguistic2 { class XLinguServiceEventListener; } } } }
 
 class SW_DLLPUBLIC SwModule final : public SfxModule, public SfxListener, public utl::ConfigurationListener
 {
diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx
index 4e94e9b94e39..547141a933ca 100644
--- a/sw/inc/textboxhelper.hxx
+++ b/sw/inc/textboxhelper.hxx
@@ -14,7 +14,6 @@
 #include <set>
 #include <vector>
 
-#include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/uno/Any.h>
 #include <com/sun/star/uno/Type.h>
 
@@ -32,7 +31,19 @@ namespace tools
 class Rectangle;
 }
 class ZSortFly;
-class SwNode;
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace drawing
+{
+class XShape;
+}
+}
+}
+}
 
 /**
  * A TextBox is a TextFrame, that is tied to a drawinglayer shape.