sw: fix some IWYU warnings

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

25 files changed, 16 insertions, 51 deletions

diff --git a/sw/inc/ddefld.hxx b/sw/inc/ddefld.hxx
index 938e515caef5..547cf9810a1d 100644
--- a/sw/inc/ddefld.hxx
+++ b/sw/inc/ddefld.hxx
@@ -23,9 +23,10 @@
 #include <svl/hint.hxx>
 #include "swdllapi.h"
 #include "fldbas.hxx"
-#include "ndarr.hxx"
 
 class SwDoc;
+class SwNode;
+class SwNodes;
 
 namespace sw
 {
diff --git a/sw/inc/ftninfo.hxx b/sw/inc/ftninfo.hxx
index 2af826afa02a..226aa98bb783 100644
--- a/sw/inc/ftninfo.hxx
+++ b/sw/inc/ftninfo.hxx
@@ -23,7 +23,6 @@
 #include "swdllapi.h"
 #include "calbck.hxx"
 #include <editeng/numitem.hxx>
-#include "fmtcol.hxx"
 
 class SwTextFormatColl;
 class SwPageDesc;
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index 50afd3d98334..2ffa595abe28 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -30,6 +30,8 @@ class SwFormatChg;
 class SwUpdateAttr;
 class SwAttrSetChg;
 class SwDocPosUpdate;
+class SwFormatMeta;
+class SvXMLAttrContainerItem;
 
 // For SwTextHints without end index the following char is added:
 
diff --git a/sw/inc/swddetbl.hxx b/sw/inc/swddetbl.hxx
index 6e5cbf090a06..a54d200ff33d 100644
--- a/sw/inc/swddetbl.hxx
+++ b/sw/inc/swddetbl.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SW_INC_SWDDETBL_HXX
 
 #include "swtable.hxx"
-#include "ddefld.hxx"
 
 class SwDDEFieldType;
 
diff --git a/sw/inc/swunohelper.hxx b/sw/inc/swunohelper.hxx
index 5d50605cd759..79ad3c47a295 100644
--- a/sw/inc/swunohelper.hxx
+++ b/sw/inc/swunohelper.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_SW_INC_SWUNOHELPER_HXX
 #define INCLUDED_SW_INC_SWUNOHELPER_HXX
 
-#include <tools/solar.h>
 #include <sal/types.h>
+#include <rtl/ustring.hxx>
 #include "swdllapi.h"
 
 #include <vector>
@@ -30,7 +30,6 @@ namespace com { namespace sun { namespace star {
         class Any;
     }
 }}}
-namespace rtl {class OUString;}
 class DateTime;
 class SfxItemSet;
 
diff --git a/sw/inc/swwait.hxx b/sw/inc/swwait.hxx
index 71c25d7cc15d..ed256de76c12 100644
--- a/sw/inc/swwait.hxx
+++ b/sw/inc/swwait.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SW_INC_SWWAIT_HXX
 #define INCLUDED_SW_INC_SWWAIT_HXX
 
-#include <tools/solar.h>
 #include "swdllapi.h"
 
 #include <unordered_set>
diff --git a/sw/inc/tabcol.hxx b/sw/inc/tabcol.hxx
index 51aa940b99aa..3fee607a881c 100644
--- a/sw/inc/tabcol.hxx
+++ b/sw/inc/tabcol.hxx
@@ -19,8 +19,6 @@
 #ifndef INCLUDED_SW_INC_TABCOL_HXX
 #define INCLUDED_SW_INC_TABCOL_HXX
 
-#include <tools/solar.h>
-
 #include <vector>
 #include <memory>
 
diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index 11ea7488cd73..c12db612b11f 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -30,7 +30,6 @@
 
 #include <memory>
 
-#include "hintids.hxx"
 #include <svx/algitem.hxx>
 #include <editeng/fontitem.hxx>
 #include <editeng/fhgtitem.hxx>
@@ -53,14 +52,13 @@
 #include <svl/intitem.hxx>
 #include <editeng/lineitem.hxx>
 #include "fmtpdsc.hxx"
-#include "fmtlsplt.hxx"
-#include "fmtrowsplt.hxx"
 #include "fmtornt.hxx"
 #include "swdllapi.h"
 
 struct SwAfVersions;
 
 class SvNumberFormatter;
+class SwTable;
 
 class SwBoxAutoFormat
 {
diff --git a/sw/inc/toxwrap.hxx b/sw/inc/toxwrap.hxx
index 820aaad32a99..02108f6f0a09 100644
--- a/sw/inc/toxwrap.hxx
+++ b/sw/inc/toxwrap.hxx
@@ -20,18 +20,13 @@
 #ifndef INCLUDED_SW_INC_TOXWRAP_HXX
 #define INCLUDED_SW_INC_TOXWRAP_HXX
 
-#include <tools/solar.h>
 #include <com/sun/star/lang/Locale.hpp>
-#include <com/sun/star/uno/Reference.hxx>
 #include "swdllapi.h"
 
 namespace com { namespace sun { namespace star {
 namespace i18n {
     class XExtendedIndexEntrySupplier;
 }
-namespace lang {
-    class XMultiServiceFactory;
-}
 }}}
 
 class SW_DLLPUBLIC IndexEntrySupplierWrapper
diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx
index 865fbe539a29..a3b0fd0353df 100644
--- a/sw/inc/txatbase.hxx
+++ b/sw/inc/txatbase.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SW_INC_TXATBASE_HXX
 #define INCLUDED_SW_INC_TXATBASE_HXX
 
-#include <tools/solar.h>
 #include <svl/poolitem.hxx>
 #include "hintids.hxx"
 #include "fmtautofmt.hxx"
@@ -29,13 +28,10 @@
 #include "fmtfld.hxx"
 #include "fmtflcnt.hxx"
 #include "fmtftn.hxx"
-#include "fmtmeta.hxx"
 #include "fchrfmt.hxx"
 #include "tox.hxx"
 
-
 class SfxItemPool;
-class SvXMLAttrContainerItem;
 
 class SAL_DLLPUBLIC_RTTI SwTextAttr
 {
diff --git a/sw/inc/txatritr.hxx b/sw/inc/txatritr.hxx
index 96e4c296c3f3..32b3e4bc3069 100644
--- a/sw/inc/txatritr.hxx
+++ b/sw/inc/txatritr.hxx
@@ -19,10 +19,8 @@
 #ifndef INCLUDED_SW_INC_TXATRITR_HXX
 #define INCLUDED_SW_INC_TXATRITR_HXX
 
-#include <tools/solar.h>
 #include <sal/types.h>
 #include <editeng/langitem.hxx>
-#include "hintids.hxx"
 #include "swtypes.hxx"
 #include <deque>
 
diff --git a/sw/inc/txtannotationfld.hxx b/sw/inc/txtannotationfld.hxx
index 101011c0377f..501c280a1040 100644
--- a/sw/inc/txtannotationfld.hxx
+++ b/sw/inc/txtannotationfld.hxx
@@ -21,9 +21,8 @@
 #define INCLUDED_SW_INC_TXTANNOTATIONFLD_HXX
 
 #include "txtfld.hxx"
-#include "IMark.hxx"
 
-class SwDoc;
+namespace sw { namespace mark { class IMark; } }
 
 class SwTextAnnotationField : public SwTextField
 {
diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx
index d25b26075504..4b0372b65c9c 100644
--- a/sw/inc/txtatr.hxx
+++ b/sw/inc/txtatr.hxx
@@ -24,6 +24,7 @@
 
 class SwTextNode;
 class SwCharFormat;
+class SwFormatMeta;
 
 namespace sw {
     class MetaFieldManager;
diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx
index 87a01c906961..11c13edeedc9 100644
--- a/sw/inc/txtfld.hxx
+++ b/sw/inc/txtfld.hxx
@@ -21,7 +21,6 @@
 
 #include "txatbase.hxx"
 #include <rtl/ustring.hxx>
-#include <osl/diagnose.h>
 
 #include <memory>
 #include <cassert>
diff --git a/sw/inc/txtinet.hxx b/sw/inc/txtinet.hxx
index 6bbc14d528e8..f46601dbac03 100644
--- a/sw/inc/txtinet.hxx
+++ b/sw/inc/txtinet.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SW_INC_TXTINET_HXX
 
 #include "txatbase.hxx"
-#include "txtatr.hxx"
 #include "calbck.hxx"
 
 class SwTextNode;
diff --git a/sw/inc/unobaseclass.hxx b/sw/inc/unobaseclass.hxx
index 7a6365e9aefc..19f4077d0a2b 100644
--- a/sw/inc/unobaseclass.hxx
+++ b/sw/inc/unobaseclass.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/container/XEnumeration.hpp>
 
 #include <cppuhelper/implbase.hxx>
-#include <sal/log.hxx>
 #include <vcl/svapp.hxx>
 
 class SfxPoolItem;
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index 17708e6f69f7..8910ec01cde4 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -37,9 +37,7 @@
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
-#include <com/sun/star/util/XModifyBroadcaster.hpp>
 #include <com/sun/star/util/XModifyListener.hpp>
-#include <com/sun/star/chart/ChartDataRowSource.hpp>
 #include <com/sun/star/table/XCell.hpp>
 
 #include <comphelper/interfacecontainer2.hxx>
@@ -60,7 +58,6 @@ class SwTable;
 class SwTableBox;
 struct SwRangeDescriptor;
 class SwSelBoxes;
-class SwFrameFormat;
 
 bool FillRangeDescriptor( SwRangeDescriptor &rDesc, const OUString &rCellRangeName );
 
diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx
index 9048a2c4d8d0..512f7dedb0fa 100644
--- a/sw/inc/unocoll.hxx
+++ b/sw/inc/unocoll.hxx
@@ -18,16 +18,13 @@
  */
 #ifndef INCLUDED_SW_INC_UNOCOLL_HXX
 #define INCLUDED_SW_INC_UNOCOLL_HXX
-#include <tools/solar.h>
+#include <limits.h>
 #include "flyenum.hxx"
-#include <vcl/timer.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <cppuhelper/implbase.hxx>
-#include "IMark.hxx"
-#include "unobaseclass.hxx"
 #include "swdllapi.h"
 
 class SwDoc;
@@ -38,15 +35,8 @@ namespace com{namespace sun {namespace star {namespace text
     class XTextSection;
     class XFootnote;
 }}}}
-class SwXFrame;
-class SwFrameFormat;
 class SwFormatFootnote;
-class XBookmark;
-class SwXReferenceMark;
 class SwSectionFormat;
-class SwFormatRefMark;
-class SwXReferenceMark;
-class SwXBookmark;
 struct SvEventDescription;
 
 const SvEventDescription* sw_GetSupportedMacroItems();
diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx
index f1bd8bd20ee1..56e0d48e1331 100644
--- a/sw/inc/unocrsrhelper.hxx
+++ b/sw/inc/unocrsrhelper.hxx
@@ -19,10 +19,6 @@
 #ifndef INCLUDED_SW_INC_UNOCRSRHELPER_HXX
 #define INCLUDED_SW_INC_UNOCRSRHELPER_HXX
 
-#include <com/sun/star/beans/XPropertyState.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/uno/DeploymentException.hpp>
-
 #include "swtypes.hxx"
 #include "flyenum.hxx"
 #include "pam.hxx"
@@ -44,11 +40,9 @@ class SwDoc;
 namespace sw { namespace mark { class IMark; } }
 
 namespace com{ namespace sun{ namespace star{
-    namespace uno{
-        class Any;
-    }
     namespace beans{
         struct PropertyValue;
+        enum class PropertyState;
     }
     namespace text {
         class XTextContent;
diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index 6b35f6468b4a..aea0b64ce67c 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -32,8 +32,6 @@
 #include <cppuhelper/implbase6.hxx>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/drawing/HomogenMatrix3.hpp>
-#include <svl/itemprop.hxx>
-#include <set>
 
 class SdrMarkList;
 class SdrView;
@@ -110,7 +108,6 @@ public:
 };
 
 class SwShapeDescriptor_Impl;
-class SwXGroupShape;
 typedef
 cppu::WeakAggImplHelper6
 <
diff --git a/sw/inc/unoredline.hxx b/sw/inc/unoredline.hxx
index e28064e8a102..ffed204d15f3 100644
--- a/sw/inc/unoredline.hxx
+++ b/sw/inc/unoredline.hxx
@@ -20,6 +20,7 @@
 #define INCLUDED_SW_INC_UNOREDLINE_HXX
 
 #include "unotext.hxx"
+#include "ndindex.hxx"
 
 class SwRangeRedline;
 
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 8e4a253ded88..dc0272e74961 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -41,6 +41,8 @@
 #include <hintids.hxx>
 #include <fmtornt.hxx>
 #include <editsh.hxx>
+#include <fmtlsplt.hxx>
+#include <fmtrowsplt.hxx>
 
 #include <memory>
 #include <vector>
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index 21800a9ec237..7a62f44d1049 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -86,6 +86,7 @@
 #include <undobj.hxx>
 #include <UndoParagraphSignature.hxx>
 #include <txtatr.hxx>
+#include <fmtmeta.hxx>
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 2cdd6670dc0e..9de435cbb897 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -127,6 +127,7 @@
 #include <IDocumentRedlineAccess.hxx>
 #include <grfatr.hxx>
 #include <frmatr.hxx>
+#include <txtatr.hxx>
 
 #include <osl/file.hxx>
 #include <vcl/embeddedfontshelper.hxx>
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index 27205f248222..7ca7c63922cc 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -37,6 +37,7 @@
 #include "xmlexp.hxx"
 #include "xmltexte.hxx"
 #include <SwAppletImpl.hxx>
+#include <ndindex.hxx>
 
 #include <svl/urihelper.hxx>
 #include <sfx2/frmdescr.hxx>