Fix some IWYU warnings

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

30 files changed, 50 insertions, 9 deletions

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 440127f743fd..eb04a2ab9b3b 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -172,6 +172,8 @@ class IDocumentExternalData;
 class IDocumentMarkAccess;
 class SetGetExpFields;
 struct SwInsertTableOptions;
+enum class SvMacroItemId : sal_uInt16;
+enum class SvxFrameDirection;
 
 namespace sw { namespace mark {
     class MarkManager;
diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx
index cfdc600562f7..70e29236bd31 100644
--- a/sw/inc/fmtanchr.hxx
+++ b/sw/inc/fmtanchr.hxx
@@ -21,7 +21,6 @@
 
 #include "swdllapi.h"
 #include "hintids.hxx"
-#include "swtypes.hxx"
 #include "format.hxx"
 #include <svl/poolitem.hxx>
 
diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx
index cfdbfd9c2004..326ba0983da6 100644
--- a/sw/inc/fmtautofmt.hxx
+++ b/sw/inc/fmtautofmt.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SW_INC_FMTAUTOFMT_HXX
 
 #include <svl/poolitem.hxx>
-#include "format.hxx"
 #include <memory>
 
 class SwFormatAutoFormat: public SfxPoolItem
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index 48cbedb3d99e..4f960fdcdf21 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -20,14 +20,14 @@
 #define INCLUDED_SW_INC_FMTCOL_HXX
 
 #include "swdllapi.h"
-#include "frmatr.hxx"
-#include "swtypes.hxx"
+#include "format.hxx"
 #include <rtl/ustring.hxx>
 
 #include <vector>
 #include <memory>
 
 class SwDoc;
+class SwAttrPool;
 namespace sw{ class DocumentStylePoolManager; }
 
 class SAL_DLLPUBLIC_RTTI SwFormatColl : public SwFormat
diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx
index e8c747d7ad4b..52279dbca158 100644
--- a/sw/inc/fmtftntx.hxx
+++ b/sw/inc/fmtftntx.hxx
@@ -20,9 +20,9 @@
 #define INCLUDED_SW_INC_FMTFTNTX_HXX
 
 #include <svl/eitem.hxx>
+#include <editeng/numitem.hxx>
 #include "hintids.hxx"
 #include "format.hxx"
-#include "numrule.hxx"
 #include "swdllapi.h"
 
 enum SwFootnoteEndPosEnum
diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx
index 84e4d56e6e35..8bba534cd392 100644
--- a/sw/inc/fmtline.hxx
+++ b/sw/inc/fmtline.hxx
@@ -21,8 +21,8 @@
 
 #include <svl/poolitem.hxx>
 #include "hintids.hxx"
-#include "format.hxx"
 #include "swdllapi.h"
+#include "swatrset.hxx"
 
 class IntlWrapper;
 
diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx
index db332969b337..9154e7913594 100644
--- a/sw/inc/fmtruby.hxx
+++ b/sw/inc/fmtruby.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_SW_INC_FMTRUBY_HXX
 #define INCLUDED_SW_INC_FMTRUBY_HXX
 
+#include "swdllapi.h"
 #include <svl/poolitem.hxx>
 #include <com/sun/star/text/RubyAdjust.hpp>
 
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index 19f8fa2aac6d..203a7f286bcf 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -19,11 +19,9 @@
 #ifndef INCLUDED_SW_INC_FORMAT_HXX
 #define INCLUDED_SW_INC_FORMAT_HXX
 
-#include <tools/solar.h>
 #include "swdllapi.h"
 #include "swatrset.hxx"
 #include "calbck.hxx"
-#include "hintids.hxx"
 #include <memory>
 
 class IDocumentSettingAccess;
diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
index e6ddaacfd7fa..7936bd51bb0d 100644
--- a/sw/inc/grfatr.hxx
+++ b/sw/inc/grfatr.hxx
@@ -27,7 +27,6 @@
 #include <svx/grfcrop.hxx>
 #include "swdllapi.h"
 #include "swatrset.hxx"
-#include "format.hxx"
 
 enum class MirrorGraph
 {
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index ec9bfa950bec..7d3c65fef3c5 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -26,6 +26,8 @@
 #include <svl/typedwhich.hxx>
 #include <vector>
 
+class SfxStringItem;
+
 // For SwTextHints without end index the following char is added:
 
 #define CH_TXTATR_BREAKWORD     u'\x0001'
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 75760c18859b..739f6200ef50 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -68,6 +68,7 @@ class IDocumentFieldsAccess;
 class IDocumentContentOperations;
 class IDocumentListItems;
 class Point;
+enum class SvxFrameDirection;
 typedef std::vector<SwOLENode*> SwOLENodes; // docary.hxx
 
 namespace drawinglayer { namespace attribute {
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index fc5a4034fc6c..1bf57d5d23ff 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -61,6 +61,7 @@
 #include <comphelper/propertysequence.hxx>
 #include <com/sun/star/drawing/HomogenMatrix3.hpp>
 #include <com/sun/star/awt/CharSet.hpp>
+#include <com/sun/star/text/WritingMode2.hpp>
 #include <test/mtfxmldump.hxx>
 
 class Test : public SwModelTestBase
diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx
index 7472c05b7bd2..72d5691e987a 100644
--- a/sw/source/core/SwNumberTree/SwNodeNum.cxx
+++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx
@@ -18,6 +18,8 @@
  */
 
 #include <editeng/svxenum.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
 #include <numrule.hxx>
 #include <SwNodeNum.hxx>
 #include <ndtxt.hxx>
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index 3ef7ada2ffcb..33024bb11e89 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -28,6 +28,7 @@
 #include <paratr.hxx>
 #include <swcache.hxx>
 #include <swtblfmt.hxx>
+#include <frmatr.hxx>
 #include <svl/grabbagitem.hxx>
 #include <svx/sdr/attribute/sdrallfillattributeshelper.hxx>
 #include <svx/unobrushitemhelper.hxx>
diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx
index 7a9af119c0e6..8a3d8de733d7 100644
--- a/sw/source/core/attr/hints.cxx
+++ b/sw/source/core/attr/hints.cxx
@@ -23,6 +23,7 @@
 #include <hints.hxx>
 #include <ndtxt.hxx>
 #include <swtypes.hxx>
+#include <vcl/outdev.hxx>
 
 SwFormatChg::SwFormatChg( SwFormat* pFormat )
     : SwMsgPoolItem( RES_FMT_CHG ), pChangedFormat( pFormat )
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx
index 367ca13bc80c..660e1067e918 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -61,6 +61,7 @@
 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <strings.hrc>
+#include <frmatr.hxx>
 #include <com/sun/star/table/BorderLineStyle.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
 #include <com/sun/star/text/RelOrientation.hpp>
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 7baf06eb7da1..1f7e0f3d5a16 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -38,6 +38,8 @@
 #include <svx/svdogrp.hxx>
 #include <sfx2/linkmgr.hxx>
 #include <editeng/forbiddencharacterstable.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/lrspitem.hxx>
 #include <svl/zforlist.hxx>
 #include <unotools/lingucfg.hxx>
 #include <svx/svdpage.hxx>
diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx
index 3d085becd87d..facf350dea2a 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -41,6 +41,7 @@
 #include <com/sun/star/text/TextContentAnchorType.hpp>
 #include <com/sun/star/text/WrapTextMode.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
+#include <com/sun/star/table/BorderLine2.hpp>
 
 using namespace com::sun::star;
 
diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx
index 626368ad7173..bceda4e9c758 100644
--- a/sw/source/filter/html/svxcss1.hxx
+++ b/sw/source/filter/html/svxcss1.hxx
@@ -32,6 +32,7 @@
 class SfxItemPool;
 class SvxBoxItem;
 class FontList;
+enum class SvxBoxItemLine;
 
 enum SvxCSS1Position
 {
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index df6d32fa6253..2f1301b354a4 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -88,6 +88,7 @@
 #include <editeng/blinkitem.hxx>
 #include <editeng/charhiddenitem.hxx>
 #include <editeng/editobj.hxx>
+#include <editeng/keepitem.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/xflgrit.hxx>
 #include <svx/fmglob.hxx>
@@ -126,6 +127,7 @@
 #include <IDocumentStylePoolAccess.hxx>
 #include <IDocumentRedlineAccess.hxx>
 #include <grfatr.hxx>
+#include <frmatr.hxx>
 
 #include <osl/file.hxx>
 #include <vcl/embeddedfontshelper.hxx>
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 958627d4062a..edc9688d858f 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -45,6 +45,7 @@
 
 class SwGrfNode;
 class SdrObject;
+enum class SvxBoxItemLine;
 
 namespace docx { class FootnotesList; }
 namespace oox { namespace drawingml { class DrawingML; } }
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx
index ee18a6fbcd6e..156b013feb2a 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -14,6 +14,11 @@
 #include <com/sun/star/xml/dom/XNodeList.hpp>
 #include <editeng/unoprnms.hxx>
 #include <editeng/charrotateitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/shaditem.hxx>
+#include <editeng/opaqitem.hxx>
+#include <editeng/boxitem.hxx>
 #include <svx/svdogrp.hxx>
 #include <oox/helper/propertyset.hxx>
 #include <oox/token/namespaces.hxx>
@@ -27,6 +32,7 @@
 #include <txatbase.hxx>
 #include <fmtfsize.hxx>
 #include <drawdoc.hxx>
+#include <frmatr.hxx>
 #include "docxattributeoutput.hxx"
 #include "docxexportfilter.hxx"
 #include <comphelper/seqstream.hxx>
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 50a653d79560..f2b4a6cf69a6 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -54,6 +54,13 @@
 #include <editeng/paravertalignitem.hxx>
 #include <editeng/blinkitem.hxx>
 #include <editeng/charhiddenitem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/brushitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/shaditem.hxx>
+#include <editeng/keepitem.hxx>
+#include <editeng/frmdiritem.hxx>
+#include <editeng/opaqitem.hxx>
 #include <svx/svdouno.hxx>
 #include <filter/msfilter/rtfutil.hxx>
 #include <sfx2/sfxbasemodel.hxx>
@@ -82,6 +89,7 @@
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <o3tl/make_unique.hxx>
 #include <svl/grabbagitem.hxx>
+#include <frmatr.hxx>
 #include "rtfexport.hxx"
 
 using namespace ::com::sun::star;
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index 717fc321edd5..50044b5241f4 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -34,6 +34,12 @@
 #include <editeng/udlnitem.hxx>
 #include <editeng/fontitem.hxx>
 #include <editeng/paperinf.hxx>
+#include <editeng/brushitem.hxx>
+#include <editeng/protitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/shaditem.hxx>
 #include <lineinfo.hxx>
 #include <swmodule.hxx>
 #include <IDocumentLayoutAccess.hxx>
@@ -53,6 +59,7 @@
 #include <fmtfsize.hxx>
 #include <ndtxt.hxx>
 #include <numrule.hxx>
+#include <frmatr.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index c7997b0fb16e..27ef0cb043e7 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -36,6 +36,7 @@
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/i18nmap.hxx>
 #include <editeng/protitem.hxx>
+#include <editeng/lrspitem.hxx>
 #include <poolfmt.hxx>
 #include <fmtfsize.hxx>
 #include <fmtornt.hxx>
diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx
index d8ee3372a9ea..2e58a68dfccc 100644
--- a/sw/source/ui/chrdlg/swuiccoll.cxx
+++ b/sw/source/ui/chrdlg/swuiccoll.cxx
@@ -35,6 +35,7 @@
 #include <hints.hxx>
 
 #include <vcl/svapp.hxx>
+#include <vcl/lstbox.hxx>
 
 #include <swuiccoll.hxx>
 
diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx
index 60b63dfcca56..556e0570a395 100644
--- a/sw/source/uibase/inc/wrtsh.hxx
+++ b/sw/source/uibase/inc/wrtsh.hxx
@@ -46,6 +46,7 @@ class SvxAutoCorrect;
 class NaviContentBookmark;
 struct SwCallMouseEvent;
 class SfxStringListItem;
+enum class SvMacroItemId : sal_uInt16;
 
 namespace i18nutil {
     struct SearchOptions2;
diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx
index 3ac0dbd537aa..ecea03ff3c5c 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -45,6 +45,7 @@
 #include <vector>
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
+#include <vcl/lstbox.hxx>
 #include <bitmaps.hlst>
 
 #include <unomid.h>
diff --git a/sw/source/uibase/uiview/formatclipboard.cxx b/sw/source/uibase/uiview/formatclipboard.cxx
index 02d40f721886..7fb50ee8c7c7 100644
--- a/sw/source/uibase/uiview/formatclipboard.cxx
+++ b/sw/source/uibase/uiview/formatclipboard.cxx
@@ -39,6 +39,7 @@
 #include <editeng/frmdiritem.hxx>
 #include <fmtpdsc.hxx>
 #include <fmtrowsplt.hxx>
+#include <frmatr.hxx>
 
 namespace
 {
diff --git a/sw/source/uibase/utlui/bookctrl.cxx b/sw/source/uibase/utlui/bookctrl.cxx
index 3ff84ef77251..b05b64a64e49 100644
--- a/sw/source/uibase/utlui/bookctrl.cxx
+++ b/sw/source/uibase/utlui/bookctrl.cxx
@@ -23,6 +23,7 @@
 
 #include <svl/intitem.hxx>
 #include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <vcl/event.hxx>
 #include <vcl/status.hxx>