[Libreoffice-commits] core.git: sw/inc sw/IwyuFilter_sw.yaml sw/source
Gabor Kelemen (via logerrit)
logerrit at kemper.freedesktop.org
Tue May 14 07:14:36 UTC 2019
sw/IwyuFilter_sw.yaml | 95 ++++++++++++++++++
sw/inc/unoredline.hxx | 1
sw/source/core/crsr/findfmt.cxx | 1
sw/source/core/doc/docedt.cxx | 1
sw/source/core/fields/textapi.cxx | 5
sw/source/core/frmedt/fedesc.cxx | 1
sw/source/core/inc/UndoCore.hxx | 1
sw/source/core/inc/UndoDraw.hxx | 1
sw/source/core/inc/UndoOverwrite.hxx | 1
sw/source/core/inc/UndoSection.hxx | 1
sw/source/core/inc/UndoTable.hxx | 1
sw/source/core/inc/tblrwcl.hxx | 3
sw/source/core/inc/textapi.hxx | 6 -
sw/source/core/inc/threadlistener.hxx | 2
sw/source/core/inc/tolayoutanchoredobjectposition.hxx | 2
sw/source/core/inc/txtfly.hxx | 3
sw/source/core/inc/txtfrm.hxx | 7 -
sw/source/core/inc/txttypes.hxx | 2
sw/source/core/inc/unoevent.hxx | 3
sw/source/core/inc/unofield.hxx | 1
sw/source/core/inc/unoflatpara.hxx | 2
sw/source/core/inc/unofldmid.h | 6 -
sw/source/core/inc/unofreg.hxx | 1
sw/source/core/inc/unoparaframeenum.hxx | 3
sw/source/core/inc/unoport.hxx | 10 -
sw/source/core/inc/viewimp.hxx | 5
sw/source/core/layout/calcmove.cxx | 1
sw/source/core/layout/dbg_lay.cxx | 1
sw/source/core/layout/findfrm.cxx | 1
sw/source/core/layout/flowfrm.cxx | 1
sw/source/core/layout/fly.cxx | 1
sw/source/core/layout/flycnt.cxx | 1
sw/source/core/layout/frmtool.cxx | 1
sw/source/core/layout/ftnfrm.cxx | 1
sw/source/core/layout/layact.cxx | 1
sw/source/core/layout/laycache.cxx | 1
sw/source/core/layout/movedfwdfrmsbyobjpos.cxx | 1
sw/source/core/layout/softpagebreak.cxx | 1
sw/source/core/layout/ssfrm.cxx | 1
sw/source/core/layout/tabfrm.cxx | 1
sw/source/core/layout/trvlfrm.cxx | 1
sw/source/core/layout/wsfrm.cxx | 1
sw/source/core/text/xmldump.cxx | 1
sw/source/core/undo/undobj1.cxx | 1
sw/source/core/unocore/unofield.cxx | 1
sw/source/core/unocore/unoport.cxx | 2
sw/source/core/unocore/unoportenum.cxx | 1
sw/source/uibase/docvw/PageBreakWin.cxx | 1
sw/source/uibase/docvw/UnfloatTableButton.cxx | 1
49 files changed, 141 insertions(+), 48 deletions(-)
New commits:
commit 17ecffa91065f453b0799dcc869901f2ecde09dd
Author: Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Sun May 5 23:18:18 2019 +0200
Commit: Miklos Vajna <vmiklos at collabora.com>
CommitDate: Tue May 14 09:13:38 2019 +0200
tdf#42949 Fix IWYU warnings in sw/source/core/inc/[t-w]*
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I7cd9837360e244741bfa22b4693fd221241daf12
Reviewed-on: https://gerrit.libreoffice.org/71833
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
diff --git a/sw/IwyuFilter_sw.yaml b/sw/IwyuFilter_sw.yaml
index 15e849e77e29..2672bd568deb 100644
--- a/sw/IwyuFilter_sw.yaml
+++ b/sw/IwyuFilter_sw.yaml
@@ -270,6 +270,101 @@ blacklist:
sw/source/core/inc/swthreadjoiner.hxx:
# Needed for css shortcut
- sal/types.h
+ sw/source/core/inc/unobookmark.hxx:
+ # Base class needs complete type
+ - com/sun/star/lang/XUnoTunnel.hpp
+ - com/sun/star/lang/XServiceInfo.hpp
+ - com/sun/star/beans/XPropertySet.hpp
+ - com/sun/star/container/XNamed.hpp
+ - com/sun/star/text/XTextContent.hpp
+ - com/sun/star/text/XFormField.hpp
+ # Needed for UnoImplPtr template
+ - unobaseclass.hxx
+ sw/source/core/inc/unofield.hxx:
+ # Base class needs complete type
+ - com/sun/star/container/XEnumeration.hpp
+ - com/sun/star/lang/XServiceInfo.hpp
+ - com/sun/star/lang/XUnoTunnel.hpp
+ - com/sun/star/text/XDependentTextField.hpp
+ - com/sun/star/util/XUpdatable.hpp
+ # Needed for UnoImplPtr template
+ - unobaseclass.hxx
+ include/svtools/unoevent.hxx:
+ # Don't give false positives checking sw/source/core/inc/unoevent.hxx
+ - com/sun/star/container/XNameReplace.hpp
+ - com/sun/star/lang/XServiceInfo.hpp
+ sw/source/core/inc/unoflatpara.hxx:
+ # Base class needs complete type
+ - com/sun/star/beans/XPropertySet.hpp
+ - com/sun/star/lang/XUnoTunnel.hpp
+ - com/sun/star/text/XFlatParagraph.hpp
+ - com/sun/star/text/XFlatParagraphIterator.hpp
+ sw/source/core/inc/unofootnote.hxx:
+ # Base class needs complete type
+ - com/sun/star/lang/XUnoTunnel.hpp
+ - com/sun/star/lang/XServiceInfo.hpp
+ - com/sun/star/beans/XPropertySet.hpp
+ - com/sun/star/container/XEnumerationAccess.hpp
+ - com/sun/star/text/XFootnote.hpp
+ sw/source/core/inc/unoidx.hxx:
+ # Base class needs complete type
+ - com/sun/star/lang/XServiceInfo.hpp
+ - com/sun/star/lang/XUnoTunnel.hpp
+ - com/sun/star/beans/XPropertySet.hpp
+ - com/sun/star/container/XNamed.hpp
+ - com/sun/star/util/XRefreshable.hpp
+ - com/sun/star/text/XDocumentIndexMark.hpp
+ - com/sun/star/text/XDocumentIndex.hpp
+ # Needed for UnoImplPtr template
+ - unobaseclass.hxx
+ sw/source/core/inc/unometa.hxx:
+ # Base class needs complete type
+ - com/sun/star/lang/XServiceInfo.hpp
+ - com/sun/star/lang/XUnoTunnel.hpp
+ - com/sun/star/beans/XPropertySet.hpp
+ - com/sun/star/container/XChild.hpp
+ - com/sun/star/container/XEnumerationAccess.hpp
+ - com/sun/star/text/XTextContent.hpp
+ - com/sun/star/text/XTextField.hpp
+ # Needed for UnoImplPtr template
+ - unobaseclass.hxx
+ sw/source/core/inc/unorefmark.hxx:
+ # Base class needs complete type
+ - com/sun/star/lang/XUnoTunnel.hpp
+ - com/sun/star/lang/XServiceInfo.hpp
+ - com/sun/star/beans/XPropertySet.hpp
+ - com/sun/star/container/XNamed.hpp
+ - com/sun/star/text/XTextContent.hpp
+ # Needed for UnoImplPtr template
+ - unobaseclass.hxx
+ sw/source/core/inc/unoport.hxx:
+ # Base class needs complete type
+ - com/sun/star/text/XTextRange.hpp
+ - com/sun/star/beans/XPropertySet.hpp
+ - com/sun/star/container/XEnumeration.hpp
+ - com/sun/star/lang/XServiceInfo.hpp
+ - com/sun/star/lang/XUnoTunnel.hpp
+ - com/sun/star/container/XContentEnumerationAccess.hpp
+ - com/sun/star/beans/XMultiPropertySet.hpp
+ - com/sun/star/beans/XPropertyState.hpp
+ - com/sun/star/beans/XTolerantMultiPropertySet.hpp
+ sw/source/core/inc/unotextmarkup.hxx:
+ # Base class needs complete type
+ - com/sun/star/text/XTextMarkup.hpp
+ - com/sun/star/text/XMultiTextMarkup.hpp
+ # Needed for UnoImplPtr template
+ - unobaseclass.hxx
+ sw/source/core/inc/unosection.hxx:
+ # Base class needs complete type
+ - com/sun/star/lang/XUnoTunnel.hpp
+ - com/sun/star/lang/XServiceInfo.hpp
+ - com/sun/star/beans/XPropertySet.hpp
+ - com/sun/star/beans/XPropertyState.hpp
+ - com/sun/star/beans/XMultiPropertySet.hpp
+ - com/sun/star/container/XNamed.hpp
+ - com/sun/star/text/XTextSection.hpp
+ # Needed for UnoImplPtr template
+ - unobaseclass.hxx
sw/qa/extras/odfexport/odfexport.cxx:
# Needed for getProperty template
- com/sun/star/graphic/XGraphic.hpp
diff --git a/sw/inc/unoredline.hxx b/sw/inc/unoredline.hxx
index 80a3db1b3c69..f2893bf84ecb 100644
--- a/sw/inc/unoredline.hxx
+++ b/sw/inc/unoredline.hxx
@@ -20,6 +20,7 @@
#define INCLUDED_SW_INC_UNOREDLINE_HXX
#include <svl/listener.hxx>
+#include <com/sun/star/container/XEnumerationAccess.hpp>
#include "unotext.hxx"
#include "ndindex.hxx"
diff --git a/sw/source/core/crsr/findfmt.cxx b/sw/source/core/crsr/findfmt.cxx
index 1193cf856ef8..3125dd5e2aa3 100644
--- a/sw/source/core/crsr/findfmt.cxx
+++ b/sw/source/core/crsr/findfmt.cxx
@@ -21,6 +21,7 @@
#include <pamtyp.hxx>
#include <pam.hxx>
#include <txtfrm.hxx>
+#include <ndtxt.hxx>
#include <memory>
namespace sw {
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index ab84f48b4361..baf32805d516 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -44,6 +44,7 @@
#include <SwGrammarMarkUp.hxx>
#include <docedt.hxx>
#include <frmfmt.hxx>
+#include <ndtxt.hxx>
#include <vector>
#include <com/sun/star/linguistic2/XProofreadingIterator.hpp>
diff --git a/sw/source/core/fields/textapi.cxx b/sw/source/core/fields/textapi.cxx
index fc753afea143..29729fd55290 100644
--- a/sw/source/core/fields/textapi.cxx
+++ b/sw/source/core/fields/textapi.cxx
@@ -21,9 +21,14 @@
#include <doc.hxx>
#include <IDocumentDrawModelAccess.hxx>
#include <docsh.hxx>
+#include <comphelper/propertysetinfo.hxx>
#include <editeng/eeitem.hxx>
#include <editeng/editeng.hxx>
#include <editeng/outlobj.hxx>
+#include <editeng/outliner.hxx>
+#include <editeng/unoprnms.hxx>
+#include <editeng/unoforou.hxx>
+#include <editeng/unoipset.hxx>
#include <com/sun/star/text/XTextField.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
diff --git a/sw/source/core/frmedt/fedesc.cxx b/sw/source/core/frmedt/fedesc.cxx
index f386ffece16f..8ab4e1edab98 100644
--- a/sw/source/core/frmedt/fedesc.cxx
+++ b/sw/source/core/frmedt/fedesc.cxx
@@ -34,6 +34,7 @@
#include <tabfrm.hxx>
#include <edimp.hxx>
#include <SwStyleNameMapper.hxx>
+#include <ndtxt.hxx>
size_t SwFEShell::GetPageDescCnt() const
{
diff --git a/sw/source/core/inc/UndoCore.hxx b/sw/source/core/inc/UndoCore.hxx
index 8dfbf4eb29de..002f2ebc1b2d 100644
--- a/sw/source/core/inc/UndoCore.hxx
+++ b/sw/source/core/inc/UndoCore.hxx
@@ -34,7 +34,6 @@ class SwFormatColl;
class SwFormatAnchor;
class SdrMarkList;
class SwUndoDelete;
-class SwFormat;
namespace sw {
class UndoManager;
diff --git a/sw/source/core/inc/UndoDraw.hxx b/sw/source/core/inc/UndoDraw.hxx
index e75d8b898a35..0cd836e1280e 100644
--- a/sw/source/core/inc/UndoDraw.hxx
+++ b/sw/source/core/inc/UndoDraw.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SW_SOURCE_CORE_INC_UNDODRAW_HXX
#include <undobj.hxx>
-#include <svx/svdundo.hxx>
#include <memory>
struct SwUndoGroupObjImpl;
diff --git a/sw/source/core/inc/UndoOverwrite.hxx b/sw/source/core/inc/UndoOverwrite.hxx
index 443d13a7f347..0fe66a64d398 100644
--- a/sw/source/core/inc/UndoOverwrite.hxx
+++ b/sw/source/core/inc/UndoOverwrite.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SW_SOURCE_CORE_INC_UNDOOVERWRITE_HXX
#include <memory>
-#include <com/sun/star/uno/Sequence.h>
#include <rtl/ustring.hxx>
#include <undobj.hxx>
diff --git a/sw/source/core/inc/UndoSection.hxx b/sw/source/core/inc/UndoSection.hxx
index 985259728b64..3bb1e3e74f1e 100644
--- a/sw/source/core/inc/UndoSection.hxx
+++ b/sw/source/core/inc/UndoSection.hxx
@@ -22,7 +22,6 @@
#include <undobj.hxx>
#include <memory>
-#include <swdllapi.h>
class SfxItemSet;
class SwTextNode;
diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx
index 193638b2c518..65a62d284682 100644
--- a/sw/source/core/inc/UndoTable.hxx
+++ b/sw/source/core/inc/UndoTable.hxx
@@ -24,7 +24,6 @@
#include <ndarr.hxx>
#include <undobj.hxx>
#include <set>
-#include <swtypes.hxx>
#include <itabenum.hxx>
#include <tblenum.hxx>
#include <memory>
diff --git a/sw/source/core/inc/tblrwcl.hxx b/sw/source/core/inc/tblrwcl.hxx
index 97416a63f72f..25ae789c0e6c 100644
--- a/sw/source/core/inc/tblrwcl.hxx
+++ b/sw/source/core/inc/tblrwcl.hxx
@@ -24,15 +24,12 @@
#include <vector>
#include <swtypes.hxx>
-#include <tblsel.hxx>
#include <swtable.hxx>
namespace editeng { class SvxBorderLine; }
class SwDoc;
class SwTableNode;
-class SwTableLine;
-class SwTableBox;
class SwTableBoxFormat;
class SwHistory;
class SwContentNode;
diff --git a/sw/source/core/inc/textapi.hxx b/sw/source/core/inc/textapi.hxx
index e2d704556993..ee8bd319d407 100644
--- a/sw/source/core/inc/textapi.hxx
+++ b/sw/source/core/inc/textapi.hxx
@@ -22,11 +22,7 @@
#include <editeng/unoedsrc.hxx>
#include <editeng/unotext.hxx>
-#include <editeng/eeitem.hxx>
-#include <editeng/outliner.hxx>
-#include <editeng/unoipset.hxx>
-#include <editeng/unoprnms.hxx>
-#include <editeng/unoforou.hxx>
+#include <editeng/outlobj.hxx>
class SwDoc;
diff --git a/sw/source/core/inc/threadlistener.hxx b/sw/source/core/inc/threadlistener.hxx
index 8a5c1e9dbd64..4917296c6cb9 100644
--- a/sw/source/core/inc/threadlistener.hxx
+++ b/sw/source/core/inc/threadlistener.hxx
@@ -20,9 +20,9 @@
#define INCLUDED_SW_SOURCE_CORE_INC_THREADLISTENER_HXX
#include "ifinishedthreadlistener.hxx"
-#include "observablethread.hxx"
class ThreadManager;
+class ObservableThread;
/** helper class to observe threads
diff --git a/sw/source/core/inc/tolayoutanchoredobjectposition.hxx b/sw/source/core/inc/tolayoutanchoredobjectposition.hxx
index 1b538da1b08f..14bda973e969 100644
--- a/sw/source/core/inc/tolayoutanchoredobjectposition.hxx
+++ b/sw/source/core/inc/tolayoutanchoredobjectposition.hxx
@@ -19,8 +19,6 @@
#ifndef INCLUDED_SW_SOURCE_CORE_INC_TOLAYOUTANCHOREDOBJECTPOSITION_HXX
#define INCLUDED_SW_SOURCE_CORE_INC_TOLAYOUTANCHOREDOBJECTPOSITION_HXX
#include "anchoredobjectposition.hxx"
-#include <swtypes.hxx>
-#include <swrect.hxx>
namespace objectpositioning
{
diff --git a/sw/source/core/inc/txtfly.hxx b/sw/source/core/inc/txtfly.hxx
index f8b2979d927f..62eda5bf7df1 100644
--- a/sw/source/core/inc/txtfly.hxx
+++ b/sw/source/core/inc/txtfly.hxx
@@ -19,6 +19,7 @@
#ifndef INCLUDED_SW_SOURCE_CORE_INC_TXTFLY_HXX
#define INCLUDED_SW_SOURCE_CORE_INC_TXTFLY_HXX
+#include <editeng/txtrange.hxx>
#include <tools/solar.h>
#include <swtypes.hxx>
#include <swrect.hxx>
@@ -27,11 +28,9 @@
#include <vector>
class OutputDevice;
-class SwContentFrame;
class SwPageFrame;
class SdrObject;
class SwFormat;
-class TextRanger;
class SwAnchoredObject;
class SwTextFrame;
class SwDrawTextInfo;
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 51eaf62279c5..c9deeb0c827e 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -21,11 +21,12 @@
#include <com/sun/star/uno/Sequence.hxx>
#include "cntfrm.hxx"
-#include <ndtxt.hxx>
#include "TextFrameIndex.hxx"
#include <boost/version.hpp>
+#include <set>
+
namespace com { namespace sun { namespace star { namespace linguistic2 { class XHyphenatedWord; } } } }
namespace sw { namespace mark { class IMark; } }
@@ -36,19 +37,17 @@ class SwTextFormatter;
class SwTextFormatInfo;
class SwParaPortion;
class WidowsAndOrphans;
-class SwBodyFrame;
class SwTextFootnote;
class SwInterHyphInfo; // Hyphenate()
class SwCache;
class SwBorderAttrs;
class SwFrameFormat;
-class OutputDevice;
-class SwTestFormat;
struct SwCursorMoveState;
struct SwFillData;
class SwPortionHandler;
class SwScriptInfo;
enum class ExpandMode;
+class SwTextAttr;
#define NON_PRINTING_CHARACTER_COLOR Color(0x26, 0x8b, 0xd2)
diff --git a/sw/source/core/inc/txttypes.hxx b/sw/source/core/inc/txttypes.hxx
index 89db78b5d3f6..442b997a0884 100644
--- a/sw/source/core/inc/txttypes.hxx
+++ b/sw/source/core/inc/txttypes.hxx
@@ -19,8 +19,6 @@
#ifndef INCLUDED_SW_SOURCE_CORE_INC_TXTTYPES_HXX
#define INCLUDED_SW_SOURCE_CORE_INC_TXTTYPES_HXX
-#include <swtypes.hxx>
-
enum class PortionType
{
NONE = 0x0000,
diff --git a/sw/source/core/inc/unoevent.hxx b/sw/source/core/inc/unoevent.hxx
index dd99a5a882b8..1989a6f35dae 100644
--- a/sw/source/core/inc/unoevent.hxx
+++ b/sw/source/core/inc/unoevent.hxx
@@ -20,8 +20,6 @@
#define INCLUDED_SW_SOURCE_CORE_INC_UNOEVENT_HXX
#include <svtools/unoevent.hxx>
-#include <unostyle.hxx>
-#include <svl/macitem.hxx>
class SvxMacroItem;
class SwXFrame;
@@ -29,6 +27,7 @@ class SwXTextFrame;
class SwXTextGraphicObject;
class SwXTextEmbeddedObject;
class SwFormatINetFormat;
+namespace sw { class ICoreFrameStyle; }
class SwHyperlinkEventDescriptor : public SvDetachedEventDescriptor
{
diff --git a/sw/source/core/inc/unofield.hxx b/sw/source/core/inc/unofield.hxx
index 723b954e0dad..47f9f0c4dbbb 100644
--- a/sw/source/core/inc/unofield.hxx
+++ b/sw/source/core/inc/unofield.hxx
@@ -32,7 +32,6 @@
#include <unocoll.hxx>
#include <fldbas.hxx>
-class SwFieldType;
class SwDoc;
class SwFormatField;
class SwSetExpField;
diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx
index ad584dbb4400..b59c03a9246a 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 <modeltoviewhelper.hxx>
#include "unotextmarkup.hxx"
#include <set>
@@ -42,6 +41,7 @@ namespace com { namespace sun { namespace star { namespace text {
class SwTextNode;
class SwDoc;
+class ModelToViewHelper;
typedef ::cppu::ImplInheritanceHelper
< SwXTextMarkup
diff --git a/sw/source/core/inc/unofldmid.h b/sw/source/core/inc/unofldmid.h
index 949f55476fb0..2bb13a66faa3 100644
--- a/sw/source/core/inc/unofldmid.h
+++ b/sw/source/core/inc/unofldmid.h
@@ -19,12 +19,6 @@
#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOFLDMID_H
#define INCLUDED_SW_SOURCE_CORE_INC_UNOFLDMID_H
-#include <tools/solar.h>
-
-namespace com { namespace sun { namespace star { namespace uno {
- class Any;
-} } } }
-
// mapping of the properties on the descriptor
#define FIELD_PROP_PAR1 10
#define FIELD_PROP_PAR2 11
diff --git a/sw/source/core/inc/unofreg.hxx b/sw/source/core/inc/unofreg.hxx
index e8d99c1a5be3..8350cc74f7e6 100644
--- a/sw/source/core/inc/unofreg.hxx
+++ b/sw/source/core/inc/unofreg.hxx
@@ -23,7 +23,6 @@
#include <sal/config.h>
#include <sfx2/sfxmodelfactory.hxx>
-#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/Sequence.hxx>
namespace com { namespace sun { namespace star { namespace lang {
diff --git a/sw/source/core/inc/unoparaframeenum.hxx b/sw/source/core/inc/unoparaframeenum.hxx
index cd9b1bc9e53e..17b1b0013b36 100644
--- a/sw/source/core/inc/unoparaframeenum.hxx
+++ b/sw/source/core/inc/unoparaframeenum.hxx
@@ -22,9 +22,6 @@
#include <deque>
-
-#include <cppuhelper/implbase.hxx>
-
#include <calbck.hxx>
#include <unobaseclass.hxx>
diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx
index 2cb9ddb38402..afe00a0e81ee 100644
--- a/sw/source/core/inc/unoport.hxx
+++ b/sw/source/core/inc/unoport.hxx
@@ -23,16 +23,12 @@
#include <deque>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/text/XTextRange.hpp>
#include <com/sun/star/container/XEnumeration.hpp>
#include <com/sun/star/container/XContentEnumerationAccess.hpp>
-#include <com/sun/star/container/XEnumerationAccess.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/beans/XTolerantMultiPropertySet.hpp>
-#include <com/sun/star/text/XTextField.hpp>
-#include <com/sun/star/text/XFootnote.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
@@ -42,8 +38,10 @@
#include <unocrsr.hxx>
#include <calbck.hxx>
-#include <unobaseclass.hxx>
-#include <IDocumentRedlineAccess.hxx>
+
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::text { class XTextField; }
+namespace com::sun::star::text { class XFootnote; }
class SwFrameFormat;
class SwRangeRedline;
diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx
index 8a62ae2b1b85..4a599308274b 100644
--- a/sw/source/core/inc/viewimp.hxx
+++ b/sw/source/core/inc/viewimp.hxx
@@ -19,15 +19,13 @@
#ifndef INCLUDED_SW_SOURCE_CORE_INC_VIEWIMP_HXX
#define INCLUDED_SW_SOURCE_CORE_INC_VIEWIMP_HXX
-#include <rtl/ustring.hxx>
#include <tools/color.hxx>
#include <svx/svdtypes.hxx>
-#include <vcl/timer.hxx>
#include <swrect.hxx>
-#include <swtypes.hxx>
#include <vector>
#include <memory>
+class OutputDevice;
class SwViewShell;
class SwFlyFrame;
class SwViewOption;
@@ -38,7 +36,6 @@ class SwLayIdle;
class SwDrawView;
class SdrPageView;
class SwPageFrame;
-class SwRegionRects;
class SwAccessibleMap;
class SdrObject;
class Fraction;
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index c09efcbbea5d..914b179a692b 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -25,6 +25,7 @@
#include <frmtool.hxx>
#include <txtftn.hxx>
#include <fmtftn.hxx>
+#include <ndtxt.hxx>
#include <editeng/ulspitem.hxx>
#include <editeng/keepitem.hxx>
#include <svx/sdtaitm.hxx>
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index 0ad2d950570e..c69e27ba8ecc 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -107,6 +107,7 @@
#include <layfrm.hxx>
#include <frame.hxx>
#include <swtable.hxx>
+#include <ndtxt.hxx>
#include <sal/log.hxx>
#include <tools/stream.hxx>
diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx
index 1e98e7549947..786c7627d7c9 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -35,6 +35,7 @@
#include <bodyfrm.hxx>
#include <calbck.hxx>
#include <viewopt.hxx>
+#include <ndtxt.hxx>
#include <sal/log.hxx>
/// Searches the first ContentFrame in BodyText below the page.
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index 76ace9527fb9..6285a8b5bf81 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -60,6 +60,7 @@
#include <IDocumentSettingAccess.hxx>
#include <IDocumentDrawModelAccess.hxx>
#include <pam.hxx>
+#include <ndtxt.hxx>
bool SwFlowFrame::m_bMoveBwdJump = false;
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index c701c9db56b9..b02b911090f7 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -75,6 +75,7 @@
#include <edtwin.hxx>
#include <bodyfrm.hxx>
#include <FrameControlsManager.hxx>
+#include <ndtxt.hxx>
using namespace ::com::sun::star;
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index 9163098fee18..f3c442ac8cfa 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -46,6 +46,7 @@
#include <layouter.hxx>
#include "objectformattertxtfrm.hxx"
#include <HandleAnchorNodeChg.hxx>
+#include <ndtxt.hxx>
using namespace ::com::sun::star;
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index b5e458e5c24d..2cfab46f988a 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -64,6 +64,7 @@
#include <sortedobjs.hxx>
#include <objectformatter.hxx>
#include <calbck.hxx>
+#include <ndtxt.hxx>
#include <DocumentSettingManager.hxx>
#include <IDocumentDrawModelAccess.hxx>
#include <IDocumentTimerAccess.hxx>
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index 7f5ac35034ef..280e6ed13d82 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -35,6 +35,7 @@
#include <calbck.hxx>
#include <ndindex.hxx>
#include <pam.hxx>
+#include <ndtxt.hxx>
#include <sal/log.hxx>
#define ENDNOTE 0x80000000
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 8b5922c8a3e7..174e15699e46 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -50,6 +50,7 @@
#include <fmtsrnd.hxx>
#include <docsh.hxx>
+#include <ndtxt.hxx>
#include <tabfrm.hxx>
#include <ftnfrm.hxx>
#include <txtfrm.hxx>
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index 99e0c83bf184..dbf74df4b960 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -44,6 +44,7 @@
#include <sortedobjs.hxx>
#include <ndindex.hxx>
#include <node.hxx>
+#include <ndtxt.hxx>
#include <limits>
#include <set>
diff --git a/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx b/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx
index 7585cd25b3e1..7aba4b74a37b 100644
--- a/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx
+++ b/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx
@@ -22,6 +22,7 @@
#include <rowfrm.hxx>
#include <pagefrm.hxx>
#include <calbck.hxx>
+#include <ndtxt.hxx>
SwMovedFwdFramesByObjPos::SwMovedFwdFramesByObjPos()
{
diff --git a/sw/source/core/layout/softpagebreak.cxx b/sw/source/core/layout/softpagebreak.cxx
index 9113ed72c274..c1fda882bd77 100644
--- a/sw/source/core/layout/softpagebreak.cxx
+++ b/sw/source/core/layout/softpagebreak.cxx
@@ -24,6 +24,7 @@
#include <rowfrm.hxx>
#include <tabfrm.hxx>
#include <calbck.hxx>
+#include <ndtxt.hxx>
void SwTextNode::fillSoftPageBreakList( SwSoftPageBreakList& rBreak ) const
{
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index 9e496a1bd2ec..4e80de512c8b 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -33,6 +33,7 @@
#include <sortedobjs.hxx>
#include <hints.hxx>
#include <frmtool.hxx>
+#include <ndtxt.hxx>
// No inline cause we need the function pointers
long SwFrame::GetTopMargin() const
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index c78c5889d3b5..eb360947d1a2 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -60,6 +60,7 @@
#include <sal/log.hxx>
#include <frmatr.hxx>
#include <frmtool.hxx>
+#include <ndtxt.hxx>
using namespace ::com::sun::star;
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index 86747c4901b8..24b9f6b588f3 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -47,6 +47,7 @@
#include <fldbas.hxx>
#include <frmatr.hxx>
#include <frmtool.hxx>
+#include <ndtxt.hxx>
#include <cfloat>
#include <swselectionlist.hxx>
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 187f64e797a5..b6014ddbd18c 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -56,6 +56,7 @@
#include <sortedobjs.hxx>
#include <frmatr.hxx>
#include <frmtool.hxx>
+#include <ndtxt.hxx>
// RotateFlyFrame3
#include <basegfx/matrix/b2dhommatrixtools.hxx>
diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx
index b99645bed539..a905e10d2208 100644
--- a/sw/source/core/text/xmldump.cxx
+++ b/sw/source/core/text/xmldump.cxx
@@ -18,6 +18,7 @@
#include <hffrm.hxx>
#include <rootfrm.hxx>
#include <editsh.hxx>
+#include <ndtxt.hxx>
#include "porlin.hxx"
#include "porlay.hxx"
#include "portxt.hxx"
diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx
index 4b532ad0bdfa..f88611b0cf11 100644
--- a/sw/source/core/undo/undobj1.cxx
+++ b/sw/source/core/undo/undobj1.cxx
@@ -18,6 +18,7 @@
*/
#include <svl/itemiter.hxx>
+#include <svx/svdundo.hxx>
#include <hintids.hxx>
#include <hints.hxx>
#include <fmtflcnt.hxx>
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index 63614495ab9c..efb4ff9accab 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -86,6 +86,7 @@
#include <scriptinfo.hxx>
#include <tools/datetime.hxx>
#include <tools/urlobj.hxx>
+#include <svl/itemprop.hxx>
#include <svl/listener.hxx>
#include <svx/dataaccessdescriptor.hxx>
#include <o3tl/any.hxx>
diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx
index bd5cd91d95b2..7c03d12a7623 100644
--- a/sw/source/core/unocore/unoport.cxx
+++ b/sw/source/core/unocore/unoport.cxx
@@ -44,6 +44,8 @@
#include <com/sun/star/beans/GetPropertyTolerantResult.hpp>
#include <com/sun/star/beans/TolerantPropertySetResultType.hpp>
#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
+#include <com/sun/star/text/XFootnote.hpp>
+#include <com/sun/star/text/XTextField.hpp>
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <comphelper/sequence.hxx>
diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx
index b8c37eb7dd87..8c4f1201ac19 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -61,6 +61,7 @@
#include <comphelper/string.hxx>
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/supportsservice.hxx>
+#include <com/sun/star/container/XEnumeration.hpp>
#include <algorithm>
#include <memory>
#include <set>
diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx
index d10ff2b91b2d..1556aafd7cba 100644
--- a/sw/source/uibase/docvw/PageBreakWin.cxx
+++ b/sw/source/uibase/docvw/PageBreakWin.cxx
@@ -14,6 +14,7 @@
#include <cntfrm.hxx>
#include <txtfrm.hxx>
#include <notxtfrm.hxx>
+#include <ndtxt.hxx>
#include <DashedLine.hxx>
#include <doc.hxx>
#include <edtwin.hxx>
diff --git a/sw/source/uibase/docvw/UnfloatTableButton.cxx b/sw/source/uibase/docvw/UnfloatTableButton.cxx
index a4a92be08d33..63604b6a3525 100644
--- a/sw/source/uibase/docvw/UnfloatTableButton.cxx
+++ b/sw/source/uibase/docvw/UnfloatTableButton.cxx
@@ -24,6 +24,7 @@
#include <txtfrm.hxx>
#include <pagefrm.hxx>
#include <ndindex.hxx>
+#include <ndtxt.hxx>
#include <swtable.hxx>
#include <IDocumentState.hxx>
#include <IDocumentUndoRedo.hxx>
More information about the Libreoffice-commits
mailing list