Recheck sw headers with IWYU

See tdf#42949 for motivation

Change-Id: I99558e6b6952b3f2c1ee32dd07354ff659ad9cd0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131183
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

39 files changed, 28 insertions, 22 deletions

diff --git a/sw/source/core/crsr/callnk.hxx b/sw/source/core/crsr/callnk.hxx
index ccac918e51ca..ca7db0c8f746 100644
--- a/sw/source/core/crsr/callnk.hxx
+++ b/sw/source/core/crsr/callnk.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SW_SOURCE_CORE_CRSR_CALLNK_HXX
 
 #include <tools/long.hxx>
-#include <tools/solar.h>
 #include <ndtyp.hxx>
 #include <nodeoffset.hxx>
 
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 4504af19bdb7..8c47e9859bf2 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -50,6 +50,7 @@
 #include <editeng/contouritem.hxx>
 #include <editeng/crossedoutitem.hxx>
 #include <editeng/fontitem.hxx>
+#include <editeng/formatbreakitem.hxx>
 #include <editeng/fhgtitem.hxx>
 #include <editeng/justifyitem.hxx>
 #include <editeng/legacyitem.hxx>
diff --git a/sw/source/core/docnode/ndsect.hxx b/sw/source/core/docnode/ndsect.hxx
index fe663a89e4e6..57a9f7080c6f 100644
--- a/sw/source/core/docnode/ndsect.hxx
+++ b/sw/source/core/docnode/ndsect.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_DOCNODE_NDSECT_HXX
 #define INCLUDED_SW_SOURCE_CORE_DOCNODE_NDSECT_HXX
 
-#include <tools/solar.h>
 #include <nodeoffset.hxx>
 
 class SwSectionNode;
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index dd8ee2dab586..3203bbc8d56c 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -21,6 +21,7 @@
 #include <comphelper/lok.hxx>
 #include <osl/diagnose.h>
 #include <tools/mapunit.hxx>
+#include <tools/UnitConversion.hxx>
 #include <svx/svdhdl.hxx>
 #include <svx/svdtrans.hxx>
 #include <editeng/protitem.hxx>
diff --git a/sw/source/core/inc/DocumentChartDataProviderManager.hxx b/sw/source/core/inc/DocumentChartDataProviderManager.hxx
index f5ed19a143ec..f887702bb59f 100644
--- a/sw/source/core/inc/DocumentChartDataProviderManager.hxx
+++ b/sw/source/core/inc/DocumentChartDataProviderManager.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SW_SOURCE_CORE_INC_DOCUMENTCHARTDATAPROVIDEMANAGER_HXX
 
 #include <IDocumentChartDataProviderAccess.hxx>
-#include <o3tl/deleter.hxx>
 #include <rtl/ref.hxx>
 #include <memory>
 
diff --git a/sw/source/core/inc/DocumentRedlineManager.hxx b/sw/source/core/inc/DocumentRedlineManager.hxx
index 62a57ac65e2a..478332bbd8ef 100644
--- a/sw/source/core/inc/DocumentRedlineManager.hxx
+++ b/sw/source/core/inc/DocumentRedlineManager.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SW_SOURCE_CORE_INC_DOCUMENTREDLINEMANAGER_HXX
 
 #include <IDocumentRedlineAccess.hxx>
-#include <memory>
 
 class SwDoc;
 
diff --git a/sw/source/core/inc/GraphicSizeCheck.hxx b/sw/source/core/inc/GraphicSizeCheck.hxx
index a0aea8a9e524..983d549734fe 100644
--- a/sw/source/core/inc/GraphicSizeCheck.hxx
+++ b/sw/source/core/inc/GraphicSizeCheck.hxx
@@ -11,7 +11,6 @@
 #pragma once
 
 #include <doc.hxx>
-#include "ModelTraverser.hxx"
 #include <svx/GenericCheckDialog.hxx>
 
 namespace sw
diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx b/sw/source/core/inc/SwXMLBlockImport.hxx
index 40c9699712df..821033c1e1e5 100644
--- a/sw/source/core/inc/SwXMLBlockImport.hxx
+++ b/sw/source/core/inc/SwXMLBlockImport.hxx
@@ -21,7 +21,7 @@
 
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmlnamespace.hxx>
-#include <xmloff/xmltkmap.hxx>
+#include <xmloff/xmltoken.hxx>
 #include <com/sun/star/xml/sax/FastToken.hpp>
 #include <sax/fastattribs.hxx>
 
diff --git a/sw/source/core/inc/UndoCore.hxx b/sw/source/core/inc/UndoCore.hxx
index 6efaf23c0b61..c1c66b702a78 100644
--- a/sw/source/core/inc/UndoCore.hxx
+++ b/sw/source/core/inc/UndoCore.hxx
@@ -22,7 +22,6 @@
 
 #include <undobj.hxx>
 #include <calbck.hxx>
-#include <o3tl/deleter.hxx>
 #include <rtl/ustring.hxx>
 #include <redline.hxx>
 #include <numrule.hxx>
diff --git a/sw/source/core/inc/UndoRedline.hxx b/sw/source/core/inc/UndoRedline.hxx
index 68ce25a27d0c..b695b56c49ef 100644
--- a/sw/source/core/inc/UndoRedline.hxx
+++ b/sw/source/core/inc/UndoRedline.hxx
@@ -22,7 +22,6 @@
 
 #include <memory>
 #include <undobj.hxx>
-#include <tools/long.hxx>
 
 struct SwSortOptions;
 class SwRangeRedline;
diff --git a/sw/source/core/inc/UndoSort.hxx b/sw/source/core/inc/UndoSort.hxx
index be474e01432c..81cb33c60787 100644
--- a/sw/source/core/inc/UndoSort.hxx
+++ b/sw/source/core/inc/UndoSort.hxx
@@ -23,6 +23,7 @@
 #include <undobj.hxx>
 
 #include <rtl/ustring.hxx>
+#include <tools/solar.h>
 
 #include <memory>
 #include <vector>
diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx
index 6591b7e5e6cc..63ad4532f30c 100644
--- a/sw/source/core/inc/UndoTable.hxx
+++ b/sw/source/core/inc/UndoTable.hxx
@@ -22,6 +22,7 @@
 
 #include <o3tl/deleter.hxx>
 #include <tools/long.hxx>
+#include <tools/solar.h>
 #include <ndarr.hxx>
 #include <undobj.hxx>
 #include <set>
diff --git a/sw/source/core/inc/acorrect.hxx b/sw/source/core/inc/acorrect.hxx
index 2f0042650f87..884e749e0d32 100644
--- a/sw/source/core/inc/acorrect.hxx
+++ b/sw/source/core/inc/acorrect.hxx
@@ -23,7 +23,6 @@
 #include <memory>
 
 #include <svl/itemset.hxx>
-#include <tools/solar.h>
 #include <editeng/svxacorr.hxx>
 #include <nodeoffset.hxx>
 
diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx
index e777784c7d1e..c40ff1044d70 100644
--- a/sw/source/core/inc/drawfont.hxx
+++ b/sw/source/core/inc/drawfont.hxx
@@ -23,6 +23,7 @@
 #include <osl/diagnose.h>
 #include <vcl/vclptr.hxx>
 #include <vcl/outdev.hxx>
+#include <swtypes.hxx>
 #include "TextFrameIndex.hxx"
 #include <swdllapi.h>
 
diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx
index 4285165a3336..a377a483cdde 100644
--- a/sw/source/core/inc/fntcache.hxx
+++ b/sw/source/core/inc/fntcache.hxx
@@ -26,8 +26,8 @@
 #include <unordered_map>
 
 #include <vcl/font.hxx>
+#include <vcl/glyphitem.hxx>
 #include <vcl/vclptr.hxx>
-#include <vcl/vcllayout.hxx>
 #include <vcl/outdev.hxx>
 #include "swcache.hxx"
 #include "TextFrameIndex.hxx"
diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx
index a0f955aa4099..6e8a109fbded 100644
--- a/sw/source/core/inc/layact.hxx
+++ b/sw/source/core/inc/layact.hxx
@@ -26,10 +26,13 @@
 
 #include <ctime>
 #include <memory>
+#include <vector>
 
 #include <swrect.hxx>
 
 class OutputDevice;
+class SwFrame;
+class SwFrameDeleteGuard;
 class SwRootFrame;
 class SwLayoutFrame;
 class SwPageFrame;
diff --git a/sw/source/core/inc/node2lay.hxx b/sw/source/core/inc/node2lay.hxx
index 2af3359a911c..e0334c156435 100644
--- a/sw/source/core/inc/node2lay.hxx
+++ b/sw/source/core/inc/node2lay.hxx
@@ -19,7 +19,8 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_NODE2LAY_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_NODE2LAY_HXX
 
-#include <tools/solar.h>
+#include <nodeoffset.hxx>
+
 #include <memory>
 
 /**
diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx
index 75554884341e..d92328344d3b 100644
--- a/sw/source/core/inc/rolbck.hxx
+++ b/sw/source/core/inc/rolbck.hxx
@@ -22,7 +22,6 @@
 #include <o3tl/deleter.hxx>
 #include <o3tl/sorted_vector.hxx>
 #include <svl/itemset.hxx>
-#include <tools/solar.h>
 #include <vcl/keycod.hxx>
 #include <tox.hxx>
 
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index 244d935bceb1..3d00fe1cc226 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -24,7 +24,6 @@
 #include <doc.hxx>
 #include <IDocumentTimerAccess.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <tools/UnitConversion.hxx>
 #include <set>
 #include <vector>
 
diff --git a/sw/source/core/inc/tblrwcl.hxx b/sw/source/core/inc/tblrwcl.hxx
index 9280a67edf6f..9cd6fa3eb2e0 100644
--- a/sw/source/core/inc/tblrwcl.hxx
+++ b/sw/source/core/inc/tblrwcl.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SW_SOURCE_CORE_INC_TBLRWCL_HXX
 
 #include <cstddef>
-#include <memory>
 #include <vector>
 
 #include <swtypes.hxx>
diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx
index e8fcfd4c01c2..bd968f87f7d8 100644
--- a/sw/source/core/inc/txmsrt.hxx
+++ b/sw/source/core/inc/txmsrt.hxx
@@ -20,6 +20,7 @@
 #define INCLUDED_SW_SOURCE_CORE_INC_TXMSRT_HXX
 
 #include <i18nlangtag/lang.h>
+#include <nodeoffset.hxx>
 #include <tox.hxx>
 
 #include <com/sun/star/lang/Locale.hpp>
diff --git a/sw/source/core/inc/txtfly.hxx b/sw/source/core/inc/txtfly.hxx
index 82ee5f085d6a..39f11a835421 100644
--- a/sw/source/core/inc/txtfly.hxx
+++ b/sw/source/core/inc/txtfly.hxx
@@ -20,7 +20,6 @@
 #pragma once
 
 #include <editeng/txtrange.hxx>
-#include <tools/solar.h>
 #include <swtypes.hxx>
 #include <swrect.hxx>
 #include <com/sun/star/text/WrapTextMode.hpp>
diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx
index a0638d13f425..4c53f7fd63aa 100644
--- a/sw/source/core/inc/unoflatpara.hxx
+++ b/sw/source/core/inc/unoflatpara.hxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/text/XFlatParagraph.hpp>
 #include <com/sun/star/text/XFlatParagraphIterator.hpp>
 #include <svl/listener.hxx>
-#include <tools/solar.h>
 #include "unotextmarkup.hxx"
 #include <nodeoffset.hxx>
 
diff --git a/sw/source/core/inc/unolinebreak.hxx b/sw/source/core/inc/unolinebreak.hxx
index 0a87753c5e34..46968556633c 100644
--- a/sw/source/core/inc/unolinebreak.hxx
+++ b/sw/source/core/inc/unolinebreak.hxx
@@ -23,6 +23,7 @@
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/text/XTextContent.hpp>
 
 #include <unobaseclass.hxx>
diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx
index 163c19adb3ef..b05fe074ce71 100644
--- a/sw/source/core/inc/wrong.hxx
+++ b/sw/source/core/inc/wrong.hxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/container/NoSuchElementException.hpp>
 #include <com/sun/star/container/XStringKeyMap.hpp>
 
-#include <com/sun/star/util/Color.hpp>
 #include <com/sun/star/awt/FontUnderline.hpp>
 #include <com/sun/star/uno/Any.hxx>
 
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 871cb21b0a6b..a541f3681af7 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -19,6 +19,7 @@
 
 #include <sal/config.h>
 
+#include <com/sun/star/style/VerticalAlignment.hpp>
 #include <com/sun/star/text/ColumnSeparatorStyle.hpp>
 #include <com/sun/star/text/WrapTextMode.hpp>
 #include <com/sun/star/text/TextContentAnchorType.hpp>
@@ -29,6 +30,7 @@
 #include <o3tl/safeint.hxx>
 #include <osl/diagnose.h>
 #include <svtools/unoimap.hxx>
+#include <tools/UnitConversion.hxx>
 #include <vcl/imap.hxx>
 #include <vcl/imapobj.hxx>
 #include <unotools/intlwrapper.hxx>
diff --git a/sw/source/core/layout/dumpfilter.cxx b/sw/source/core/layout/dumpfilter.cxx
index f52d9188bb8a..21d1ec3542fb 100644
--- a/sw/source/core/layout/dumpfilter.cxx
+++ b/sw/source/core/layout/dumpfilter.cxx
@@ -15,6 +15,7 @@
 #include <rootfrm.hxx>
 #include <unotxdoc.hxx>
 
+#include <comphelper/servicehelper.hxx>
 #include <unotools/mediadescriptor.hxx>
 
 #include <libxml/xmlwriter.h>
diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx
index 06ef88e74169..2455f7a6d130 100644
--- a/sw/source/core/layout/flyincnt.cxx
+++ b/sw/source/core/layout/flyincnt.cxx
@@ -27,6 +27,7 @@
 #include <IDocumentSettingAccess.hxx>
 #include <IDocumentDrawModelAccess.hxx>
 #include <osl/diagnose.h>
+#include <o3tl/deleter.hxx>
 
 SwFlyInContentFrame::SwFlyInContentFrame( SwFlyFrameFormat *pFormat, SwFrame* pSib, SwFrame *pAnch ) :
     SwFlyFrame( pFormat, pSib, pAnch )
diff --git a/sw/source/core/layout/layhelp.hxx b/sw/source/core/layout/layhelp.hxx
index 5df151ae7e61..17c5cc32491e 100644
--- a/sw/source/core/layout/layhelp.hxx
+++ b/sw/source/core/layout/layhelp.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SW_SOURCE_CORE_LAYOUT_LAYHELP_HXX
 
 #include <swrect.hxx>
+#include <nodeoffset.hxx>
 
 #include <tools/solar.h>
 
diff --git a/sw/source/core/text/atrhndl.hxx b/sw/source/core/text/atrhndl.hxx
index 6c719bf2cbaf..8bb7845f2760 100644
--- a/sw/source/core/text/atrhndl.hxx
+++ b/sw/source/core/text/atrhndl.hxx
@@ -20,7 +20,6 @@
 #pragma once
 #define NUM_ATTRIBUTE_STACKS 44
 
-#include <memory>
 #include <vector>
 #include <swfntcch.hxx>
 
@@ -115,4 +114,4 @@ inline const SwFont* SwAttrHandler::GetFont() const
 };
 
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index 68fc8c72c206..c5b838e0bc5b 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.hxx
@@ -18,8 +18,6 @@
  */
 #pragma once
 
-#include <libxml/xmlwriter.h>
-
 #include <scriptinfo.hxx>
 
 #include <swrect.hxx>
diff --git a/sw/source/core/text/possiz.hxx b/sw/source/core/text/possiz.hxx
index 772237360e1f..f66bd1988ca4 100644
--- a/sw/source/core/text/possiz.hxx
+++ b/sw/source/core/text/possiz.hxx
@@ -19,7 +19,6 @@
 #pragma once
 
 #include <tools/gen.hxx>
-#include <sal/types.h>
 #include <swtypes.hxx>
 
 // Compared to the SV sizes SwPosSize is always positive
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 7c0ebbbe77c1..5be409d15078 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -25,6 +25,7 @@
 #include <UndoSplitMove.hxx>
 #include <UndoCore.hxx>
 #include <fesh.hxx>
+#include <fmtpdsc.hxx>
 #include <hintids.hxx>
 #include <hints.hxx>
 #include <doc.hxx>
@@ -61,6 +62,7 @@
 #include <unochart.hxx>
 #include <calbck.hxx>
 #include <frameformats.hxx>
+#include <editeng/formatbreakitem.hxx>
 #include <osl/diagnose.h>
 #include <docsh.hxx>
 
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index fed1706cad5e..6fe9ab1e27b8 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <cppuhelper/supportsservice.hxx>
+#include <o3tl/deleter.hxx>
 #include <mutex>
 #include <vcl/svapp.hxx>
 
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index dedc10bce213..d7032d2da66e 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -67,6 +67,7 @@
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <svx/scene3d.hxx>
+#include <tools/UnitConversion.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
 #include <com/sun/star/frame/XModel.hpp>
diff --git a/sw/source/core/unocore/unolinebreak.cxx b/sw/source/core/unocore/unolinebreak.cxx
index 2e8ee454eccb..a2b9124b201e 100644
--- a/sw/source/core/unocore/unolinebreak.cxx
+++ b/sw/source/core/unocore/unolinebreak.cxx
@@ -21,6 +21,7 @@
 
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weakref.hxx>
+#include <comphelper/servicehelper.hxx>
 #include <sal/log.hxx>
 #include <svl/listener.hxx>
 #include <svl/itemprop.hxx>
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 0357d048dfdf..7033107bf720 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -27,6 +27,7 @@
 #include <comphelper/interfacecontainer4.hxx>
 #include <o3tl/any.hxx>
 #include <o3tl/safeint.hxx>
+#include <tools/UnitConversion.hxx>
 #include <editeng/memberids.h>
 #include <float.h>
 #include <swtypes.hxx>
diff --git a/sw/source/core/unocore/unotextmarkup.cxx b/sw/source/core/unocore/unotextmarkup.cxx
index ae5e05181224..1bc8e7387f65 100644
--- a/sw/source/core/unocore/unotextmarkup.cxx
+++ b/sw/source/core/unocore/unotextmarkup.cxx
@@ -19,6 +19,7 @@
 
 #include <unotextmarkup.hxx>
 
+#include <comphelper/servicehelper.hxx>
 #include <o3tl/safeint.hxx>
 #include <osl/diagnose.h>
 #include <svl/listener.hxx>
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index 066c05123f81..a1d6415cda68 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -22,6 +22,7 @@
 #include <sfx2/printer.hxx>
 #include <svx/svdview.hxx>
 #include <osl/diagnose.h>
+#include <tools/UnitConversion.hxx>
 
 #include <txtfld.hxx>
 #include <fmtfld.hxx>