sw/IwyuFilter_sw.yaml | 14 ++++++++++++++
sw/source/core/access/acccontext.hxx | 3 ---
sw/source/core/access/accdoc.hxx | 2 --
sw/source/core/access/accframe.hxx | 3 ---
sw/source/core/access/accframebase.hxx | 2 +-
sw/source/core/access/acchyperlink.hxx | 3 +--
sw/source/core/access/accnotextframe.hxx | 6 ------
sw/source/core/access/accnotexthyperlink.hxx | 3 ---
sw/source/core/access/accpara.cxx | 1 +
sw/source/core/access/accpara.hxx | 5 +----
sw/source/core/access/accselectionhelper.hxx | 3 ++-
sw/source/core/access/acctextframe.hxx | 4 ----
sw/source/core/access/textmarkuphelper.cxx | 2 ++
sw/source/core/access/textmarkuphelper.hxx | 3 ---
sw/source/core/crsr/BlockCursor.hxx | 5 +++--
sw/source/core/docnode/cancellablejob.hxx | 2 +-
sw/source/core/docnode/threadmanager.cxx | 5 +++++
sw/source/core/docnode/threadmanager.hxx | 12 ++++++------
sw/source/core/layout/layhelp.hxx | 4 +++-
sw/source/core/layout/virtoutp.hxx | 1 -
sw/source/core/text/atrhndl.hxx | 2 +-
sw/source/core/text/guess.cxx | 1 +
sw/source/core/text/guess.hxx | 7 ++++---
sw/source/core/text/inftxt.hxx | 11 ++---------
sw/source/core/text/itratr.hxx | 6 ------
sw/source/core/text/itrform2.hxx | 3 ---
sw/source/core/text/itrtxt.cxx | 1 +
sw/source/core/text/itrtxt.hxx | 1 -
sw/source/core/text/porfld.cxx | 1 +
sw/source/core/text/porfld.hxx | 2 --
sw/source/core/text/porfly.hxx | 1 -
sw/source/core/text/porftn.hxx | 1 -
sw/source/core/text/porlay.cxx | 1 +
sw/source/core/text/porlay.hxx | 4 +---
sw/source/core/text/porlin.hxx | 5 +----
sw/source/core/text/pormulti.hxx | 4 +---
sw/source/core/text/porrst.hxx | 15 +++++++++++++--
sw/source/core/text/portxt.cxx | 1 +
sw/source/core/text/redlnitr.cxx | 1 +
sw/source/core/text/redlnitr.hxx | 3 +--
sw/source/core/text/txtcache.hxx | 3 +--
sw/source/core/text/txtfly.cxx | 1 +
sw/source/core/text/txthyph.cxx | 1 +
sw/source/core/text/txtpaint.cxx | 1 +
sw/source/core/text/txtpaint.hxx | 2 +-
sw/source/core/text/xmldump.cxx | 1 +
46 files changed, 76 insertions(+), 87 deletions(-)
New commits:
commit e1d772deb65af22145bae336b90d0c3bc8a14327
Author: Gabor Kelemen <kelemen.gab...@nisz.hu>
AuthorDate: Mon May 20 01:49:44 2019 +0200
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Mon May 20 11:54:32 2019 +0200
tdf#42949 Fix IWYU warnings in sw/source/core/*/*hxx
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: Idbd13674578be9d4edce5d2a5f45df145474d86d
Reviewed-on: https://gerrit.libreoffice.org/72579
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@cib.de>
diff --git a/sw/IwyuFilter_sw.yaml b/sw/IwyuFilter_sw.yaml
index 2672bd568deb..69aa7bf7de09 100644
--- a/sw/IwyuFilter_sw.yaml
+++ b/sw/IwyuFilter_sw.yaml
@@ -250,6 +250,20 @@ blacklist:
- com/sun/star/text/XRedline.hpp
# sw::UnoImplPtr typedef
- unobaseclass.hxx
+ sw/source/core/access/acccontext.hxx:
+ # Base class needs complete type
+ - com/sun/star/accessibility/XAccessibleComponent.hpp
+ - com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp
+ - com/sun/star/lang/XServiceInfo.hpp
+ sw/source/core/access/acchyperlink.hxx:
+ # Base class needs complete type
+ - com/sun/star/accessibility/XAccessibleHyperlink.hpp
+ sw/source/core/access/accnotexthyperlink.hxx:
+ # Base class needs complete type
+ - com/sun/star/accessibility/XAccessibleHyperlink.hpp
+ sw/source/core/docnode/cancellablejob.hxx:
+ # Base class needs complete type
+ - com/sun/star/util/XCancellable.hpp
sw/source/core/inc/acorrect.hxx:
# Needed for implicit dtor
- svl/itemset.hxx
diff --git a/sw/source/core/access/acccontext.hxx
b/sw/source/core/access/acccontext.hxx
index 8df61e6c044b..048619b957dd 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -24,15 +24,12 @@
#include <accmap.hxx>
#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/implbase.hxx>
-#include <cppuhelper/interfacecontainer.hxx>
#include <memory>
namespace vcl { class Window; }
-class SwAccessibleMap;
class SwCursorShell;
class SdrObject;
class SwPaM;
diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx
index d8a281e0bcda..e815ebf3682d 100644
--- a/sw/source/core/access/accdoc.hxx
+++ b/sw/source/core/access/accdoc.hxx
@@ -26,8 +26,6 @@
#include <com/sun/star/accessibility/XAccessibleGetAccFlowTo.hpp>
#include "accselectionhelper.hxx"
-class VclSimpleEvent;
-
// base class for SwAccessibleDocument (in this same header file) and
// SwAccessiblePreview
class SwAccessibleDocumentBase : public SwAccessibleContext
diff --git a/sw/source/core/access/accframe.hxx
b/sw/source/core/access/accframe.hxx
index 547eb08e9992..c3ebd59d40ec 100644
--- a/sw/source/core/access/accframe.hxx
+++ b/sw/source/core/access/accframe.hxx
@@ -31,9 +31,6 @@
class SwAccessibleMap;
class SwFrame;
class SwViewShell;
-namespace sw { namespace access {
- class SwAccessibleChild;
-}}
// Any method of this class must be called with an acquired solar mutex!
diff --git a/sw/source/core/access/accframebase.hxx
b/sw/source/core/access/accframebase.hxx
index 286dafe315aa..ad45a6396c47 100644
--- a/sw/source/core/access/accframebase.hxx
+++ b/sw/source/core/access/accframebase.hxx
@@ -22,7 +22,7 @@
#include "acccontext.hxx"
#include <calbck.hxx>
-#include <pam.hxx>
+#include <ndtyp.hxx>
class SwFlyFrame;
diff --git a/sw/source/core/access/acchyperlink.hxx
b/sw/source/core/access/acchyperlink.hxx
index cc2497c621a0..fdbc71419615 100644
--- a/sw/source/core/access/acchyperlink.hxx
+++ b/sw/source/core/access/acchyperlink.hxx
@@ -25,8 +25,7 @@
#include <cppuhelper/implbase.hxx>
#include <svl/listener.hxx>
-#include <fmtinfmt.hxx>
-
+class SwFormatINetFormat;
class SwAccessibleParagraph;
class SwTextAttr;
diff --git a/sw/source/core/access/accnotextframe.hxx
b/sw/source/core/access/accnotextframe.hxx
index e5bf0818a5d1..374f1ee29a18 100644
--- a/sw/source/core/access/accnotextframe.hxx
+++ b/sw/source/core/access/accnotextframe.hxx
@@ -24,14 +24,8 @@
#include <com/sun/star/accessibility/XAccessibleImage.hpp>
#include <com/sun/star/accessibility/XAccessibleHypertext.hpp>
-namespace utl { class AccessibleRelationSetHelper; }
-namespace com { namespace star {
- namespace accessibility { struct AccessibleRelation; }
-} }
-
class SwFlyFrame;
class SwNoTextNode;
-class SwAccessibleNoTextHyperlink;
class SwAccessibleNoTextFrame : public SwAccessibleFrameBase,
public css::accessibility::XAccessibleImage,
diff --git a/sw/source/core/access/accnotexthyperlink.hxx
b/sw/source/core/access/accnotexthyperlink.hxx
index d9b9a7a0dfb2..b986abc87e7f 100644
--- a/sw/source/core/access/accnotexthyperlink.hxx
+++ b/sw/source/core/access/accnotexthyperlink.hxx
@@ -20,10 +20,7 @@
#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCNOTEXTHYPERLINK_HXX
#include <com/sun/star/accessibility/XAccessibleHyperlink.hpp>
-#include <com/sun/star/uno/RuntimeException.hpp>
#include <cppuhelper/implbase.hxx>
-#include <fmtinfmt.hxx>
-#include <frame.hxx>
#include <layfrm.hxx>
#include "accnotextframe.hxx"
diff --git a/sw/source/core/access/accpara.cxx
b/sw/source/core/access/accpara.cxx
index 30d28c9c2183..32bf6cb8b6dc 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -42,6 +42,7 @@
#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
#include <com/sun/star/i18n/WordType.hpp>
#include <com/sun/star/i18n/XBreakIterator.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <com/sun/star/beans/UnknownPropertyException.hpp>
#include <breakit.hxx>
#include "accpara.hxx"
diff --git a/sw/source/core/access/accpara.hxx
b/sw/source/core/access/accpara.hxx
index 35848003758e..5e6fed4a5705 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -26,16 +26,13 @@
#include <com/sun/star/accessibility/XAccessibleTextMarkup.hpp>
#include <com/sun/star/accessibility/XAccessibleMultiLineText.hpp>
#include <com/sun/star/accessibility/XAccessibleTextSelection.hpp>
-#include <txmsrt.hxx>
#include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
#include <com/sun/star/accessibility/XAccessibleTextAttributes.hpp>
#include "accselectionhelper.hxx"
-#include <calbck.hxx>
#include <unordered_map>
+#include <svl/lstner.hxx>
-class SwField;
class SwTextFrame;
-class SwTextNode;
class SwPaM;
class SwAccessiblePortionData;
class SwAccessibleHyperTextData;
diff --git a/sw/source/core/access/accselectionhelper.hxx
b/sw/source/core/access/accselectionhelper.hxx
index 52c2e77dcbe8..10d78d996b1e 100644
--- a/sw/source/core/access/accselectionhelper.hxx
+++ b/sw/source/core/access/accselectionhelper.hxx
@@ -22,7 +22,8 @@
#include <sal/types.h>
#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/accessibility/XAccessible.hpp>
+
+namespace com::sun::star::accessibility { class XAccessible; }
class SwAccessibleContext;
class SwFEShell;
diff --git a/sw/source/core/access/acctextframe.hxx
b/sw/source/core/access/acctextframe.hxx
index 4337ebe9b9d4..a9d743d5e92f 100644
--- a/sw/source/core/access/acctextframe.hxx
+++ b/sw/source/core/access/acctextframe.hxx
@@ -25,10 +25,6 @@
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
class SwFlyFrame;
-namespace utl { class AccessibleRelationSetHelper; }
-namespace com { namespace star {
- namespace accessibility { struct AccessibleRelation; }
-} }
class SwAccessibleTextFrame : public SwAccessibleFrameBase,
public css::accessibility::XAccessibleSelection
diff --git a/sw/source/core/access/textmarkuphelper.cxx
b/sw/source/core/access/textmarkuphelper.cxx
index 8633789af140..19bd4d576959 100644
--- a/sw/source/core/access/textmarkuphelper.cxx
+++ b/sw/source/core/access/textmarkuphelper.cxx
@@ -25,6 +25,8 @@
#include <com/sun/star/text/TextMarkupType.hpp>
#include <com/sun/star/accessibility/TextSegment.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <osl/diagnose.h>
#include <ndtxt.hxx>
diff --git a/sw/source/core/access/textmarkuphelper.hxx
b/sw/source/core/access/textmarkuphelper.hxx
index 56a1cac5f9c4..a359e15a04b1 100644
--- a/sw/source/core/access/textmarkuphelper.hxx
+++ b/sw/source/core/access/textmarkuphelper.hxx
@@ -20,9 +20,6 @@
#define INCLUDED_SW_SOURCE_CORE_ACCESS_TEXTMARKUPHELPER_HXX
#include <sal/types.h>
-#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/uno/Sequence.h>
namespace com { namespace sun { namespace star { namespace accessibility {
diff --git a/sw/source/core/crsr/BlockCursor.hxx
b/sw/source/core/crsr/BlockCursor.hxx
index 2dd535c91083..805b4a9a9bc2 100644
--- a/sw/source/core/crsr/BlockCursor.hxx
+++ b/sw/source/core/crsr/BlockCursor.hxx
@@ -19,12 +19,13 @@
#ifndef INCLUDED_SW_SOURCE_CORE_CRSR_BLOCKCURSOR_HXX
#define INCLUDED_SW_SOURCE_CORE_CRSR_BLOCKCURSOR_HXX
-#include <crsrsh.hxx>
#include <boost/optional.hpp>
+#include <tools/gen.hxx>
+
+#include <viscrs.hxx>
class SwCursorShell;
struct SwPosition;
-class Point;
/** Access to the block cursor
diff --git a/sw/source/core/docnode/cancellablejob.hxx
b/sw/source/core/docnode/cancellablejob.hxx
index 23606ed96f4c..ecd226b51645 100644
--- a/sw/source/core/docnode/cancellablejob.hxx
+++ b/sw/source/core/docnode/cancellablejob.hxx
@@ -26,7 +26,7 @@
#include <rtl/ref.hxx>
-class ObservableThread;
+#include <observablethread.hxx>
class CancellableJob : public ::cppu::WeakImplHelper<css::util::XCancellable>
{
diff --git a/sw/source/core/docnode/threadmanager.cxx
b/sw/source/core/docnode/threadmanager.cxx
index f500f29c5260..3be5cdcfdd79 100644
--- a/sw/source/core/docnode/threadmanager.cxx
+++ b/sw/source/core/docnode/threadmanager.cxx
@@ -16,12 +16,17 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
+#include "cancellablejob.hxx"
#include "threadmanager.hxx"
+#include <threadlistener.hxx>
#include <osl/diagnose.h>
#include <algorithm>
+#include <com/sun/star/util/XJobManager.hpp>
+
using namespace ::com::sun::star;
/** class to manage threads
diff --git a/sw/source/core/docnode/threadmanager.hxx
b/sw/source/core/docnode/threadmanager.hxx
index ab5dec95d960..84ee87b454a2 100644
--- a/sw/source/core/docnode/threadmanager.hxx
+++ b/sw/source/core/docnode/threadmanager.hxx
@@ -19,23 +19,23 @@
#ifndef INCLUDED_SW_SOURCE_CORE_DOCNODE_THREADMANAGER_HXX
#define INCLUDED_SW_SOURCE_CORE_DOCNODE_THREADMANAGER_HXX
-#include <vcl/timer.hxx>
#include <vcl/idle.hxx>
#include <osl/mutex.hxx>
#include <osl/interlck.h>
#include <rtl/ref.hxx>
#include <deque>
-#include <cppuhelper/weak.hxx>
#include <cppuhelper/weakref.hxx>
-#include <com/sun/star/util/XJobManager.hpp>
#include <observablethread.hxx>
-#include "cancellablejob.hxx"
-#include <threadlistener.hxx>
#include <memory>
-#include <ifinishedthreadlistener.hxx>
+namespace com::sun::star::util { class XCancellable; }
+namespace com::sun::star::util { class XJobManager; }
+
+class IFinishedThreadListener;
+class ThreadListener;
+class Timer;
/** class to manage threads
diff --git a/sw/source/core/layout/layhelp.hxx
b/sw/source/core/layout/layhelp.hxx
index c05223112afa..0f39b1b0cd00 100644
--- a/sw/source/core/layout/layhelp.hxx
+++ b/sw/source/core/layout/layhelp.hxx
@@ -22,6 +22,9 @@
#include <swrect.hxx>
+#include <tools/solar.h>
+
+#include <memory>
#include <vector>
#include <deque>
@@ -29,7 +32,6 @@ class SwDoc;
class SwFrame;
class SwLayoutFrame;
class SwPageFrame;
-class SwFlyFrame;
class SwSectionFrame;
class SwSectionNode;
class SvStream;
diff --git a/sw/source/core/layout/virtoutp.hxx
b/sw/source/core/layout/virtoutp.hxx
index d690f31628ef..c120f8cc6423 100644
--- a/sw/source/core/layout/virtoutp.hxx
+++ b/sw/source/core/layout/virtoutp.hxx
@@ -21,7 +21,6 @@
#include <vcl/virdev.hxx>
-#include <swtypes.hxx>
#include <swrect.hxx>
class SwViewShell;
diff --git a/sw/source/core/text/atrhndl.hxx b/sw/source/core/text/atrhndl.hxx
index 688b0aed12c5..f12bd76a34b1 100644
--- a/sw/source/core/text/atrhndl.hxx
+++ b/sw/source/core/text/atrhndl.hxx
@@ -24,9 +24,9 @@
#define NUM_ATTRIBUTE_STACKS 44
#include <memory>
-#include <txatbase.hxx>
#include <swfntcch.hxx>
+class SwTextAttr;
class SwAttrSet;
class IDocumentSettingAccess;
class SwViewShell;
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index d6fbbababd9e..4c0af10e54cb 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -18,6 +18,7 @@
*/
#include <editeng/unolingu.hxx>
+#include <breakit.hxx>
#include <dlelstnr.hxx>
#include <swmodule.hxx>
#include <IDocumentSettingAccess.hxx>
diff --git a/sw/source/core/text/guess.hxx b/sw/source/core/text/guess.hxx
index d23e5ce2d4d6..5ff7e7474e78 100644
--- a/sw/source/core/text/guess.hxx
+++ b/sw/source/core/text/guess.hxx
@@ -19,12 +19,13 @@
#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_GUESS_HXX
#define INCLUDED_SW_SOURCE_CORE_TEXT_GUESS_HXX
#include <memory>
-#include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
-#include <swtypes.hxx>
-#include <breakit.hxx>
#include "porrst.hxx"
+#include <com/sun/star/uno/Reference.hxx>
+
+namespace com::sun::star::linguistic2 { class XHyphenatedWord; }
+
class SwTextFormatInfo;
class SwTextGuess
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 48f8400af8ca..0b87191beaff 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_INFTXT_HXX
#define INCLUDED_SW_SOURCE_CORE_TEXT_INFTXT_HXX
#include <memory>
-#include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
#include <com/sun/star/beans/PropertyValues.hpp>
#include <map>
@@ -34,22 +33,16 @@
#include <editeng/paravertalignitem.hxx>
#include <sal/log.hxx>
-namespace vcl { class Font; }
-class OutputDevice;
+namespace com::sun::star::linguistic2 { class XHyphenatedWord; }
+
class SvxBrushItem;
class SvxLineSpacingItem;
class SvxTabStop;
class SvxTabStopItem;
-class SwAttrSet;
-class SwFieldPortion;
class SwFlyPortion;
class SwFormatDrop;
-class SwLineLayout;
class SwLinePortion;
-class SwParaPortion;
class SwTabPortion;
-class SwTextFrame;
-class SwTextSizeInfo;
class SwViewOption;
class SwViewShell;
class SwAttrIter;
diff --git a/sw/source/core/text/itratr.hxx b/sw/source/core/text/itratr.hxx
index dd3a755c7bfd..78130e5de72c 100644
--- a/sw/source/core/text/itratr.hxx
+++ b/sw/source/core/text/itratr.hxx
@@ -20,16 +20,10 @@
#define INCLUDED_SW_SOURCE_CORE_TEXT_ITRATR_HXX
#include <o3tl/deleter.hxx>
#include "atrhndl.hxx"
-#include <swtypes.hxx>
#include <swfont.hxx>
-#include "porlay.hxx"
namespace sw { struct MergedPara; }
-class OutputDevice;
-class SwFont;
-class SwpHints;
class SwTextAttr;
-class SwAttrSet;
class SwTextNode;
class SwRedlineItr;
class SwViewShell;
diff --git a/sw/source/core/text/itrform2.hxx b/sw/source/core/text/itrform2.hxx
index 555fed20cdcc..53db28c7e179 100644
--- a/sw/source/core/text/itrform2.hxx
+++ b/sw/source/core/text/itrform2.hxx
@@ -21,7 +21,6 @@
#include "itrpaint.hxx"
class SwFlyCntPortion;
-class SwInterHyphInfo;
class SwDropPortion;
class SwFormatDrop;
class SwTextAttr;
@@ -31,8 +30,6 @@ class SwExpandPortion;
class SwMultiPortion;
class SwFootnotePortion;
-namespace sw { class MergedAttrIterByEnd; }
-
class SwTextFormatter : public SwTextPainter
{
const SwFormatDrop *pDropFormat;
diff --git a/sw/source/core/text/itrtxt.cxx b/sw/source/core/text/itrtxt.cxx
index c975a6863263..5a9976bead8d 100644
--- a/sw/source/core/text/itrtxt.cxx
+++ b/sw/source/core/text/itrtxt.cxx
@@ -19,6 +19,7 @@
#include <ndtxt.hxx>
#include <flyfrm.hxx>
+#include <txatbase.hxx>
#include <paratr.hxx>
#include <vcl/outdev.hxx>
#include <editeng/paravertalignitem.hxx>
diff --git a/sw/source/core/text/itrtxt.hxx b/sw/source/core/text/itrtxt.hxx
index bdf6cd043042..9c4e5eacb015 100644
--- a/sw/source/core/text/itrtxt.hxx
+++ b/sw/source/core/text/itrtxt.hxx
@@ -22,7 +22,6 @@
#include "itratr.hxx"
#include "inftxt.hxx"
-class SwTextFrame;
struct SwPosition;
struct SwCursorMoveState;
class SwMarginPortion;
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 760a0a8774bf..5249d904da8e 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -31,6 +31,7 @@
#include "porfld.hxx"
#include "inftxt.hxx"
#include <blink.hxx>
+#include <fmtornt.hxx>
#include <frmatr.hxx>
#include <frmtool.hxx>
#include <viewsh.hxx>
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index 998f33e16a60..5436cc9f01a1 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -22,10 +22,8 @@
#include <swtypes.hxx>
#include <swfont.hxx>
#include "porexp.hxx"
-#include <fmtornt.hxx>
#include <o3tl/enumarray.hxx>
-class SwFont;
class SvxBrushItem;
class SwFormatVertOrient;
diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx
index e2c03600f770..7d859ad1d7bf 100644
--- a/sw/source/core/text/porfly.hxx
+++ b/sw/source/core/text/porfly.hxx
@@ -25,7 +25,6 @@
#include <flyfrms.hxx>
class SwDrawContact;
-class SwFlyInContentFrame;
class SwTextFrame;
struct SwCursorMoveState;
diff --git a/sw/source/core/text/porftn.hxx b/sw/source/core/text/porftn.hxx
index 06f05a15e7d1..49a3d5df2faa 100644
--- a/sw/source/core/text/porftn.hxx
+++ b/sw/source/core/text/porftn.hxx
@@ -21,7 +21,6 @@
#include "porfld.hxx"
-class SwTextFrame;
class SwTextFootnote;
class SwFootnotePortion : public SwFieldPortion
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 871ced37cfc9..46b3c60c8aa1 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -53,6 +53,7 @@
#include <calbck.hxx>
#include <doc.hxx>
#include <swscanner.hxx>
+#include <txatbase.hxx>
#include <IDocumentRedlineAccess.hxx>
#include <IDocumentSettingAccess.hxx>
#include <IDocumentContentOperations.hxx>
diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index 38aabd64e2ce..2997b88c763d 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.hxx
@@ -19,19 +19,17 @@
#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_PORLAY_HXX
#define INCLUDED_SW_SOURCE_CORE_TEXT_PORLAY_HXX
-#include <tools/fract.hxx>
#include <scriptinfo.hxx>
#include <swrect.hxx>
+#include <swtypes.hxx>
#include "portxt.hxx"
-#include <swfont.hxx>
#include <vector>
#include <deque>
class SwMarginPortion;
class SwDropPortion;
-class SvStream;
class SwTextFormatter;
class SwCharRange
diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx
index 2b45e7561e5a..6de5a619f32f 100644
--- a/sw/source/core/text/porlin.hxx
+++ b/sw/source/core/text/porlin.hxx
@@ -22,10 +22,7 @@
#include "possiz.hxx"
#include <txttypes.hxx>
#include <TextFrameIndex.hxx>
-
-#ifdef DBG_UTIL
-#include <libxml/xmlwriter.h>
-#endif
+#include <rtl/ustring.hxx>
class SwTextSizeInfo;
class SwTextPaintInfo;
diff --git a/sw/source/core/text/pormulti.hxx b/sw/source/core/text/pormulti.hxx
index 412efef98064..b78dc6258f6b 100644
--- a/sw/source/core/text/pormulti.hxx
+++ b/sw/source/core/text/pormulti.hxx
@@ -21,13 +21,11 @@
#include <memory>
#include "porlay.hxx"
-#include "porexp.hxx"
#include <com/sun/star/text/RubyAdjust.hpp>
+class IDocumentSettingAccess;
class SwTextFormatInfo;
-class SwFieldPortion;
class SwTextCursor;
-class SwLineLayout;
class SwTextPaintInfo;
class SwTextAttr;
class SfxPoolItem;
diff --git a/sw/source/core/text/porrst.hxx b/sw/source/core/text/porrst.hxx
index a7ae25dd4076..85e85d1570dd 100644
--- a/sw/source/core/text/porrst.hxx
+++ b/sw/source/core/text/porrst.hxx
@@ -18,8 +18,19 @@
*/
#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_PORRST_HXX
#define INCLUDED_SW_SOURCE_CORE_TEXT_PORRST_HXX
-#include "porlay.hxx"
-#include "porexp.hxx"
+
+#include <tools/gen.hxx>
+
+#include <TextFrameIndex.hxx>
+#include <txttypes.hxx>
+
+#include "porlin.hxx"
+#include "portxt.hxx"
+#include "possiz.hxx"
+
+class SwPortionHandler;
+class SwTextPaintInfo;
+class SwTextSizeInfo;
#define LINE_BREAK_WIDTH 150
#define SPECIAL_FONT_HEIGHT 200
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index f9e364c3ea74..5dd92da11576 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -20,6 +20,7 @@
#include <com/sun/star/i18n/ScriptType.hpp>
#include <com/sun/star/i18n/XBreakIterator.hpp>
#include <i18nlangtag/mslangid.hxx>
+#include <breakit.hxx>
#include <hintids.hxx>
#include <EnhancedPDFExportHelper.hxx>
#include <SwPortionHandler.hxx>
diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx
index 95ce480d11b5..e98240098786 100644
--- a/sw/source/core/text/redlnitr.cxx
+++ b/sw/source/core/text/redlnitr.cxx
@@ -24,6 +24,7 @@
#include <hintids.hxx>
#include <svl/whiter.hxx>
#include <com/sun/star/i18n/ScriptType.hpp>
+#include <scriptinfo.hxx>
#include <swmodule.hxx>
#include <redline.hxx>
#include <txtatr.hxx>
diff --git a/sw/source/core/text/redlnitr.hxx b/sw/source/core/text/redlnitr.hxx
index 96a8401a3fe9..0d6d365e9637 100644
--- a/sw/source/core/text/redlnitr.hxx
+++ b/sw/source/core/text/redlnitr.hxx
@@ -19,8 +19,6 @@
#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_REDLNITR_HXX
#define INCLUDED_SW_SOURCE_CORE_TEXT_REDLNITR_HXX
-#include <ndhints.hxx>
-
#include <IDocumentRedlineAccess.hxx>
#include <swfont.hxx>
@@ -28,6 +26,7 @@
#include <vcl/commandevent.hxx>
#include <cstddef>
+#include <deque>
#include <memory>
#include <vector>
diff --git a/sw/source/core/text/txtcache.hxx b/sw/source/core/text/txtcache.hxx
index 0fa90c35debb..c5f52944460f 100644
--- a/sw/source/core/text/txtcache.hxx
+++ b/sw/source/core/text/txtcache.hxx
@@ -19,11 +19,10 @@
#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_TXTCACHE_HXX
#define INCLUDED_SW_SOURCE_CORE_TEXT_TXTCACHE_HXX
-#include <sal/types.h>
#include <swcache.hxx>
+#include "porlay.hxx"
#include <memory>
-class SwParaPortion;
class SwTextFrame;
class SwTextLine : public SwCacheObj
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index 124648a386d1..2502c025e7e6 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -27,6 +27,7 @@
#include <swregion.hxx>
#include <dflyobj.hxx>
#include <flyfrm.hxx>
+#include <fmtornt.hxx>
#include <frmatr.hxx>
#include <frmtool.hxx>
#include "porfly.hxx"
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
index d2edb6a9ffa6..615c287d1be9 100644
--- a/sw/source/core/text/txthyph.cxx
+++ b/sw/source/core/text/txthyph.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <breakit.hxx>
#include <hintids.hxx>
#include <editeng/unolingu.hxx>
#include <com/sun/star/i18n/WordType.hpp>
diff --git a/sw/source/core/text/txtpaint.cxx b/sw/source/core/text/txtpaint.cxx
index 5609a17b2895..0518d3330b70 100644
--- a/sw/source/core/text/txtpaint.cxx
+++ b/sw/source/core/text/txtpaint.cxx
@@ -18,6 +18,7 @@
*/
#include "txtpaint.hxx"
+#include <txtfrm.hxx>
#include <swrect.hxx>
#include <rootfrm.hxx>
diff --git a/sw/source/core/text/txtpaint.hxx b/sw/source/core/text/txtpaint.hxx
index eba46093f9c2..68149c9bc5a8 100644
--- a/sw/source/core/text/txtpaint.hxx
+++ b/sw/source/core/text/txtpaint.hxx
@@ -21,7 +21,7 @@
#include <vcl/outdev.hxx>
class SwRect; // SwSaveClip
-#include <txtfrm.hxx>
+class SwTextFrame;
class SwSaveClip final
{
diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx
index a905e10d2208..6dfeacad09f4 100644
--- a/sw/source/core/text/xmldump.cxx
+++ b/sw/source/core/text/xmldump.cxx
@@ -23,6 +23,7 @@
#include "porlay.hxx"
#include "portxt.hxx"
#include <sortedobjs.hxx>
+#include <swfont.hxx>
#include <anchoredobject.hxx>
#include <libxml/xmlwriter.h>
#include <SwPortionHandler.hxx>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
