sw/IwyuFilter_sw.yaml | 15 +++++
sw/source/core/doc/CntntIdxStore.cxx | 7 --
sw/source/core/doc/DocumentChartDataProviderManager.cxx | 1
sw/source/core/doc/DocumentContentOperationsManager.cxx | 4 -
sw/source/core/doc/DocumentDeviceManager.cxx | 3 -
sw/source/core/doc/DocumentDrawModelManager.cxx | 4 -
sw/source/core/doc/DocumentFieldsManager.cxx | 1
sw/source/core/doc/DocumentLayoutManager.cxx | 1
sw/source/core/doc/DocumentLinksAdministrationManager.cxx | 3 -
sw/source/core/doc/DocumentListsManager.cxx | 2
sw/source/core/doc/DocumentRedlineManager.cxx | 5 -
sw/source/core/doc/DocumentSettingManager.cxx | 1
sw/source/core/doc/DocumentStateManager.cxx | 1
sw/source/core/doc/DocumentStatisticsManager.cxx | 5 -
sw/source/core/doc/DocumentStylePoolManager.cxx | 2
sw/source/core/doc/SwStyleNameMapper.cxx | 3 -
sw/source/core/doc/acmplwrd.cxx | 5 -
sw/source/core/doc/doc.cxx | 37 ------------
sw/source/core/doc/docbm.cxx | 19 +-----
sw/source/core/doc/docchart.cxx | 8 --
sw/source/core/doc/doccomp.cxx | 7 --
sw/source/core/doc/doccorr.cxx | 6 --
sw/source/core/doc/docdesc.cxx | 7 --
sw/source/core/doc/docdraw.cxx | 17 -----
sw/source/core/doc/docedt.cxx | 11 ---
sw/source/core/doc/docfld.cxx | 13 ----
sw/source/core/doc/docfly.cxx | 11 ---
sw/source/core/doc/docfmt.cxx | 13 ----
sw/source/core/doc/docglbl.cxx | 9 ---
sw/source/core/doc/docglos.cxx | 2
sw/source/core/doc/doclay.cxx | 20 -------
sw/source/core/doc/docnew.cxx | 25 --------
sw/source/core/doc/docnum.cxx | 9 ---
sw/source/core/doc/docredln.cxx | 7 --
sw/source/core/doc/docruby.cxx | 2
sw/source/core/doc/docsort.cxx | 3 -
sw/source/core/doc/doctxm.cxx | 8 --
sw/source/core/doc/docxforms.cxx | 2
sw/source/core/doc/extinput.cxx | 6 --
sw/source/core/doc/fmtcol.cxx | 1
sw/source/core/doc/gctable.cxx | 1
sw/source/core/doc/htmltbl.cxx | 6 --
sw/source/core/doc/lineinfo.cxx | 1
sw/source/core/doc/notxtfrm.cxx | 10 ---
sw/source/core/doc/number.cxx | 5 -
sw/source/core/doc/poolfmt.cxx | 40 --------------
sw/source/core/doc/swserv.cxx | 3 -
sw/source/core/doc/swstylemanager.cxx | 4 -
sw/source/core/doc/tblafmt.cxx | 6 --
sw/source/core/doc/tblcpy.cxx | 5 -
sw/source/core/doc/tblrwcl.cxx | 6 --
sw/source/core/docnode/ndnotxt.cxx | 3 -
sw/source/core/docnode/ndnum.cxx | 2
sw/source/core/docnode/ndsect.cxx | 3 -
sw/source/core/docnode/ndtbl.cxx | 7 --
sw/source/core/docnode/ndtbl1.cxx | 3 -
sw/source/core/docnode/node.cxx | 2
sw/source/core/docnode/node2lay.cxx | 1
sw/source/core/docnode/nodes.cxx | 4 -
sw/source/core/docnode/section.cxx | 7 --
sw/source/core/docnode/swbaslnk.cxx | 11 ---
sw/source/core/docnode/swthreadjoiner.cxx | 1
sw/source/core/draw/dcontact.cxx | 12 +---
sw/source/core/draw/dflyobj.cxx | 7 --
sw/source/core/draw/dobjfac.cxx | 1
sw/source/core/draw/dpage.cxx | 9 ---
sw/source/core/draw/drawdoc.cxx | 10 ---
sw/source/core/draw/dview.cxx | 7 --
68 files changed, 44 insertions(+), 439 deletions(-)
New commits:
commit ee909ca2c02f949605f68720c3f1eef658502749
Author: Gabor Kelemen <kelemen.gab...@nisz.hu>
AuthorDate: Tue Oct 29 12:11:35 2019 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Tue Nov 5 08:40:15 2019 +0100
tdf#42949 Fix IWYU warnings in sw/source/core/d*/*cxx
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: Id33b8c1e0c02c21591b167a8b3f0ea288fac63bd
Reviewed-on: https://gerrit.libreoffice.org/81689
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/sw/IwyuFilter_sw.yaml b/sw/IwyuFilter_sw.yaml
index 4f9c0b3b3961..e1b03eb15d62 100644
--- a/sw/IwyuFilter_sw.yaml
+++ b/sw/IwyuFilter_sw.yaml
@@ -441,6 +441,18 @@ blacklist:
- osl/endian.h
sw/qa/extras/layout/layout.cxx:
- comphelper/scopeguard.hxx
+ sw/source/core/doc/DocumentFieldsManager.cxx:
+ # Actually used
+ - comphelper/scopeguard.hxx
+ sw/source/core/doc/docbm.cxx:
+ # Needed for implicit dtor SwHistoryTextFieldmark
+ - rolbck.hxx
+ sw/source/core/doc/docredln.cxx:
+ # Needed for linker visibility of sw_DebugRedline
+ - docredln.hxx
+ sw/source/core/docnode/threadmanager.cxx:
+ # Actually used
+ - com/sun/star/util/XJobManager.hpp
sw/source/filter/html/htmlreqifreader.cxx:
- comphelper/scopeguard.hxx
sw/source/uibase/sidebar/PageMarginUtils.hxx:
@@ -449,3 +461,6 @@ blacklist:
sw/source/core/crsr/paminit.cxx:
# Needed for linker visibility of extern functions
- cshtyp.hxx
+ sw/source/core/undo/untbl.cxx:
+ # Needed for linker visibility of sw_DebugRedline
+ - docredln.hxx
diff --git a/sw/source/core/doc/CntntIdxStore.cxx
b/sw/source/core/doc/CntntIdxStore.cxx
index bc970410eeb1..3c117ffab662 100644
--- a/sw/source/core/doc/CntntIdxStore.cxx
+++ b/sw/source/core/doc/CntntIdxStore.cxx
@@ -22,23 +22,17 @@
#include <doc.hxx>
#include <IDocumentRedlineAccess.hxx>
#include <IDocumentLayoutAccess.hxx>
-#include <MarkManager.hxx>
#include <docary.hxx>
#include <editsh.hxx>
#include <fmtanchr.hxx>
#include <frmfmt.hxx>
#include <functional>
#include <mvsave.hxx>
-#include <ndtxt.hxx>
#include <node.hxx>
#include <pam.hxx>
#include <redline.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <rtl/ustring.hxx>
-#include <sal/log.hxx>
#include <sal/types.h>
#include <unocrsr.hxx>
-#include <edimp.hxx>
#include <txtfrm.hxx>
#include <memory>
@@ -80,6 +74,7 @@ namespace
bool m_bOther;
sal_Int32 m_nContent;
#if 0
+#include <sal/log.hxx>
void Dump()
{
SAL_INFO("sw.core", "Index: " << m_nIdx << "\tOther: " << m_bOther
<< "\tContent: " << m_nContent);
diff --git a/sw/source/core/doc/DocumentChartDataProviderManager.cxx
b/sw/source/core/doc/DocumentChartDataProviderManager.cxx
index c2ab8eea204d..674c43c8471f 100644
--- a/sw/source/core/doc/DocumentChartDataProviderManager.cxx
+++ b/sw/source/core/doc/DocumentChartDataProviderManager.cxx
@@ -24,7 +24,6 @@
#include <vcl/svapp.hxx>
#include <swtable.hxx>
#include <unochart.hxx>
-#include <frmfmt.hxx>
#include <ndole.hxx>
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 704603372c65..995e3dcfa482 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -20,7 +20,6 @@
#include <doc.hxx>
#include <IDocumentUndoRedo.hxx>
#include <IDocumentMarkAccess.hxx>
-#include <DocumentRedlineManager.hxx>
#include <IDocumentState.hxx>
#include <IDocumentLayoutAccess.hxx>
#include <IDocumentStylePoolAccess.hxx>
@@ -34,7 +33,6 @@
#include <ndgrf.hxx>
#include <ndnotxt.hxx>
#include <ndole.hxx>
-#include <fmtcol.hxx>
#include <breakit.hxx>
#include <frmfmt.hxx>
#include <fmtanchr.hxx>
@@ -65,7 +63,6 @@
#include <ftnidx.hxx>
#include <txtftn.hxx>
#include <hints.hxx>
-#include <crsrsh.hxx>
#include <fmtflcnt.hxx>
#include <docedt.hxx>
#include <sal/log.hxx>
@@ -80,6 +77,7 @@
#include <tools/globname.hxx>
#include <editeng/formatbreakitem.hxx>
#include <com/sun/star/i18n/Boundary.hpp>
+#include <com/sun/star/i18n/WordType.hpp>
#include <com/sun/star/i18n/XBreakIterator.hpp>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <memory>
diff --git a/sw/source/core/doc/DocumentDeviceManager.cxx
b/sw/source/core/doc/DocumentDeviceManager.cxx
index 9f411c82424a..e0c0b7d09be8 100644
--- a/sw/source/core/doc/DocumentDeviceManager.cxx
+++ b/sw/source/core/doc/DocumentDeviceManager.cxx
@@ -22,7 +22,6 @@
#include <memory>
#include <utility>
-#include <IDocumentDeviceAccess.hxx>
#include <doc.hxx>
#include <DocumentSettingManager.hxx>
#include <IDocumentDrawModelAccess.hxx>
@@ -35,8 +34,6 @@
#include <printdata.hxx>
#include <vcl/mapmod.hxx>
#include <svl/itemset.hxx>
-#include <svx/svdmodel.hxx>
-#include <sal/log.hxx>
#include <cmdid.h>
#include <drawdoc.hxx>
#include <wdocsh.hxx>
diff --git a/sw/source/core/doc/DocumentDrawModelManager.cxx
b/sw/source/core/doc/DocumentDrawModelManager.cxx
index 9c26da3d53c9..ef1aa1a29d65 100644
--- a/sw/source/core/doc/DocumentDrawModelManager.cxx
+++ b/sw/source/core/doc/DocumentDrawModelManager.cxx
@@ -28,9 +28,7 @@
#include <docsh.hxx>
#include <wrtsh.hxx>
#include <swtypes.hxx>
-#include <ndtxt.hxx>
#include <svl/hint.hxx>
-#include <svx/svdundo.hxx>
#include <viewsh.hxx>
#include <view.hxx>
#include <drawdoc.hxx>
@@ -38,7 +36,6 @@
#include <fmtanchr.hxx>
#include <editeng/eeitem.hxx>
#include <editeng/fhgtitem.hxx>
-#include <svx/svdmodel.hxx>
#include <svx/svdlayer.hxx>
#include <svx/svdoutl.hxx>
#include <svx/svdpage.hxx>
@@ -46,7 +43,6 @@
#include <svx/svdotext.hxx>
#include <svx/svdview.hxx>
#include <svl/srchitem.hxx>
-#include <tools/link.hxx>
#include <unotools/configmgr.hxx>
#include <sal/log.hxx>
diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx
b/sw/source/core/doc/DocumentFieldsManager.cxx
index 54ac718099d7..134d8cab9968 100644
--- a/sw/source/core/doc/DocumentFieldsManager.cxx
+++ b/sw/source/core/doc/DocumentFieldsManager.cxx
@@ -21,7 +21,6 @@
#include <doc.hxx>
#include <IDocumentUndoRedo.hxx>
#include <IDocumentState.hxx>
-#include <IDocumentLayoutAccess.hxx>
#include <IDocumentRedlineAccess.hxx>
#include <redline.hxx>
#include <rootfrm.hxx>
diff --git a/sw/source/core/doc/DocumentLayoutManager.cxx
b/sw/source/core/doc/DocumentLayoutManager.cxx
index 11ed4010f7ff..67875e86efbb 100644
--- a/sw/source/core/doc/DocumentLayoutManager.cxx
+++ b/sw/source/core/doc/DocumentLayoutManager.cxx
@@ -34,7 +34,6 @@
#include <txtflcnt.hxx>
#include <fmtflcnt.hxx>
#include <ndtxt.hxx>
-#include <dcontact.hxx>
#include <unoframe.hxx>
#include <docary.hxx>
#include <textboxhelper.hxx>
diff --git a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
index ca613ae0f850..58a687294165 100644
--- a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
+++ b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
@@ -23,17 +23,14 @@
#include <DocumentSettingManager.hxx>
#include <IDocumentUndoRedo.hxx>
#include <IDocumentState.hxx>
-#include <IDocumentLayoutAccess.hxx>
#include <IDocumentMarkAccess.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/linkmgr.hxx>
#include <sfx2/docfile.hxx>
-#include <sfx2/frame.hxx>
#include <dialoghelp.hxx>
#include <linkenum.hxx>
#include <com/sun/star/document/UpdateDocMode.hpp>
#include <swtypes.hxx>
-#include <viewsh.hxx>
#include <docsh.hxx>
#include <bookmrk.hxx>
#include <swserv.hxx>
diff --git a/sw/source/core/doc/DocumentListsManager.cxx
b/sw/source/core/doc/DocumentListsManager.cxx
index 5fe2c0f9cad8..d74e924fde95 100644
--- a/sw/source/core/doc/DocumentListsManager.cxx
+++ b/sw/source/core/doc/DocumentListsManager.cxx
@@ -24,8 +24,6 @@
#include <comphelper/random.hxx>
#include <osl/diagnose.h>
-#include <vector>
-
namespace sw
{
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx
b/sw/source/core/doc/DocumentRedlineManager.cxx
index d94fec28e868..57621a2f6cd9 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -37,11 +37,6 @@
#include <authfld.hxx>
#include <strings.hrc>
#include <swmodule.hxx>
-#include <editsh.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/weld.hxx>
-#include <svl/intitem.hxx>
-#include <sal/log.hxx>
using namespace com::sun::star;
diff --git a/sw/source/core/doc/DocumentSettingManager.cxx
b/sw/source/core/doc/DocumentSettingManager.cxx
index 719f46f3bdeb..fe13a6b569f6 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -34,7 +34,6 @@
#include <rootfrm.hxx>
#include <breakit.hxx>
#include <docary.hxx>
-#include <SwUndoFmt.hxx>
/* IDocumentSettingAccess */
diff --git a/sw/source/core/doc/DocumentStateManager.cxx
b/sw/source/core/doc/DocumentStateManager.cxx
index 1a704c3e9980..bf965d54ba4d 100644
--- a/sw/source/core/doc/DocumentStateManager.cxx
+++ b/sw/source/core/doc/DocumentStateManager.cxx
@@ -21,7 +21,6 @@
#include <DocumentStatisticsManager.hxx>
#include <IDocumentUndoRedo.hxx>
#include <DocumentLayoutManager.hxx>
-#include <docstat.hxx>
#include <acorrect.hxx>
namespace sw
diff --git a/sw/source/core/doc/DocumentStatisticsManager.cxx
b/sw/source/core/doc/DocumentStatisticsManager.cxx
index 394aee67856a..e8bef7ca9d25 100644
--- a/sw/source/core/doc/DocumentStatisticsManager.cxx
+++ b/sw/source/core/doc/DocumentStatisticsManager.cxx
@@ -18,7 +18,6 @@
*/
#include <DocumentStatisticsManager.hxx>
#include <doc.hxx>
-#include <editsh.hxx>
#include <fldbas.hxx>
#include <docsh.hxx>
#include <IDocumentFieldsAccess.hxx>
@@ -31,11 +30,7 @@
#include <rootfrm.hxx>
#include <docufld.hxx>
#include <docstat.hxx>
-#include <vector>
-#include <viewsh.hxx>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
-#include <wrtsh.hxx>
-#include <viewopt.hxx>
using namespace ::com::sun::star;
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx
b/sw/source/core/doc/DocumentStylePoolManager.cxx
index 8cf107ffcf16..767af3a22010 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -56,7 +56,6 @@
#include <editeng/escapementitem.hxx>
#include <editeng/langitem.hxx>
#include <editeng/charrotateitem.hxx>
-#include <editeng/frmdiritem.hxx>
#include <editeng/emphasismarkitem.hxx>
#include <editeng/scriptspaceitem.hxx>
#include <svx/strings.hrc>
@@ -65,7 +64,6 @@
#include <osl/diagnose.h>
#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>
#include <com/sun/star/text/HoriOrientation.hpp>
diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx
b/sw/source/core/doc/SwStyleNameMapper.cxx
index 6648d7a36514..63729613d5bc 100644
--- a/sw/source/core/doc/SwStyleNameMapper.cxx
+++ b/sw/source/core/doc/SwStyleNameMapper.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <numeric>
-#include <tuple>
-
#include <SwStyleNameMapper.hxx>
#include <poolfmt.hxx>
#include <strings.hrc>
diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx
index 4a4c01de5b12..47948632614d 100644
--- a/sw/source/core/doc/acmplwrd.cxx
+++ b/sw/source/core/doc/acmplwrd.cxx
@@ -20,13 +20,8 @@
#include <tools/urlobj.hxx>
#include <hintids.hxx>
#include <hints.hxx>
-#include <unotools/transliterationwrapper.hxx>
#include <acmplwrd.hxx>
#include <doc.hxx>
-#include <ndindex.hxx>
-#include <docary.hxx>
-#include <ndtxt.hxx>
-#include <pam.hxx>
#include <pagedesc.hxx>
#include <poolfmt.hxx>
#include <calbck.hxx>
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 3dd87d73c75a..246ffc1a5c8a 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -42,32 +42,19 @@
#include <UndoManager.hxx>
#include <dbmgr.hxx>
#include <hintids.hxx>
-#include <tools/globname.hxx>
-#include <svx/svxids.hrc>
#include <comphelper/random.hxx>
-#include <tools/urlobj.hxx>
-#include <tools/poly.hxx>
#include <tools/multisel.hxx>
#include <rtl/ustring.hxx>
-#include <vcl/virdev.hxx>
-#include <svl/itemiter.hxx>
#include <svl/poolitem.hxx>
#include <unotools/syslocale.hxx>
-#include <sfx2/printer.hxx>
#include <editeng/keepitem.hxx>
#include <editeng/formatbreakitem.hxx>
-#include <sfx2/linkmgr.hxx>
-#include <svx/svdmodel.hxx>
#include <editeng/pbinitem.hxx>
-#include <unotools/charclass.hxx>
#include <unotools/localedatawrapper.hxx>
-#include <vcl/timer.hxx>
#include <swatrset.hxx>
#include <swmodule.hxx>
-#include <fmtpdsc.hxx>
-#include <fmtanchr.hxx>
#include <fmtrfmrk.hxx>
#include <fmtinfmt.hxx>
#include <fmtfld.hxx>
@@ -78,49 +65,28 @@
#include <frmatr.hxx>
#include <pagefrm.hxx>
#include <rootfrm.hxx>
-#include <swtable.hxx>
#include <pam.hxx>
#include <ndtxt.hxx>
#include <swundo.hxx>
#include <UndoCore.hxx>
-#include <UndoInsert.hxx>
-#include <UndoSplitMove.hxx>
#include <UndoTable.hxx>
#include <pagedesc.hxx>
-#include <ndole.hxx>
-#include <ndgrf.hxx>
-#include <rolbck.hxx>
#include <doctxm.hxx>
-#include <grfatr.hxx>
#include <poolfmt.hxx>
-#include <mvsave.hxx>
#include <SwGrammarMarkUp.hxx>
#include <scriptinfo.hxx>
-#include <acorrect.hxx>
#include <mdiexp.hxx>
-#include <docstat.hxx>
#include <docary.hxx>
-#include <redline.hxx>
-#include <fldupde.hxx>
-#include <swbaslnk.hxx>
#include <printdata.hxx>
-#include <cmdid.h>
#include <strings.hrc>
#include <SwUndoTOXChange.hxx>
#include <unocrsr.hxx>
-#include <docsh.hxx>
-#include <viewopt.hxx>
#include <docfld.hxx>
#include <docufld.hxx>
#include <viewsh.hxx>
#include <shellres.hxx>
#include <txtfrm.hxx>
#include <attrhint.hxx>
-#include <view.hxx>
-
-#include <wdocsh.hxx>
-#include <prtopt.hxx>
-#include <wrtsh.hxx>
#include <vector>
#include <map>
@@ -128,11 +94,12 @@
#include <osl/interlck.h>
#include <vbahelper/vbaaccesshelper.hxx>
#include <calbck.hxx>
+#include <crsrsh.hxx>
/* @@@MAINTAINABILITY-HORROR@@@
Probably unwanted dependency on SwDocShell
*/
-#include <layouter.hxx>
+#include <docsh.hxx>
using namespace ::com::sun::star;
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index fed537289400..c2118fd444f2 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -22,42 +22,31 @@
#include <MarkManager.hxx>
#include <bookmrk.hxx>
-#include <cntfrm.hxx>
#include <crossrefbookmark.hxx>
+#include <crsrsh.hxx>
#include <annotationmark.hxx>
-#include <dcontact.hxx>
#include <doc.hxx>
#include <IDocumentRedlineAccess.hxx>
#include <IDocumentState.hxx>
#include <IDocumentUndoRedo.hxx>
#include <docary.hxx>
#include <xmloff/odffields.hxx>
-#include <editsh.hxx>
-#include <fmtanchr.hxx>
-#include <frmfmt.hxx>
-#include <functional>
-#include <hintids.hxx>
#include <mvsave.hxx>
#include <ndtxt.hxx>
#include <node.hxx>
#include <pam.hxx>
#include <redline.hxx>
#include <rolbck.hxx>
-#include <rtl/ustrbuf.hxx>
#include <rtl/ustring.hxx>
#include <sal/types.h>
#include <sal/log.hxx>
-#include <sortedobjs.hxx>
-#include <sfx2/linkmgr.hxx>
-#include <swserv.hxx>
-#include <swundo.hxx>
#include <UndoBookmark.hxx>
-#include <unocrsr.hxx>
-#include <viscrs.hxx>
-#include <edimp.hxx>
#include <tools/datetimeutils.hxx>
#include <view.hxx>
+#include <libxml/xmlstring.h>
+#include <libxml/xmlwriter.h>
+
using namespace ::sw::mark;
std::vector<::sw::mark::MarkBase*>::const_iterator const&
diff --git a/sw/source/core/doc/docchart.cxx b/sw/source/core/doc/docchart.cxx
index 2484c8ffe419..b602c92afd14 100644
--- a/sw/source/core/doc/docchart.cxx
+++ b/sw/source/core/doc/docchart.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <float.h>
-#include <hintids.hxx>
#include <doc.hxx>
#include <IDocumentChartDataProviderAccess.hxx>
#include <IDocumentState.hxx>
@@ -26,16 +24,10 @@
#include <docary.hxx>
#include <ndindex.hxx>
#include <swtable.hxx>
-#include <ndtxt.hxx>
-#include <calc.hxx>
-#include <cellfml.hxx>
#include <viewsh.hxx>
#include <ndole.hxx>
-#include <calbck.hxx>
-#include <cntfrm.hxx>
#include <swtblfmt.hxx>
#include <tblsel.hxx>
-#include <cellatr.hxx>
#include <unochart.hxx>
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index e730f141ec5f..534f471e9310 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -18,14 +18,7 @@
*/
#include <osl/diagnose.h>
-#include <hintids.hxx>
#include <rtl/character.hxx>
-#include <vcl/vclenum.hxx>
-#include <editeng/crossedoutitem.hxx>
-#include <editeng/colritem.hxx>
-#include <editeng/boxitem.hxx>
-#include <editeng/svxenum.hxx>
-#include <editeng/udlnitem.hxx>
#include <swmodule.hxx>
#include <doc.hxx>
#include <IDocumentUndoRedo.hxx>
diff --git a/sw/source/core/doc/doccorr.cxx b/sw/source/core/doc/doccorr.cxx
index 895d523e0403..8e2769b353e5 100644
--- a/sw/source/core/doc/doccorr.cxx
+++ b/sw/source/core/doc/doccorr.cxx
@@ -20,18 +20,12 @@
#include <doc.hxx>
#include <IDocumentLayoutAccess.hxx>
#include <node.hxx>
-#include <rootfrm.hxx>
#include <editsh.hxx>
#include <viscrs.hxx>
-#include <IMark.hxx>
-#include <bookmrk.hxx>
#include <redline.hxx>
#include <mvsave.hxx>
#include <docary.hxx>
#include <unocrsr.hxx>
-#include <swundo.hxx>
-#include <hints.hxx>
-#include <edimp.hxx>
namespace
{
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 78d864bf0195..d1cc84f8d8e3 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -19,14 +19,12 @@
#include <cmdid.h>
#include <init.hxx>
-#include <svx/svdmodel.hxx>
#include <editeng/lrspitem.hxx>
#include <editeng/ulspitem.hxx>
#include <editeng/paperinf.hxx>
#include <editeng/frmdiritem.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/dispatch.hxx>
-#include <sfx2/printer.hxx>
#include <tools/globname.hxx>
#include <sal/log.hxx>
#include <unotools/localedatawrapper.hxx>
@@ -43,18 +41,13 @@
#include <DocumentContentOperationsManager.hxx>
#include <IDocumentState.hxx>
#include <IDocumentLayoutAccess.hxx>
-#include <docary.hxx>
#include <rootfrm.hxx>
-#include <frmtool.hxx>
#include <poolfmt.hxx>
#include <docsh.hxx>
#include <ftnidx.hxx>
#include <fmtftn.hxx>
#include <txtftn.hxx>
-#include <fntcache.hxx>
-#include <viewopt.hxx>
#include <fldbas.hxx>
-#include <swwait.hxx>
#include <GetMetricVal.hxx>
#include <strings.hrc>
#include <hints.hxx>
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 2087fbbe58d8..05a4384243e7 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -17,39 +17,26 @@
*/
#include <hintids.hxx>
-#include <vcl/outdev.hxx>
-#include <sfx2/printer.hxx>
-#include <editeng/eeitem.hxx>
#include <editeng/flditem.hxx>
#include <editeng/editeng.hxx>
-#include <svx/svdoutl.hxx>
#include <editeng/colritem.hxx>
#include <svx/svdpage.hxx>
#include <svx/svdogrp.hxx>
-#include <editeng/langitem.hxx>
-#include <editeng/unolingu.hxx>
#include <editeng/measfld.hxx>
-#include <svx/svdpool.hxx>
#include <sal/log.hxx>
#include <fmtanchr.hxx>
#include <charatr.hxx>
#include <frmfmt.hxx>
#include <charfmt.hxx>
#include <viewimp.hxx>
-#include <svl/hint.hxx>
#include <doc.hxx>
#include <docfunc.hxx>
#include <IDocumentUndoRedo.hxx>
-#include <DocumentSettingManager.hxx>
-#include <IDocumentDeviceAccess.hxx>
#include <IDocumentDrawModelAccess.hxx>
#include <IDocumentState.hxx>
#include <IDocumentLayoutAccess.hxx>
#include <IDocumentStylePoolAccess.hxx>
-#include <docsh.hxx>
-#include <rootfrm.hxx>
#include <poolfmt.hxx>
-#include <viewsh.hxx>
#include <drawdoc.hxx>
#include <UndoDraw.hxx>
#include <swundo.hxx>
@@ -58,16 +45,12 @@
#include <mvsave.hxx>
#include <flyfrm.hxx>
#include <dflyobj.hxx>
-#include <svx/svdetc.hxx>
-#include <editeng/fhgtitem.hxx>
-#include <svx/svdpagv.hxx>
#include <txtfrm.hxx>
#include <editeng/frmdiritem.hxx>
#include <fmtornt.hxx>
#include <svx/svditer.hxx>
#include <vector>
-#include <calbck.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::linguistic2;
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 7161caa5ff92..7ecb764e30b5 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -19,26 +19,19 @@
#include <fmtanchr.hxx>
#include <fmtcntnt.hxx>
-#include <txtftn.hxx>
#include <acorrect.hxx>
-#include <UndoManager.hxx>
#include <IDocumentRedlineAccess.hxx>
-#include <IDocumentState.hxx>
#include <IDocumentLayoutAccess.hxx>
+#include <IDocumentUndoRedo.hxx>
#include <docsh.hxx>
#include <docary.hxx>
-#include <doctxm.hxx>
-#include <ftnidx.hxx>
#include <mdiexp.hxx>
#include <mvsave.hxx>
#include <redline.hxx>
#include <rootfrm.hxx>
#include <splargs.hxx>
+#include <swcrsr.hxx>
#include <txtfrm.hxx>
-#include <breakit.hxx>
-#include <editsh.hxx>
-#include <fmtfld.hxx>
-#include <docufld.hxx>
#include <unoflatpara.hxx>
#include <SwGrammarMarkUp.hxx>
#include <docedt.hxx>
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 1032f43ab260..6f2017177538 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -21,15 +21,9 @@
#include <hintids.hxx>
-#include <string.h>
-#include <float.h>
#include <comphelper/string.hxx>
-#include <tools/datetime.hxx>
-#include <vcl/svapp.hxx>
#include <unotools/charclass.hxx>
-#include <unotools/transliterationwrapper.hxx>
#include <doc.hxx>
-#include <IDocumentUndoRedo.hxx>
#include <IDocumentFieldsAccess.hxx>
#include <IDocumentState.hxx>
#include <IDocumentLayoutAccess.hxx>
@@ -42,27 +36,20 @@
#include <calc.hxx>
#include <txtfld.hxx>
#include <fmtfld.hxx>
-#include <tox.hxx>
#include <txttxmrk.hxx>
#include <docfld.hxx>
#include <docufld.hxx>
-#include <ddefld.hxx>
#include <usrfld.hxx>
#include <expfld.hxx>
#include <dbfld.hxx>
-#include <flddat.hxx>
-#include <chpfld.hxx>
#include <reffld.hxx>
-#include <flddropdown.hxx>
#include <dbmgr.hxx>
#include <section.hxx>
-#include <cellatr.hxx>
#include <docary.hxx>
#include <authfld.hxx>
#include <txtinet.hxx>
#include <fmtcntnt.hxx>
-#include <SwUndoField.hxx>
#include <calbck.hxx>
using namespace ::com::sun::star::uno;
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index f67d05b572a5..4451115905a8 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -20,13 +20,9 @@
#include <hintids.hxx>
#include <svl/itemiter.hxx>
#include <svx/svdobj.hxx>
-#include <svx/svdpage.hxx>
-#include <svx/svdmodel.hxx>
-#include <svx/svdocapt.hxx>
#include <svx/svdmark.hxx>
#include <fmtfsize.hxx>
#include <fmtornt.hxx>
-#include <fmtsrnd.hxx>
#include <dcontact.hxx>
#include <ndgrf.hxx>
#include <doc.hxx>
@@ -39,21 +35,18 @@
#include <drawdoc.hxx>
#include <fmtcntnt.hxx>
#include <fmtanchr.hxx>
-#include <txtflcnt.hxx>
#include <fmtflcnt.hxx>
#include <txtfrm.hxx>
#include <notxtfrm.hxx>
#include <pagefrm.hxx>
#include <rootfrm.hxx>
-#include <flyfrms.hxx>
+#include <flyfrm.hxx>
#include <textboxhelper.hxx>
-#include <frmtool.hxx>
+#include <txatbase.hxx>
#include <frmfmt.hxx>
#include <ndtxt.hxx>
#include <pam.hxx>
-#include <tblsel.hxx>
#include <swundo.hxx>
-#include <swtable.hxx>
#include <crstate.hxx>
#include <UndoCore.hxx>
#include <UndoAttribute.hxx>
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index d3fd405f6dd2..6b92ee74e9ac 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -20,15 +20,11 @@
#include <libxml/xmlwriter.h>
#include <hintids.hxx>
#include <svl/itemiter.hxx>
-#include <sfx2/app.hxx>
#include <editeng/tstpitem.hxx>
-#include <editeng/eeitem.hxx>
-#include <editeng/langitem.hxx>
#include <editeng/lrspitem.hxx>
#include <editeng/formatbreakitem.hxx>
#include <editeng/rsiditem.hxx>
#include <editeng/colritem.hxx>
-#include <svl/whiter.hxx>
#include <svl/zforlist.hxx>
#include <comphelper/doublecheckedinit.hxx>
#include <comphelper/processfactory.hxx>
@@ -40,7 +36,6 @@
#include <fmtpdsc.hxx>
#include <fmthdft.hxx>
#include <fmtcntnt.hxx>
-#include <frmatr.hxx>
#include <doc.hxx>
#include <docfunc.hxx>
#include <drawdoc.hxx>
@@ -53,7 +48,6 @@
#include <IDocumentLayoutAccess.hxx>
#include <IDocumentStylePoolAccess.hxx>
#include <rootfrm.hxx>
-#include <pagefrm.hxx>
#include <txtfrm.hxx>
#include <hints.hxx>
#include <ndtxt.hxx>
@@ -61,27 +55,20 @@
#include <UndoCore.hxx>
#include <UndoAttribute.hxx>
#include <UndoInsert.hxx>
-#include <ndgrf.hxx>
#include <pagedesc.hxx>
#include <rolbck.hxx>
#include <mvsave.hxx>
#include <txatbase.hxx>
-#include <swtable.hxx>
#include <swtblfmt.hxx>
#include <charfmt.hxx>
#include <docary.hxx>
#include <paratr.hxx>
#include <redline.hxx>
#include <reffld.hxx>
-#include <txtinet.hxx>
#include <fmtinfmt.hxx>
#include <breakit.hxx>
-#include <SwStyleNameMapper.hxx>
-#include <fmtautofmt.hxx>
-#include <istyleaccess.hxx>
#include <SwUndoFmt.hxx>
#include <UndoManager.hxx>
-#include <docsh.hxx>
#include <swmodule.hxx>
#include <modcfg.hxx>
#include <memory>
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx
index 0d37bfc0d2c0..f467449d5c0f 100644
--- a/sw/source/core/doc/docglbl.cxx
+++ b/sw/source/core/doc/docglbl.cxx
@@ -18,12 +18,9 @@
*/
#include <osl/diagnose.h>
-#include <hintids.hxx>
#include <unotools/tempfile.hxx>
-#include <svl/urihelper.hxx>
#include <svl/stritem.hxx>
#include <svl/eitem.hxx>
-#include <sfx2/app.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/docfilt.hxx>
#include <sfx2/fcontnr.hxx>
@@ -31,6 +28,7 @@
#include <sfx2/request.hxx>
#include <sfx2/sfxsids.hrc>
#include <sfx2/viewfrm.hxx>
+#include <tools/datetime.hxx>
#include <fmtinfmt.hxx>
#include <fmtanchr.hxx>
#include <doc.hxx>
@@ -43,12 +41,7 @@
#include <pam.hxx>
#include <ndtxt.hxx>
#include <docsh.hxx>
-#include <globdoc.hxx>
-#include <shellio.hxx>
-#include <swundo.hxx>
#include <section.hxx>
-#include <doctxm.hxx>
-#include <poolfmt.hxx>
#include <calbck.hxx>
#include <iodetect.hxx>
#include <memory>
diff --git a/sw/source/core/doc/docglos.cxx b/sw/source/core/doc/docglos.cxx
index 8cd47c0e7c3c..56e8533f24f2 100644
--- a/sw/source/core/doc/docglos.cxx
+++ b/sw/source/core/doc/docglos.cxx
@@ -25,12 +25,12 @@
#include <osl/diagnose.h>
#include <doc.hxx>
+#include <IDocumentContentOperations.hxx>
#include <IDocumentUndoRedo.hxx>
#include <IDocumentFieldsAccess.hxx>
#include <shellio.hxx>
#include <pam.hxx>
#include <swundo.hxx>
-#include <ndtxt.hxx>
#include <acorrect.hxx>
#include <crsrsh.hxx>
#include <docsh.hxx>
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 2ab4759ec70b..de177655f7dd 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -17,13 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <unotools/linguprops.hxx>
-#include <unotools/lingucfg.hxx>
#include <hintids.hxx>
#include <sot/exchange.hxx>
-#include <sfx2/progress.hxx>
-#include <svx/svdmodel.hxx>
-#include <svx/svdogrp.hxx>
#include <svx/svdpage.hxx>
#include <editeng/keepitem.hxx>
#include <editeng/ulspitem.hxx>
@@ -32,14 +27,12 @@
#include <editeng/shaditem.hxx>
#include <editeng/protitem.hxx>
#include <editeng/opaqitem.hxx>
-#include <editeng/prntitem.hxx>
-#include <svx/fmglob.hxx>
#include <svx/svdouno.hxx>
-#include <svx/fmpage.hxx>
#include <editeng/frmdiritem.hxx>
#include <swmodule.hxx>
#include <modcfg.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <SwStyleNameMapper.hxx>
#include <drawdoc.hxx>
#include <fchrfmt.hxx>
@@ -52,10 +45,7 @@
#include <fmtfsize.hxx>
#include <fmtsrnd.hxx>
#include <fmtflcnt.hxx>
-#include <fmtcnct.hxx>
#include <frmfmt.hxx>
-#include <txtflcnt.hxx>
-#include <docfld.hxx>
#include <pam.hxx>
#include <ndtxt.hxx>
#include <ndnotxt.hxx>
@@ -65,7 +55,6 @@
#include <IDocumentRedlineAccess.hxx>
#include <DocumentSettingManager.hxx>
#include <IDocumentDrawModelAccess.hxx>
-#include <DocumentContentOperationsManager.hxx>
#include <IDocumentFieldsAccess.hxx>
#include <IDocumentState.hxx>
#include <IDocumentLayoutAccess.hxx>
@@ -76,8 +65,6 @@
#include <txtfrm.hxx>
#include <notxtfrm.hxx>
#include <flyfrm.hxx>
-#include <fesh.hxx>
-#include <docsh.hxx>
#include <dflyobj.hxx>
#include <dcontact.hxx>
#include <swundo.hxx>
@@ -88,18 +75,13 @@
#include <docary.hxx>
#include <swtable.hxx>
#include <tblsel.hxx>
-#include <viewopt.hxx>
-#include <fldupde.hxx>
#include <txtftn.hxx>
#include <ftnidx.hxx>
#include <ftninfo.hxx>
#include <pagedesc.hxx>
-#include <PostItMgr.hxx>
#include <strings.hrc>
#include <tools/datetimeutils.hxx>
-#include <unoframe.hxx>
-
#include <sortedobjs.hxx>
#include <vector>
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 828913313a52..73a39fd9f1f9 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -22,27 +22,17 @@
#include <unordered_set>
#include <doc.hxx>
-#include <dcontact.hxx>
#include <proofreadingiterator.hxx>
#include <com/sun/star/text/XFlatParagraphIteratorProvider.hpp>
#include <com/sun/star/linguistic2/XProofreadingIterator.hpp>
#include <comphelper/processfactory.hxx>
#include <comphelper/random.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/virdev.hxx>
-#include <sfx2/printer.hxx>
-#include <sfx2/docfile.hxx>
-#include <sfx2/frame.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/XmlIdRegistry.hxx>
#include <sal/log.hxx>
-#include <svl/macitem.hxx>
-#include <svx/svxids.hrc>
-#include <svx/svdogrp.hxx>
#include <sfx2/linkmgr.hxx>
-#include <editeng/forbiddencharacterstable.hxx>
#include <editeng/ulspitem.hxx>
#include <editeng/lrspitem.hxx>
#include <svl/zforlist.hxx>
@@ -55,17 +45,12 @@
#include <fmtpdsc.hxx>
#include <pvprtdat.hxx>
#include <rootfrm.hxx>
-#include <layouter.hxx>
#include <pagedesc.hxx>
#include <ndtxt.hxx>
-#include <printdata.hxx>
-#include <docfld.hxx>
#include <ftninfo.hxx>
#include <ftnidx.hxx>
-#include <docstat.hxx>
#include <charfmt.hxx>
#include <frmfmt.hxx>
-#include <rolbck.hxx>
#include <poolfmt.hxx>
#include <dbmgr.hxx>
#include <docsh.hxx>
@@ -74,20 +59,16 @@
#include <docary.hxx>
#include <lineinfo.hxx>
#include <drawdoc.hxx>
-#include <linkenum.hxx>
-#include <fldupde.hxx>
#include <extinput.hxx>
#include <viewsh.hxx>
#include <doctxm.hxx>
#include <shellres.hxx>
-#include <breakit.hxx>
#include <laycache.hxx>
#include <mvsave.hxx>
#include <istyleaccess.hxx>
#include "swstylemanager.hxx"
#include <IGrammarContact.hxx>
#include <tblafmt.hxx>
-#include <tblsel.hxx>
#include <MarkManager.hxx>
#include <UndoManager.hxx>
#include <DocumentDeviceManager.hxx>
@@ -107,17 +88,11 @@
#include <DocumentLayoutManager.hxx>
#include <DocumentStylePoolManager.hxx>
#include <DocumentExternalDataManager.hxx>
-#include <unochart.hxx>
-#include <fldbas.hxx>
#include <wrtsh.hxx>
#include <unocrsr.hxx>
#include <fmthdft.hxx>
-#include <cmdid.h>
-
-#include <pausethreadstarting.hxx>
#include <numrule.hxx>
-#include <list.hxx>
#include <sfx2/Metadatable.hxx>
#include <fmtmeta.hxx>
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 8138a5197bdd..a27d0a87122e 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -24,14 +24,11 @@
#include <doc.hxx>
#include <IDocumentUndoRedo.hxx>
#include <IDocumentListsAccess.hxx>
-#include <DocumentRedlineManager.hxx>
#include <IDocumentFieldsAccess.hxx>
#include <IDocumentState.hxx>
#include <IDocumentStylePoolAccess.hxx>
#include <pam.hxx>
-#include <unocrsr.hxx>
#include <ndtxt.hxx>
-#include <doctxm.hxx>
#include <poolfmt.hxx>
#include <UndoCore.hxx>
#include <UndoRedline.hxx>
@@ -44,13 +41,8 @@
#include <mvsave.hxx>
#include <txtfrm.hxx>
#include <rootfrm.hxx>
-#include <pamtyp.hxx>
#include <redline.hxx>
#include <strings.hrc>
-#include <editeng/adjustitem.hxx>
-#include <editeng/frmdiritem.hxx>
-#include <frmatr.hxx>
-#include <SwStyleNameMapper.hxx>
#include <SwNodeNum.hxx>
#include <list.hxx>
#include <calbck.hxx>
@@ -58,7 +50,6 @@
#include <comphelper/random.hxx>
#include <tools/datetimeutils.hxx>
-#include <cstdlib>
#include <map>
#include <stdlib.h>
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 7c68046324a7..e101bdc65b9e 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -24,10 +24,6 @@
#include <tools/datetimeutils.hxx>
#include <hintids.hxx>
#include <svl/itemiter.hxx>
-#include <sfx2/app.hxx>
-#include <editeng/colritem.hxx>
-#include <editeng/udlnitem.hxx>
-#include <editeng/crossedoutitem.hxx>
#include <comphelper/lok.hxx>
#include <comphelper/string.hxx>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
@@ -45,9 +41,7 @@
#include <docary.hxx>
#include <ndtxt.hxx>
#include <redline.hxx>
-#include <swundo.hxx>
#include <UndoCore.hxx>
-#include <UndoRedline.hxx>
#include <hints.hxx>
#include <pamtyp.hxx>
#include <poolfmt.hxx>
@@ -56,7 +50,6 @@
#include <viscrs.hxx>
#include <rootfrm.hxx>
#include <strings.hrc>
-#include <unoport.hxx>
#include <wrtsh.hxx>
#include <txtfld.hxx>
diff --git a/sw/source/core/doc/docruby.cxx b/sw/source/core/doc/docruby.cxx
index 8eff14a5531e..f333782a5df7 100644
--- a/sw/source/core/doc/docruby.cxx
+++ b/sw/source/core/doc/docruby.cxx
@@ -30,8 +30,6 @@
#include <doc.hxx>
#include <IDocumentUndoRedo.hxx>
#include <IDocumentContentOperations.hxx>
-#include <docary.hxx>
-#include <mvsave.hxx>
#include <ndtxt.hxx>
#include <txatbase.hxx>
#include <rubylist.hxx>
diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx
index 20e956187aed..291e734dc747 100644
--- a/sw/source/core/doc/docsort.cxx
+++ b/sw/source/core/doc/docsort.cxx
@@ -18,12 +18,10 @@
*/
#include <hintids.hxx>
-#include <rtl/math.hxx>
#include <osl/diagnose.h>
#include <unotools/collatorwrapper.hxx>
#include <unotools/localedatawrapper.hxx>
#include <comphelper/processfactory.hxx>
-#include <editeng/unolingu.hxx>
#include <docary.hxx>
#include <fmtanchr.hxx>
#include <frmfmt.hxx>
@@ -45,7 +43,6 @@
#include <cellatr.hxx>
#include <redline.hxx>
#include <node2lay.hxx>
-#include <unochart.hxx>
#include <set>
#include <utility>
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 7653ea4543a8..d429af8bdf89 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -19,18 +19,12 @@
#include <limits.h>
#include <hintids.hxx>
-#include <editeng/langitem.hxx>
#include <editeng/formatbreakitem.hxx>
-#include <editeng/tstpitem.hxx>
-#include <editeng/lrspitem.hxx>
#include <comphelper/classids.hxx>
#include <docsh.hxx>
#include <ndole.hxx>
#include <txttxmrk.hxx>
-#include <fmtinfmt.hxx>
#include <fmtpdsc.hxx>
-#include <frmfmt.hxx>
-#include <fmtfsize.hxx>
#include <frmatr.hxx>
#include <pagedesc.hxx>
#include <doc.hxx>
@@ -61,12 +55,10 @@
#include <fmtfld.hxx>
#include <txtfld.hxx>
#include <expfld.hxx>
-#include <chpfld.hxx>
#include <mvsave.hxx>
#include <node2lay.hxx>
#include <SwStyleNameMapper.hxx>
#include <breakit.hxx>
-#include <editsh.hxx>
#include <scriptinfo.hxx>
#include <calbck.hxx>
#include <ToxTextGenerator.hxx>
diff --git a/sw/source/core/doc/docxforms.cxx b/sw/source/core/doc/docxforms.cxx
index 950683ed914c..ea827d58d9ad 100644
--- a/sw/source/core/doc/docxforms.cxx
+++ b/sw/source/core/doc/docxforms.cxx
@@ -26,7 +26,7 @@
#include <com/sun/star/xforms/XFormsUIHelper1.hpp>
#include <com/sun/star/xforms/XForms.hpp>
#include <comphelper/processfactory.hxx>
-#include <tools/diagnose_ex.h>
+#include <osl/diagnose.h>
#include <com/sun/star/container/XIndexAccess.hpp>
using namespace ::com::sun::star;
diff --git a/sw/source/core/doc/extinput.cxx b/sw/source/core/doc/extinput.cxx
index 8a34a9011bf9..e9076064a745 100644
--- a/sw/source/core/doc/extinput.cxx
+++ b/sw/source/core/doc/extinput.cxx
@@ -22,9 +22,8 @@
#include <com/sun/star/i18n/ScriptType.hpp>
#include <editeng/langitem.hxx>
-#include <editeng/scripttypeitem.hxx>
-
-#include <vcl/keycodes.hxx>
+#include <osl/diagnose.h>
+#include <svl/languageoptions.hxx>
#include <vcl/commandevent.hxx>
#include <hintids.hxx>
@@ -33,7 +32,6 @@
#include <IDocumentUndoRedo.hxx>
#include <index.hxx>
#include <ndtxt.hxx>
-#include <txtfrm.hxx>
#include <swundo.hxx>
using namespace ::com::sun::star;
diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx
index 679e9ff2c768..e28ca618fc45 100644
--- a/sw/source/core/doc/fmtcol.cxx
+++ b/sw/source/core/doc/fmtcol.cxx
@@ -30,7 +30,6 @@
#include <fmtcol.hxx>
#include <fmtcolfunc.hxx>
#include <hints.hxx>
-#include <calc.hxx>
#include <node.hxx>
#include <numrule.hxx>
#include <paratr.hxx>
diff --git a/sw/source/core/doc/gctable.cxx b/sw/source/core/doc/gctable.cxx
index 964ad42c05c8..493ef4248c91 100644
--- a/sw/source/core/doc/gctable.cxx
+++ b/sw/source/core/doc/gctable.cxx
@@ -19,7 +19,6 @@
#include <hintids.hxx>
#include <tblrwcl.hxx>
-#include <swtblfmt.hxx>
#include <algorithm>
#include <editeng/borderline.hxx>
#include <editeng/boxitem.hxx>
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index 5737e82cde0a..2873c98161e5 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -22,27 +22,21 @@
#include <algorithm>
#include <memory>
-#include <hintids.hxx>
-#include <vcl/svapp.hxx>
-#include <sot/storage.hxx>
#include <fmtornt.hxx>
#include <fmtfsize.hxx>
#include <frmfmt.hxx>
-#include <docary.hxx>
#include <ndtxt.hxx>
#include <doc.hxx>
#include <IDocumentLayoutAccess.hxx>
#include <swtable.hxx>
#include <rootfrm.hxx>
-#include <docsh.hxx>
#include <flyfrm.hxx>
#include <poolfmt.hxx>
#include <viewsh.hxx>
#include <tabfrm.hxx>
#include <viewopt.hxx>
#include <htmltbl.hxx>
-#include <ndindex.hxx>
#include <calbck.hxx>
#include <o3tl/numeric.hxx>
#ifdef DBG_UTIL
diff --git a/sw/source/core/doc/lineinfo.cxx b/sw/source/core/doc/lineinfo.cxx
index 3774fa3f7604..6856401a73fb 100644
--- a/sw/source/core/doc/lineinfo.cxx
+++ b/sw/source/core/doc/lineinfo.cxx
@@ -25,7 +25,6 @@
#include <charfmt.hxx>
#include <poolfmt.hxx>
#include <rootfrm.hxx>
-#include <viewsh.hxx>
#include <set>
void SwDoc::SetLineNumberInfo( const SwLineNumberInfo &rNew )
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index a8ddd5849078..536d7f193747 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -19,20 +19,14 @@
#include <hintids.hxx>
#include <tools/urlobj.hxx>
-#include <vcl/print.hxx>
-#include <vcl/virdev.hxx>
-#include <vcl/svapp.hxx>
#include <vcl/imapobj.hxx>
#include <vcl/imap.hxx>
#include <svl/urihelper.hxx>
-#include <svtools/soerr.hxx>
#include <sfx2/progress.hxx>
-#include <sfx2/docfile.hxx>
#include <sfx2/printer.hxx>
#include <editeng/udlnitem.hxx>
#include <editeng/colritem.hxx>
#include <editeng/boxitem.hxx>
-#include <svx/xoutbmp.hxx>
#include <fmturl.hxx>
#include <fmtsrnd.hxx>
#include <frmfmt.hxx>
@@ -56,14 +50,12 @@
#include <notxtfrm.hxx>
#include <grfatr.hxx>
#include <charatr.hxx>
-#include <fmtornt.hxx>
#include <ndnotxt.hxx>
#include <ndgrf.hxx>
#include <ndole.hxx>
#include <swregion.hxx>
#include <poolfmt.hxx>
#include <mdiexp.hxx>
-#include <swwait.hxx>
#include <strings.hrc>
#include <accessibilityoptions.hxx>
#include <com/sun/star/embed/EmbedMisc.hpp>
@@ -78,8 +70,6 @@
#include <basegfx/utils/b2dclipstate.hxx>
#include <drawinglayer/processor2d/processor2dtools.hxx>
#include <txtfly.hxx>
-#include <vcl/graphicfilter.hxx>
-#include <vcl/pdfextoutdevdata.hxx>
#include <drawinglayer/primitive2d/maskprimitive2d.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <drawinglayer/primitive2d/objectinfoprimitive2d.hxx>
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 17bcd6ab9519..e1a5af928d68 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -22,18 +22,13 @@
#include <vcl/font.hxx>
#include <editeng/brushitem.hxx>
-#include <editeng/lrspitem.hxx>
#include <editeng/numitem.hxx>
#include <svl/grabbagitem.hxx>
#include <fmtornt.hxx>
#include <doc.hxx>
-#include <pam.hxx>
#include <charfmt.hxx>
-#include <paratr.hxx>
-#include <frmfmt.hxx>
#include <ndtxt.hxx>
#include <docary.hxx>
-#include <docsh.hxx>
#include <SwStyleNameMapper.hxx>
// Needed to load default bullet list configuration
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 25e14f832019..be521cfdccd7 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -17,59 +17,21 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <memory>
#include <hintids.hxx>
#include <i18nlangtag/mslangid.hxx>
-#include <unotools/localedatawrapper.hxx>
-#include <editeng/paperinf.hxx>
-#include <editeng/wghtitem.hxx>
-#include <editeng/fontitem.hxx>
-#include <editeng/fhgtitem.hxx>
-#include <editeng/tstpitem.hxx>
-#include <editeng/lrspitem.hxx>
-#include <editeng/ulspitem.hxx>
-#include <editeng/lspcitem.hxx>
-#include <editeng/adjustitem.hxx>
-#include <editeng/postitem.hxx>
-#include <editeng/keepitem.hxx>
-#include <editeng/opaqitem.hxx>
#include <editeng/boxitem.hxx>
-#include <editeng/cmapitem.hxx>
-#include <editeng/udlnitem.hxx>
-#include <editeng/colritem.hxx>
-#include <editeng/protitem.hxx>
-#include <editeng/escapementitem.hxx>
-#include <editeng/langitem.hxx>
-#include <editeng/charrotateitem.hxx>
#include <editeng/frmdiritem.hxx>
-#include <editeng/emphasismarkitem.hxx>
-#include <editeng/scriptspaceitem.hxx>
-#include <viewopt.hxx>
+#include <osl/diagnose.h>
#include <doc.hxx>
-#include <IDocumentUndoRedo.hxx>
-#include <DocumentSettingManager.hxx>
#include <IDocumentState.hxx>
#include <IDocumentStylePoolAccess.hxx>
-#include <fmtanchr.hxx>
-#include <fmtornt.hxx>
-#include <fmtsrnd.hxx>
-#include <fmtfsize.hxx>
#include <poolfmt.hxx>
-#include <paratr.hxx>
#include <pagedesc.hxx>
-#include <frmtool.hxx>
-#include <charfmt.hxx>
-#include <docary.hxx>
#include <fmtcol.hxx>
-#include <ndtxt.hxx>
-#include <fmtline.hxx>
-#include <GetMetricVal.hxx>
#include <numrule.hxx>
#include <swtable.hxx>
#include <tblafmt.hxx>
#include <hints.hxx>
-#include <svx/xdef.hxx>
-#include <svx/xfillit0.hxx>
using namespace ::editeng;
using namespace ::com::sun::star;
diff --git a/sw/source/core/doc/swserv.cxx b/sw/source/core/doc/swserv.cxx
index c78b5883c18c..476c03dc85b0 100644
--- a/sw/source/core/doc/swserv.cxx
+++ b/sw/source/core/doc/swserv.cxx
@@ -17,14 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <sot/storage.hxx>
#include <sot/exchange.hxx>
#include <sfx2/linkmgr.hxx>
#include <com/sun/star/uno/Sequence.h>
#include <doc.hxx>
#include <IDocumentLinksAdministration.hxx>
#include <IDocumentLayoutAccess.hxx>
-#include <swtypes.hxx>
#include <swserv.hxx>
#include <swbaslnk.hxx>
#include <mvsave.hxx>
@@ -32,7 +30,6 @@
#include <bookmrk.hxx>
#include <pam.hxx>
#include <shellio.hxx>
-#include <swerror.h>
using namespace ::com::sun::star;
diff --git a/sw/source/core/doc/swstylemanager.cxx
b/sw/source/core/doc/swstylemanager.cxx
index 22a3e99da1ea..abb217bcf80b 100644
--- a/sw/source/core/doc/swstylemanager.cxx
+++ b/sw/source/core/doc/swstylemanager.cxx
@@ -19,10 +19,6 @@
#include "swstylemanager.hxx"
#include <svl/stylepool.hxx>
-#include <doc.hxx>
-#include <charfmt.hxx>
-#include <docary.hxx>
-#include <swtypes.hxx>
#include <istyleaccess.hxx>
#include <unordered_map>
#include <osl/diagnose.h>
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 53f1e006900a..1954bc3bc163 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -19,14 +19,11 @@
#include <comphelper/fileformat.h>
#include <tools/stream.hxx>
-#include <vcl/svapp.hxx>
#include <sfx2/docfile.hxx>
-#include <svl/urihelper.hxx>
#include <svl/zforlist.hxx>
#include <svl/zformat.hxx>
#include <unotools/configmgr.hxx>
#include <unotools/pathoptions.hxx>
-#include <sfx2/app.hxx>
#include <swtable.hxx>
#include <swtblfmt.hxx>
#include <com/sun/star/text/VertOrientation.hpp>
@@ -43,8 +40,8 @@
#include <fmtrowsplt.hxx>
#include <sal/log.hxx>
#include <osl/diagnose.h>
+#include <osl/thread.h>
-#include <svl/legacyitem.hxx>
#include <editeng/adjustitem.hxx>
#include <editeng/boxitem.hxx>
#include <editeng/brushitem.hxx>
@@ -61,7 +58,6 @@
#include <editeng/udlnitem.hxx>
#include <editeng/wghtitem.hxx>
#include <svx/algitem.hxx>
-#include <svx/legacyitem.hxx>
#include <svx/rotmodit.hxx>
#include <legacyitem.hxx>
diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx
index 4975217f16e1..e03bddf51f66 100644
--- a/sw/source/core/doc/tblcpy.cxx
+++ b/sw/source/core/doc/tblcpy.cxx
@@ -19,6 +19,7 @@
#include <hintids.hxx>
+#include <osl/diagnose.h>
#include <svl/zforlist.hxx>
#include <frmfmt.hxx>
#include <doc.hxx>
@@ -28,13 +29,10 @@
#include <IDocumentFieldsAccess.hxx>
#include <IDocumentLayoutAccess.hxx>
#include <IDocumentStylePoolAccess.hxx>
-#include <cntfrm.hxx>
#include <pam.hxx>
#include <swtable.hxx>
#include <ndtxt.hxx>
-#include <fldbas.hxx>
#include <tblsel.hxx>
-#include <tabfrm.hxx>
#include <poolfmt.hxx>
#include <cellatr.hxx>
#include <mvsave.hxx>
@@ -42,7 +40,6 @@
#include <fmtanchr.hxx>
#include <hints.hxx>
#include <UndoTable.hxx>
-#include <redline.hxx>
#include <fmtfsize.hxx>
#include <deque>
#include <memory>
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 30dbf907a327..1c295d097a6a 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -21,9 +21,7 @@
#include <com/sun/star/text/HoriOrientation.hpp>
#include <hintids.hxx>
-#include <editeng/brushitem.hxx>
#include <editeng/lrspitem.hxx>
-#include <editeng/protitem.hxx>
#include <editeng/boxitem.hxx>
#include <tools/fract.hxx>
#include <fmtfsize.hxx>
@@ -35,7 +33,6 @@
#include <IDocumentRedlineAccess.hxx>
#include <IDocumentStylePoolAccess.hxx>
#include <IDocumentFieldsAccess.hxx>
-#include <cntfrm.hxx>
#include <docsh.hxx>
#include <fesh.hxx>
#include <tabfrm.hxx>
@@ -43,11 +40,8 @@
#include <frmtool.hxx>
#include <pam.hxx>
#include <swtable.hxx>
-#include <ndtxt.hxx>
-#include <tblafmt.hxx>
#include <tblsel.hxx>
#include <fldbas.hxx>
-#include <swundo.hxx>
#include <rowfrm.hxx>
#include <ddefld.hxx>
#include <hints.hxx>
diff --git a/sw/source/core/docnode/ndnotxt.cxx
b/sw/source/core/docnode/ndnotxt.cxx
index 8ba28c5ab868..6be756061b6d 100644
--- a/sw/source/core/docnode/ndnotxt.cxx
+++ b/sw/source/core/docnode/ndnotxt.cxx
@@ -19,18 +19,15 @@
#include <hintids.hxx>
#include <tools/poly.hxx>
-#include <tools/fract.hxx>
#include <svl/stritem.hxx>
#include <svx/contdlg.hxx>
#include <vcl/svapp.hxx>
-#include <docary.hxx>
#include <doc.hxx>
#include <fmtcol.hxx>
#include <ndnotxt.hxx>
#include <ndgrf.hxx>
#include <ndole.hxx>
#include <ndindex.hxx>
-#include <hints.hxx>
#include <istyleaccess.hxx>
#include <SwStyleNameMapper.hxx>
diff --git a/sw/source/core/docnode/ndnum.cxx b/sw/source/core/docnode/ndnum.cxx
index c343e022ec2f..1e8e75256a04 100644
--- a/sw/source/core/docnode/ndnum.cxx
+++ b/sw/source/core/docnode/ndnum.cxx
@@ -20,10 +20,8 @@
#include <node.hxx>
#include <doc.hxx>
#include <IDocumentFieldsAccess.hxx>
-#include <pam.hxx>
#include <ndtxt.hxx>
#include <fldbas.hxx>
-#include <docary.hxx>
#include <osl/diagnose.h>
bool CompareSwOutlineNodes::operator()( SwNode* const& lhs, SwNode* const&
rhs) const
diff --git a/sw/source/core/docnode/ndsect.cxx
b/sw/source/core/docnode/ndsect.cxx
index bf6fe8b71e31..8655874fe858 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -22,9 +22,7 @@
#include <svl/itemiter.hxx>
#include <sal/log.hxx>
#include <fmtcntnt.hxx>
-#include <fmtanchr.hxx>
#include <txtftn.hxx>
-#include <fmtclds.hxx>
#include <doc.hxx>
#include <IDocumentUndoRedo.hxx>
#include <IDocumentLinksAdministration.hxx>
@@ -47,7 +45,6 @@
#include <docary.hxx>
#include <redline.hxx>
#include <sectfrm.hxx>
-#include <pagefrm.hxx>
#include <cntfrm.hxx>
#include <node2lay.hxx>
#include <doctxm.hxx>
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 48d9eab2e1b9..8a6cc42617d6 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -21,7 +21,6 @@
#include <fesh.hxx>
#include <hintids.hxx>
#include <editeng/lrspitem.hxx>
-#include <editeng/formatbreakitem.hxx>
#include <editeng/protitem.hxx>
#include <editeng/boxitem.hxx>
#include <svl/stritem.hxx>
@@ -33,7 +32,6 @@
#include <fmtanchr.hxx>
#include <fmtlsplt.hxx>
#include <frmatr.hxx>
-#include <charatr.hxx>
#include <cellfrm.hxx>
#include <pagefrm.hxx>
#include <tabcol.hxx>
@@ -50,11 +48,9 @@
#include <cntfrm.hxx>
#include <pam.hxx>
#include <swcrsr.hxx>
-#include <viscrs.hxx>
#include <swtable.hxx>
#include <swundo.hxx>
#include <tblsel.hxx>
-#include <fldbas.hxx>
#include <poolfmt.hxx>
#include <tabfrm.hxx>
#include <UndoCore.hxx>
@@ -64,8 +60,6 @@
#include <UndoTable.hxx>
#include <hints.hxx>
#include <tblafmt.hxx>
-#include <swcache.hxx>
-#include <ddefld.hxx>
#include <frminf.hxx>
#include <cellatr.hxx>
#include <swtblfmt.hxx>
@@ -77,7 +71,6 @@
#include <tblrwcl.hxx>
#include <editsh.hxx>
#include <txtfrm.hxx>
-#include <ftnfrm.hxx>
#include <section.hxx>
#include <frmtool.hxx>
#include <node2lay.hxx>
diff --git a/sw/source/core/docnode/ndtbl1.cxx
b/sw/source/core/docnode/ndtbl1.cxx
index e330c56466ee..e1b1c14159bd 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -18,14 +18,12 @@
*/
#include <hintids.hxx>
-#include <editeng/lrspitem.hxx>
#include <editeng/boxitem.hxx>
#include <editeng/brushitem.hxx>
#include <editeng/frmdiritem.hxx>
#include <fesh.hxx>
#include <fmtornt.hxx>
#include <fmtfsize.hxx>
-#include <fmtlsplt.hxx>
#include <fmtrowsplt.hxx>
#include <tabcol.hxx>
#include <frmatr.hxx>
@@ -45,7 +43,6 @@
#include <htmltbl.hxx>
#include <tblsel.hxx>
#include <swtblfmt.hxx>
-#include <docary.hxx>
#include <ndindex.hxx>
#include <undobj.hxx>
#include <calbck.hxx>
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 3256f12c617a..7ecaa5138b4c 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -18,7 +18,6 @@
*/
#include <hintids.hxx>
-#include <editeng/frmdiritem.hxx>
#include <editeng/protitem.hxx>
#include <tools/gen.hxx>
#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
@@ -69,7 +68,6 @@
#include <memory>
#include <swcrsr.hxx>
#include <hints.hxx>
-#include <svl/itemiter.hxx>
using namespace ::com::sun::star::i18n;
diff --git a/sw/source/core/docnode/node2lay.cxx
b/sw/source/core/docnode/node2lay.cxx
index f72efbc17003..d9ec3aa1727f 100644
--- a/sw/source/core/docnode/node2lay.cxx
+++ b/sw/source/core/docnode/node2lay.cxx
@@ -23,7 +23,6 @@
#include <swtable.hxx>
#include <ftnfrm.hxx>
#include <sectfrm.hxx>
-#include <frmfmt.hxx>
#include <cntfrm.hxx>
#include <tabfrm.hxx>
#include <frmtool.hxx>
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index f73be41d8ad2..2feef62276df 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -20,6 +20,7 @@
#include <stdlib.h>
#include <libxml/xmlwriter.h>
+#include <osl/diagnose.h>
#include <node.hxx>
#include <doc.hxx>
@@ -29,16 +30,13 @@
#include <pam.hxx>
#include <txtfld.hxx>
#include <fmtfld.hxx>
-#include <hints.hxx>
#include <numrule.hxx>
#include <ndtxt.hxx>
#include <ndnotxt.hxx>
#include <swtable.hxx>
-#include <tblsel.hxx>
#include <section.hxx>
#include <ddefld.hxx>
#include <swddetbl.hxx>
-#include <frame.hxx>
#include <txtatr.hxx>
#include <tox.hxx>
#include <fmtrfmrk.hxx>
diff --git a/sw/source/core/docnode/section.cxx
b/sw/source/core/docnode/section.cxx
index 7aff426c62cd..76dad3f7ffb1 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -22,15 +22,11 @@
#include <stdlib.h>
#include <hintids.hxx>
#include <sot/exchange.hxx>
-#include <svl/intitem.hxx>
#include <svl/stritem.hxx>
#include <sfx2/docfile.hxx>
-#include <sfx2/docfilt.hxx>
#include <editeng/protitem.hxx>
#include <sfx2/linkmgr.hxx>
-#include <tools/urlobj.hxx>
#include <sfx2/sfxsids.hrc>
-#include <sfx2/fcontnr.hxx>
#include <docary.hxx>
#include <fmtcntnt.hxx>
#include <fmtpdsc.hxx>
@@ -55,15 +51,12 @@
#include <swserv.hxx>
#include <shellio.hxx>
#include <poolfmt.hxx>
-#include <expfld.hxx>
#include <swbaslnk.hxx>
#include <mvsave.hxx>
-#include <sectfrm.hxx>
#include <fmtftntx.hxx>
#include <ftnidx.hxx>
#include <doctxm.hxx>
#include <fmteiro.hxx>
-#include <swerror.h>
#include <unosection.hxx>
#include <calbck.hxx>
#include <fmtclds.hxx>
diff --git a/sw/source/core/docnode/swbaslnk.cxx
b/sw/source/core/docnode/swbaslnk.cxx
index 8957ac4a8a69..404356efb381 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -19,37 +19,28 @@
#include <hintids.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/outdev.hxx>
-#include <osl/thread.hxx>
-#include <salhelper/condition.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/lnkbase.hxx>
#include <sfx2/objsh.hxx>
#include <editeng/boxitem.hxx>
-#include <svx/svxids.hrc>
#include <sfx2/linkmgr.hxx>
#include <sfx2/event.hxx>
-#include <svtools/soerr.hxx>
#include <sot/exchange.hxx>
#include <fmtfsize.hxx>
#include <fmtanchr.hxx>
#include <frmatr.hxx>
#include <frmfmt.hxx>
#include <doc.hxx>
-#include <IDocumentLinksAdministration.hxx>
#include <IDocumentLayoutAccess.hxx>
#include <pam.hxx>
-#include <editsh.hxx>
#include <swtable.hxx>
-#include <docary.hxx>
#include <swevent.hxx>
#include <swbaslnk.hxx>
#include <swserv.hxx>
+#include <viewsh.hxx>
#include <ndgrf.hxx>
-#include <ndole.hxx>
#include <hints.hxx>
-#include <tabfrm.hxx>
#include <cntfrm.hxx>
#include <htmltbl.hxx>
#include <calbck.hxx>
diff --git a/sw/source/core/docnode/swthreadjoiner.cxx
b/sw/source/core/docnode/swthreadjoiner.cxx
index a91a6b2ba574..ee5a3144cdf3 100644
--- a/sw/source/core/docnode/swthreadjoiner.cxx
+++ b/sw/source/core/docnode/swthreadjoiner.cxx
@@ -18,7 +18,6 @@
*/
#include <swthreadjoiner.hxx>
-#include <finalthreadmanager.hxx>
#include <com/sun/star/util/JobManager.hpp>
#include <comphelper/processfactory.hxx>
#include <osl/mutex.hxx>
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 1fae4c0d64c4..5ffe5728fd49 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -19,22 +19,16 @@
#include <memory>
#include <hintids.hxx>
-#include <editeng/protitem.hxx>
-#include <editeng/opaqitem.hxx>
-#include <editeng/ulspitem.hxx>
#include <editeng/lrspitem.hxx>
#include <svx/svdpage.hxx>
#include <svx/svditer.hxx>
-#include <svx/fmglob.hxx>
#include <svx/svdogrp.hxx>
#include <svx/svdotext.hxx>
#include <svx/svdmodel.hxx>
-#include <svx/svdpagv.hxx>
#include <svx/svdviter.hxx>
#include <svx/svdview.hxx>
-#include <svx/shapepropertynotifier.hxx>
-#include <svx/sdr/contact/objectcontactofobjlistpainter.hxx>
#include <svx/sdr/contact/displayinfo.hxx>
+#include <svx/sdr/contact/objectcontact.hxx>
#include <drawdoc.hxx>
#include <fmtornt.hxx>
#include <viewimp.hxx>
@@ -43,6 +37,7 @@
#include <node.hxx>
#include <fmtcntnt.hxx>
#include <fmtfsize.hxx>
+#include <pam.hxx>
#include <pagefrm.hxx>
#include <rootfrm.hxx>
#include <frmtool.hxx>
@@ -58,14 +53,13 @@
#include <doc.hxx>
#include <hints.hxx>
#include <txtfrm.hxx>
-#include <editsh.hxx>
#include <docary.hxx>
-#include <flyfrms.hxx>
#include <sortedobjs.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <svx/sdr/contact/viewcontactofvirtobj.hxx>
#include <drawinglayer/primitive2d/transformprimitive2d.hxx>
+#include <drawinglayer/geometry/viewinformation2d.hxx>
#include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
#include <com/sun/star/text/WritingMode2.hpp>
#include <calbck.hxx>
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index 72f62d3ff101..e21f3f35b992 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -20,11 +20,12 @@
#include <hintids.hxx>
#include <comphelper/lok.hxx>
#include <tools/mapunit.hxx>
+#include <svx/svdhdl.hxx>
#include <svx/svdtrans.hxx>
#include <editeng/protitem.hxx>
-#include <editeng/opaqitem.hxx>
#include <svx/svdpage.hxx>
#include <vcl/canvastools.hxx>
+#include <vcl/gdimtf.hxx>
#include <vcl/svapp.hxx>
#include <vcl/ptrstyle.hxx>
@@ -33,12 +34,9 @@
#include <fmtfsize.hxx>
#include <fmturl.hxx>
#include <viewsh.hxx>
-#include <viewimp.hxx>
-#include <cntfrm.hxx>
#include <frmatr.hxx>
#include <doc.hxx>
#include <IDocumentUndoRedo.hxx>
-#include <dview.hxx>
#include <dflyobj.hxx>
#include <flyfrm.hxx>
#include <frmfmt.hxx>
@@ -67,7 +65,6 @@
#include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <notxtfrm.hxx>
-#include <dcontact.hxx>
using namespace ::com::sun::star;
diff --git a/sw/source/core/draw/dobjfac.cxx b/sw/source/core/draw/dobjfac.cxx
index e11e375aa30b..31bef2f94c3b 100644
--- a/sw/source/core/draw/dobjfac.cxx
+++ b/sw/source/core/draw/dobjfac.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <dpage.hxx>
#include <dobjfac.hxx>
#include <dflyobj.hxx>
diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx
index b5f1698eebfe..45f88403123c 100644
--- a/sw/source/core/draw/dpage.cxx
+++ b/sw/source/core/draw/dpage.cxx
@@ -17,35 +17,26 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <basic/basmgr.hxx>
#include <editeng/flditem.hxx>
#include <vcl/imapobj.hxx>
#include <svl/urihelper.hxx>
#include <sfx2/sfxhelp.hxx>
-#include <unotools/securityoptions.hxx>
#include <vcl/help.hxx>
-#include <vcl/svapp.hxx>
#include <svx/svdview.hxx>
#include <fmturl.hxx>
#include <frmfmt.hxx>
#include <doc.hxx>
#include <IDocumentLayoutAccess.hxx>
-#include <shellres.hxx>
#include <viewimp.hxx>
#include <pagefrm.hxx>
-#include <cntfrm.hxx>
#include <rootfrm.hxx>
-#include <frmatr.hxx>
#include <viewsh.hxx>
#include <drawdoc.hxx>
#include <dpage.hxx>
#include <dcontact.hxx>
#include <dflyobj.hxx>
#include <docsh.hxx>
-#include <usrfld.hxx>
#include <flyfrm.hxx>
-#include <ndnotxt.hxx>
-#include <grfatr.hxx>
#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
using namespace ::com::sun::star::uno;
diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx
index 464fa5b157a0..6a91a4e8006d 100644
--- a/sw/source/core/draw/drawdoc.cxx
+++ b/sw/source/core/draw/drawdoc.cxx
@@ -18,24 +18,14 @@
*/
#include <svx/svxids.hrc>
-#include <tools/stream.hxx>
-#include <unotools/configmgr.hxx>
-#include <sot/storage.hxx>
-#include <svl/intitem.hxx>
-#include <editeng/forbiddencharacterstable.hxx>
-#include <svx/xtable.hxx>
#include <svx/drawitem.hxx>
-#include <viewsh.hxx>
#include <doc.hxx>
-#include <rootfrm.hxx>
#include <drawdoc.hxx>
#include <dpage.hxx>
#include <docsh.hxx>
-#include <shellio.hxx>
#include <hintids.hxx>
#include <DocumentSettingManager.hxx>
-#include <IDocumentDrawModelAccess.hxx>
using namespace com::sun::star;
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index 54f86e8abb27..c1a7b6a8cbbc 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -18,7 +18,7 @@
*/
#include <hintids.hxx>
-#include <editeng/protitem.hxx>
+#include <svx/svdpage.hxx>
#include <svx/svdpagv.hxx>
#include <svx/fmmodel.hxx>
#include <sot/exchange.hxx>
@@ -28,7 +28,6 @@
#include <com/sun/star/embed/EmbedMisc.hpp>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
-#include <swtypes.hxx>
#include <pagefrm.hxx>
#include <rootfrm.hxx>
#include <cntfrm.hxx>
@@ -38,17 +37,14 @@
#include <dflyobj.hxx>
#include <dcontact.hxx>
#include <textboxhelper.hxx>
-#include <frmatr.hxx>
#include <viewsh.hxx>
#include <viewimp.hxx>
#include <dview.hxx>
-#include <dpage.hxx>
#include <doc.hxx>
#include <mdiexp.hxx>
#include <ndole.hxx>
#include <ndgrf.hxx>
#include <fmtanchr.hxx>
-#include <shellres.hxx>
#include <IDocumentUndoRedo.hxx>
#include <DocumentSettingManager.hxx>
#include <IDocumentLayoutAccess.hxx>
@@ -58,7 +54,6 @@
#include <vector>
#include <sortedobjs.hxx>
-#include <flyfrms.hxx>
#include <UndoManager.hxx>
using namespace com::sun::star;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
