Recheck sw/ cxx files with IWYU

See tdf#42949 for motivation Change-Id: I8a8df68946297fad517b753d73e4373203a45ed6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132150 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2022-03-28 14:24:47 +02:00
parent ff0783ce6c
commit 6b147d3369
163 changed files with 60 additions and 266 deletions
@@ -393,6 +393,8 @@ excludelist:
    sw/qa/extras/odfexport/odfexport.cxx:
    # Needed for getProperty template
    - com/sun/star/graphic/XGraphic.hpp
+    #Actually used
+    - comphelper/scopeguard.hxx
    sw/qa/extras/odfimport/odfimport.cxx:
    # Needed for direct member access
    - com/sun/star/text/XTextSection.hpp
@@ -421,6 +423,9 @@ excludelist:
    - com/sun/star/graphic/XGraphic.hpp
    - com/sun/star/text/TableColumnSeparator.hpp
    - com/sun/star/text/XTextColumns.hpp
+    sw/qa/extras/ooxmlexport/ooxmlexport17.cxx:
+    # Actually used
+    - comphelper/scopeguard.hxx
    sw/qa/extras/ooxmlimport/ooxmlimport2.cxx:
    # Needed for direct member access
    - com/sun/star/document/XEmbeddedObjectSupplier2.hpp
@@ -434,6 +439,15 @@ excludelist:
    sw/qa/extras/uiwriter/uiwriter.cxx:
    # Needed for for-loop range
    - PostItMgr.hxx
+    sw/qa/extras/uiwriter/uiwriter4.cxx:
+    # Needed in C++20 mode
+    - o3tl/cppunittraitshelper.hxx
+    sw/qa/extras/uiwriter/uiwriter6.cxx:
+    # Needed in C++20 mode
+    - o3tl/cppunittraitshelper.hxx
+    sw/qa/uibase/uiview/uiview.cxx:
+    # Actually used
+    - comphelper/scopeguard.hxx
    sw/qa/extras/unowriter/unowriter.cxx:
    # Needed for direct member access
    - com/sun/star/awt/XDevice.hpp
@@ -508,12 +522,18 @@ excludelist:
    # Needed for macros to work
    - editeng/unoprnms.hxx
    - com/sun/star/lang/Locale.hpp
+    sw/source/core/layout/layact.cxx:
+    # Actually used
+    - comphelper/scopeguard.hxx
    sw/source/core/swg/SwXMLBlockExport.cxx:
    # Actually used
    - com/sun/star/xml/sax/XDocumentHandler.hpp
    sw/source/core/swg/SwXMLSectionList.cxx:
    # Actually used
    - vector
+    sw/source/core/text/porrst.cxx:
+    # Actually used
+    - comphelper/scopeguard.hxx
    sw/source/core/text/txtftn.cxx:
    # Needed for template
    - com/sun/star/text/XTextRange.hpp
@@ -622,6 +642,9 @@ excludelist:
    sw/source/uibase/app/docst.cxx:
    # Needed for template
    - com/sun/star/frame/XModel.hpp
+    sw/source/uibase/config/modcfg.cxx:
+    # Needed for TypedWhichId macros in editeng/editids.hrc
+    - svl/typedwhich.hxx
    sw/source/uibase/dbui/mmconfigitem.cxx:
    # Actually used
    - com/sun/star/sdbc/XDataSource.hpp
@@ -742,6 +765,7 @@ excludelist:
    - svx/xlncapit.hxx
    - svx/xlinjoit.hxx
    - svx/galleryitem.hxx
+    - svx/sdangitm.hxx
    - sfx2/msg.hxx
    sw/source/uibase/shells/textsh.cxx:
    # Needed for defines in swslots.hxx
@@ -851,6 +875,8 @@ excludelist:
    sw/qa/extras/ooxmlimport/ooxmlimport.cxx:
    # Required in C++20 mode.
    - o3tl/cppunittraitshelper.hxx
+    # Actually used
+    - comphelper/scopeguard.hxx
    sw/qa/extras/ooxmlexport/ooxmlexport.cxx:
    # Required in C++20 mode.
    - o3tl/cppunittraitshelper.hxx
@@ -17,10 +17,8 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>

 #include <com/sun/star/text/XTextDocument.hpp>
-#include <com/sun/star/text/XTextContent.hpp>
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/text/XTextCursor.hpp>
-#include <com/sun/star/text/XTextRange.hpp>
 #include <com/sun/star/text/XTextFrame.hpp>

 using namespace css;
@@ -15,7 +15,6 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>

 #include <com/sun/star/text/XTextDocument.hpp>
-#include <com/sun/star/text/XTextContent.hpp>
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/text/XTextTable.hpp>
 #include <com/sun/star/text/XTextCursor.hpp>
@@ -9,8 +9,6 @@

 #include <swmodeltestbase.hxx>
 #include <AccessibilityCheck.hxx>
-#include <unotxdoc.hxx>
-#include <docsh.hxx>

 constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/core/accessibilitycheck/data/";

@@ -13,7 +13,6 @@
 #include <com/sun/star/i18n/WordType.hpp>

 #include <comphelper/processfactory.hxx>
-#include <comphelper/random.hxx>
 #include <i18nutil/transliteration.hxx>
 #include <editeng/adjustitem.hxx>
 #include <editeng/boxitem.hxx>
@@ -43,11 +42,9 @@
 #include <sfx2/docfile.hxx>

 #include <xmloff/odffields.hxx>
-#include <osl/process.h>

 #include <breakit.hxx>
 #include <doc.hxx>
-#include <IDocumentUndoRedo.hxx>
 #include <IDocumentRedlineAccess.hxx>
 #include <IDocumentFieldsAccess.hxx>
 #include <IDocumentStatistics.hxx>
@@ -59,7 +56,6 @@
 #include <ndtxt.hxx>
 #include <shellres.hxx>
 #include <swscanner.hxx>
-#include <swmodule.hxx>
 #include <swdll.hxx>
 #include <swtypes.hxx>
 #include <fmtftn.hxx>
@@ -7,8 +7,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

-#include <memory>
-#include <string_view>
 #include <swmodeltestbase.hxx>
 #include <docsh.hxx>
 #include <unotxdoc.hxx>
@@ -7,8 +7,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

-#include <memory>
-#include <string_view>
 #include <swmodeltestbase.hxx>
 #include <docsh.hxx>
 #include <unotxdoc.hxx>
@@ -11,7 +11,6 @@

 #include <com/sun/star/text/XTextFrame.hpp>
 #include <com/sun/star/linguistic2/XHyphenator.hpp>
-#include <com/sun/star/table/XTable.hpp>

 #include <comphelper/scopeguard.hxx>
 #include <comphelper/propertysequence.hxx>
@@ -22,7 +22,6 @@
 #include <com/sun/star/task/XJob.hpp>

 #include <tools/urlobj.hxx>
-#include <unotools/localfilehelper.hxx>
 #include <comphelper/sequence.hxx>

 #include <wrtsh.hxx>
@@ -9,7 +9,6 @@

 #include <algorithm>
 #include <memory>
-#include <string_view>
 #include <swmodeltestbase.hxx>

 #include <com/sun/star/awt/FontSlant.hpp>
@@ -8,9 +8,9 @@
 */

 #include <swmodeltestbase.hxx>
-#include <unotxdoc.hxx>

 #include <com/sun/star/text/XTextTable.hpp>
+#include <com/sun/star/text/XTextTablesSupplier.hpp>

 class Test : public SwModelTestBase
 {
@@ -9,20 +9,26 @@

 #include <swmodeltestbase.hxx>

+#include <comphelper/processfactory.hxx>
 #include <svx/svddef.hxx>
 #include <svx/sdmetitm.hxx>
 #include <svx/svdobj.hxx>

 #include <com/sun/star/drawing/FillStyle.hpp>
-#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
-#include <com/sun/star/text/XTextFrame.hpp>
+#include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/packages/zip/ZipFileAccess.hpp>
+#include <com/sun/star/text/XChapterNumberingSupplier.hpp>
+#include <com/sun/star/text/XEndnotesSupplier.hpp>
+#include <com/sun/star/text/XFootnotesSupplier.hpp>
+#include <com/sun/star/text/XTextFieldsSupplier.hpp>
+#include <com/sun/star/text/XTextFrame.hpp>
+#include <com/sun/star/text/XTextFramesSupplier.hpp>
+#include <com/sun/star/text/XTextTablesSupplier.hpp>
+#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
 #include <com/sun/star/view/XViewCursor.hpp>
-#include <comphelper/configuration.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <unotools/fltrcfg.hxx>
 #include <unoprnms.hxx>
-#include <unotxdoc.hxx> //XChapterNumberingSupplier

 constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/extras/ooxmlexport/data/";

@@ -18,7 +18,6 @@

 #include <queue>
 #include <swmodeltestbase.hxx>
-#include <unotxdoc.hxx>

 constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/extras/ooxmlexport/data/";

@@ -10,7 +10,6 @@
 #include <swmodeltestbase.hxx>
 #include <unotools/tempfile.hxx>
 #include <tools/urlobj.hxx>
-#include <unotools/saveopt.hxx>
 #include <officecfg/Office/Common.hxx>

 // This file contains tests to check relative/absolute hyperlinks handling
@@ -7,9 +7,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

-#include <memory>
-#include <string_view>
-#include <config_features.h>
 #include <config_fonts.h>

 #ifdef MACOSX
@@ -64,7 +61,6 @@
 #include <oox/drawingml/drawingmltypes.hxx>
 #include <unotools/streamwrap.hxx>
 #include <comphelper/propertysequence.hxx>
-#include <osl/time.h>
 #include <comphelper/processfactory.hxx>
 #include <vcl/TypeSerializer.hxx>
 #include <comphelper/scopeguard.hxx>
@@ -21,9 +21,7 @@
 #include <com/sun/star/text/WritingMode2.hpp>
 #include <com/sun/star/style/BreakType.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
-#include <com/sun/star/container/XContentEnumerationAccess.hpp>
 #include <com/sun/star/text/XTextTable.hpp>
-#include <com/sun/star/text/XTextField.hpp>

 #include <xmloff/odffields.hxx>

@@ -9,8 +9,6 @@

 #include <swmodeltestbase.hxx>

-#include <osl/thread.hxx>
-
 class TxtEncExportTest : public SwModelTestBase
 {
 public:
@@ -25,12 +25,12 @@
 #include <swacorr.hxx>
 #include <swmodule.hxx>
 #include <modcfg.hxx>
-#include <charatr.hxx>
 #include <editeng/acorrcfg.hxx>
 #include <unotools/streamwrap.hxx>
 #include <unocrsrhelper.hxx>
-#include <unotbl.hxx>
+#include <com/sun/star/text/VertOrientation.hpp>
 #include <com/sun/star/text/XDefaultNumberingProvider.hpp>
+#include <com/sun/star/text/XTextTable.hpp>
 #include <vcl/TypeSerializer.hxx>

 #include <svx/svdpage.hxx>
@@ -39,11 +39,11 @@

 #include <editeng/eeitem.hxx>
 #include <editeng/scripttypeitem.hxx>
+#include <editeng/wghtitem.hxx>
 #include <IDocumentDrawModelAccess.hxx>
 #include <IDocumentRedlineAccess.hxx>
 #include <UndoManager.hxx>
 #include <frmatr.hxx>
-#include <frmmgr.hxx>

 #include <com/sun/star/text/TextMarkupType.hpp>
 #include <osl/file.hxx>
@@ -17,9 +17,9 @@
 #include <redline.hxx>
 #include <dcontact.hxx>
 #include <view.hxx>
-#include <unotbl.hxx>
 #include <IDocumentSettingAccess.hxx>

+#include <editeng/brushitem.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdview.hxx>

@@ -27,13 +27,13 @@
 #include <IDocumentDrawModelAccess.hxx>
 #include <IDocumentRedlineAccess.hxx>
 #include <UndoManager.hxx>
-#include <frmatr.hxx>
 #include <tblafmt.hxx>

 #include <com/sun/star/text/XTextField.hpp>
 #include <com/sun/star/linguistic2/XLinguProperties.hpp>
 #include <com/sun/star/text/XTextViewCursorSupplier.hpp>
 #include <com/sun/star/text/XPageCursor.hpp>
+#include <com/sun/star/text/XParagraphAppend.hpp>
 #include <o3tl/cppunittraitshelper.hxx>
 #include <osl/thread.hxx>
 #include <hyp.hxx>
@@ -9,12 +9,13 @@

 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <swmodeltestbase.hxx>
+#include <cntfrm.hxx>
+#include <itabenum.hxx>
 #include <ndtxt.hxx>
 #include <wrtsh.hxx>
 #include <drawdoc.hxx>
 #include <view.hxx>
 #include <swacorr.hxx>
-#include <modcfg.hxx>
 #include <editeng/acorrcfg.hxx>
 #include <com/sun/star/text/XTextColumns.hpp>

@@ -32,7 +33,6 @@
 #include <com/sun/star/text/XTextTable.hpp>
 #include <com/sun/star/text/XTextViewCursorSupplier.hpp>
 #include <o3tl/cppunittraitshelper.hxx>
-#include <txtfrm.hxx>
 #include <swdtflvr.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
@@ -9,6 +9,7 @@

 #include <com/sun/star/awt/FontWeight.hpp>
 #include <swmodeltestbase.hxx>
+#include <itabenum.hxx>
 #include <ndtxt.hxx>
 #include <wrtsh.hxx>
 #include <expfld.hxx>
@@ -16,7 +17,6 @@
 #include <view.hxx>
 #include <swacorr.hxx>
 #include <swmodule.hxx>
-#include <modcfg.hxx>
 #include <charatr.hxx>
 #include <editeng/acorrcfg.hxx>
 #include <unotbl.hxx>
@@ -15,7 +15,6 @@

 #include <com/sun/star/awt/FontWeight.hpp>
 #include <com/sun/star/awt/Size.hpp>
-#include <com/sun/star/awt/XBitmap.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/form/validation/XValidatableFormComponent.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
@@ -38,7 +37,6 @@
 #include <com/sun/star/text/XTextViewCursorSupplier.hpp>
 #include <com/sun/star/text/XPageCursor.hpp>

-#include <config_features.h>
 #include <config_fonts.h>
 #include <editeng/ulspitem.hxx>
 #include <sfx2/bindings.hxx>
@@ -17,7 +17,6 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

-#include <osl/mutex.hxx>
 #include <sal/log.hxx>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
@@ -25,7 +25,6 @@
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <osl/mutex.hxx>
 #include <sal/log.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
@@ -20,7 +20,6 @@
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <unotools/accessiblestatesethelper.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <frmfmt.hxx>
@@ -66,7 +66,6 @@
 #include <comphelper/interfacecontainer3.hxx>
 #include <pagepreviewlayout.hxx>
 #include <dcontact.hxx>
-#include <svx/unoapi.hxx>
 #include <svx/svdmark.hxx>
 #include <doc.hxx>
 #include <drawdoc.hxx>
@@ -30,7 +30,6 @@
 #include <accmap.hxx>
 #include <fesh.hxx>
 #include <viewopt.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <sal/log.hxx>
@@ -19,8 +19,6 @@

 #include <sal/config.h>

-#include <string_view>
-
 #include "accportions.hxx"
 #include <osl/diagnose.h>
 #include <rtl/ustring.hxx>
@@ -20,10 +20,9 @@

 #include <algorithm>
 #include <format.hxx>
-#include <frame.hxx>
 #include <hintids.hxx>
 #include <hints.hxx>
-#include <osl/diagnose.hxx>
+#include <osl/diagnose.h>
 #include <sal/log.hxx>
 #include <tools/debug.hxx>

@@ -22,7 +22,6 @@
 #include <doc.hxx>
 #include <fmtcolfunc.hxx>
 #include <format.hxx>
-#include <frame.hxx>
 #include <frmatr.hxx>
 #include <hintids.hxx>
 #include <hints.hxx>
@@ -33,7 +32,6 @@
 #include <svx/sdr/attribute/sdrallfillattributeshelper.hxx>
 #include <svx/unobrushitemhelper.hxx>
 #include <svx/xdef.hxx>
-#include <swcache.hxx>

 using namespace com::sun::star;

@@ -24,7 +24,6 @@
 #include <cfloat>
 #include <climits>
 #include <memory>
-#include <string_view>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <cstdlib>
@@ -43,7 +42,6 @@
 #include <shellres.hxx>
 #include <svl/numformat.hxx>
 #include <svl/languageoptions.hxx>
-#include <svl/zforlist.hxx>
 #include <swmodule.hxx>
 #include <swtypes.hxx>
 #include <unotools/charclass.hxx>
@@ -12,7 +12,6 @@
 #include <bookmark.hxx>
 #include <tools/date.hxx>
 #include <svl/numformat.hxx>
-#include <svl/zforlist.hxx>
 #include <vcl/svapp.hxx>

 IMPL_LINK(DateFormFieldButton, ImplSelectHdl, weld::Calendar&, rCalendar, void)
@@ -19,7 +19,6 @@

 #include <config_wasm_strip.h>

-#include <memory>
 #include <com/sun/star/text/XTextRange.hpp>

 #include <hintids.hxx>
@@ -19,8 +19,6 @@

 #include <sal/config.h>

-#include <string_view>
-
 #include <tools/gen.hxx>
 #include <editeng/protitem.hxx>
 #include <officecfg/Office/Common.hxx>
@@ -49,7 +49,6 @@
 #include <fldbas.hxx>
 #include <expfld.hxx>
 #include <ddefld.hxx>
-#include <swddetbl.hxx>
 #include <authfld.hxx>
 #include <usrfld.hxx>
 #include <ndindex.hxx>
@@ -41,7 +41,6 @@
 #include <SwNodeNum.hxx>
 #include <dbgoutsw.hxx>
 #include <frameformats.hxx>
-#include <iostream>
 #include <cstdio>

 static OString aDbgOutResult;
@@ -42,7 +42,6 @@

 #include <vector>
 #include <com/sun/star/linguistic2/XProofreadingIterator.hpp>
-#include <com/sun/star/frame/XModel.hpp>
 #include <osl/diagnose.h>

 using namespace ::com::sun::star;
@@ -66,7 +66,6 @@
 #include <cntfrm.hxx>
 #include <txtfrm.hxx>
 #include <notxtfrm.hxx>
-#include <flyfrm.hxx>
 #include <dflyobj.hxx>
 #include <dcontact.hxx>
 #include <swundo.hxx>
@@ -19,7 +19,6 @@

 #include <sal/config.h>

-#include <mutex>
 #include <string_view>

 #include <config_features.h>
@@ -31,7 +30,6 @@
 #include <proofreadingiterator.hxx>
 #include <com/sun/star/text/XFlatParagraphIteratorProvider.hpp>
 #include <com/sun/star/linguistic2/XProofreadingIterator.hpp>
-#include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>

 #include <comphelper/processfactory.hxx>
@@ -45,7 +43,6 @@
 #include <editeng/ulspitem.hxx>
 #include <editeng/lrspitem.hxx>
 #include <svl/numformat.hxx>
-#include <svl/zforlist.hxx>
 #include <unotools/lingucfg.hxx>
 #include <svx/svdpage.hxx>
 #include <fmtcntnt.hxx>
@@ -19,7 +19,6 @@

 #include <list.hxx>

-#include <vector>
 #include <numrule.hxx>
 #include <ndarr.hxx>
 #include <node.hxx>
@@ -70,7 +70,6 @@
 #include <drawinglayer/processor2d/processor2dtools.hxx>
 #include <txtfly.hxx>
 #include <drawinglayer/primitive2d/maskprimitive2d.hxx>
-#include <basegfx/polygon/b2dpolygontools.hxx>
 #include <drawinglayer/primitive2d/objectinfoprimitive2d.hxx>
 #include <osl/diagnose.h>

@@ -21,7 +21,6 @@

 #include <osl/diagnose.h>
 #include <svl/numformat.hxx>
-#include <svl/zforlist.hxx>
 #include <frmfmt.hxx>
 #include <doc.hxx>
 #include <IDocumentUndoRedo.hxx>
@@ -57,7 +57,6 @@
 #include <fmtftntx.hxx>
 #include <strings.hrc>
 #include <viewsh.hxx>
-#include <txtfrm.hxx>
 #include <memory>
 #include "ndsect.hxx"
 #include <tools/datetimeutils.hxx>
@@ -37,7 +37,6 @@
 #include <swtable.hxx>
 #include <ndtxt.hxx>
 #include <pam.hxx>
-#include <swcache.hxx>
 #include <section.hxx>
 #include <cntfrm.hxx>
 #include <flyfrm.hxx>
@@ -58,7 +58,6 @@
 #include <vector>

 #include <sortedobjs.hxx>
-#include <UndoManager.hxx>

 using namespace com::sun::star;

@@ -35,7 +35,6 @@
 #include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
 #include <osl/diagnose.h>
 #include <svl/numformat.hxx>
-#include <svl/zforlist.hxx>

 #include <editeng/acorrcfg.hxx>
 #include <IDocumentRedlineAccess.hxx>
@@ -97,8 +97,6 @@

 #include <tools/diagnose_ex.h>
 #include <IDocumentRedlineAccess.hxx>
-#include <SwStyleNameMapper.hxx>
-#include <comphelper/lok.hxx>

 constexpr OUStringLiteral WATERMARK_NAME = u"PowerPlusWaterMarkObject";
 #define WATERMARK_AUTO_SIZE sal_uInt32(1)
@@ -35,7 +35,6 @@
 #include <swundo.hxx>
 #include <dbmgr.hxx>
 #include <hints.hxx>
-#include <calbck.hxx>
 #include <fieldhint.hxx>
 #include <DocumentSettingManager.hxx>
 #include <IDocumentContentOperations.hxx>
@@ -21,7 +21,6 @@
 #include <IDocumentStylePoolAccess.hxx>
 #include <editsh.hxx>
 #include <pam.hxx>
-#include <docary.hxx>
 #include <fchrfmt.hxx>
 #include <frmfmt.hxx>
 #include <charfmt.hxx>
@@ -29,7 +29,6 @@
 #include <section.hxx>
 #include <doctxm.hxx>
 #include <edglbldc.hxx>
-#include <osl/diagnose.h>

 bool SwEditShell::IsGlobalDoc() const
 {
@@ -36,7 +36,6 @@
 #include <IDocumentFieldsAccess.hxx>
 #include <IDocumentStatistics.hxx>
 #include <IDocumentState.hxx>
-#include <docary.hxx>
 #include <editsh.hxx>
 #include <frame.hxx>
 #include <cntfrm.hxx>
@@ -17,7 +17,6 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

-#include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/linguistic2/ProofreadingResult.hpp>
 #include <com/sun/star/linguistic2/XProofreadingIterator.hpp>
 #include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
@@ -28,9 +28,6 @@
 #include <numrule.hxx>
 #include <osl/diagnose.h>

-#include <viewopt.hxx>
-#include <wrtsh.hxx>
-
 SwPamRanges::SwPamRanges( const SwPaM& rRing )
 {
    for(SwPaM& rTmp : const_cast<SwPaM*>(&rRing)->GetRingContainer())
@@ -20,14 +20,11 @@
 #include <svx/svdmark.hxx>
 #include <tools/diagnose_ex.h>

-#include <com/sun/star/frame/XModel.hpp>
-
 #include <editsh.hxx>
 #include <fesh.hxx>
 #include <doc.hxx>
 #include <IDocumentUndoRedo.hxx>
 #include <IDocumentRedlineAccess.hxx>
-#include <pam.hxx>
 #include <UndoCore.hxx>
 #include <swundo.hxx>
 #include <flyfrm.hxx>
@@ -21,7 +21,6 @@
 #include <o3tl/any.hxx>
 #include <osl/diagnose.h>
 #include <svl/numformat.hxx>
-#include <svl/zforlist.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <fmtfld.hxx>
 #include <txtfld.hxx>
@@ -43,7 +43,6 @@
 #include <svl/urihelper.hxx>
 #include <unotools/useroptions.hxx>
 #include <unotools/syslocale.hxx>
-#include <svl/zforlist.hxx>
 #include <libxml/xmlstring.h>
 #include <libxml/xmlwriter.h>

@@ -24,7 +24,6 @@
 #include <fmtfld.hxx>
 #include <txtfld.hxx>
 #include <expfld.hxx>
-#include <pam.hxx>
 #include <docfld.hxx>
 #include <ndtxt.hxx>

@@ -24,7 +24,6 @@
 #include <o3tl/any.hxx>

 #include <svl/numformat.hxx>
-#include <svl/zforlist.hxx>
 #include <unotools/charclass.hxx>

 #include <calc.hxx>
@@ -11,7 +11,6 @@
 #include <GraphicSizeCheck.hxx>
 #include <svx/strings.hrc>
 #include <svx/svdobj.hxx>
-#include <unotools/viewoptions.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>

@@ -19,8 +18,8 @@
 #include <ndgrf.hxx>
 #include <IDocumentSettingAccess.hxx>
 #include <fmtfsize.hxx>
+#include <view.hxx>
 #include <wrtsh.hxx>
-#include <wview.hxx>
 #include <cmdid.h>

 using namespace css;
@@ -25,6 +25,7 @@
 #include <com/sun/star/text/TextContentAnchorType.hpp>
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/text/TextGridMode.hpp>
+#include <com/sun/star/text/XTextColumns.hpp>
 #include <sal/log.hxx>
 #include <o3tl/any.hxx>
 #include <o3tl/safeint.hxx>
@@ -37,7 +38,6 @@
 #include <unotools/syslocale.hxx>
 #include <frmfmt.hxx>
 #include <unocoll.hxx>
-#include <unosett.hxx>
 #include <fmtclds.hxx>
 #include <fmtornt.hxx>
 #include <fmthdft.hxx>
@@ -92,7 +92,6 @@
 #include <hints.hxx>
 #include <frameformats.hxx>
 #include <unoprnms.hxx>
-#include <svx/svdpage.hxx>

 #include <ndtxt.hxx>

@@ -17,7 +17,6 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

-#include <memory>
 #include <sal/config.h>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
@@ -26,7 +26,6 @@
 #include <editeng/opaqitem.hxx>
 #include <editeng/ulspitem.hxx>
 #include <editeng/frmdiritem.hxx>
-#include <editeng/outlobj.hxx>
 #include <fmtfsize.hxx>
 #include <fmtclds.hxx>
 #include <fmtcntnt.hxx>
@@ -30,7 +30,6 @@
 #include <IDocumentDrawModelAccess.hxx>
 #include <frmtool.hxx>
 #include <dflyobj.hxx>
-#include <hints.hxx>
 #include <fmtanchr.hxx>
 #include <fmtornt.hxx>
 #include <fmtfsize.hxx>
@@ -27,7 +27,6 @@
 #include <ftnfrm.hxx>
 #include <frmatr.hxx>
 #include <frmtool.hxx>
-#include <hints.hxx>
 #include <sectfrm.hxx>
 #include <notxtfrm.hxx>
 #include <txtfly.hxx>
@@ -18,7 +18,6 @@
 */

 #include "objectformattertxtfrm.hxx"
-#include <IDocumentUndoRedo.hxx>
 #include <sortedobjs.hxx>
 #include <rootfrm.hxx>
 #include <anchoredobject.hxx>
@@ -32,8 +31,6 @@
 #include <layact.hxx>
 #include <flyfrm.hxx>
 #include <ftnfrm.hxx>
-#include <fmtornt.hxx>
-#include <textboxhelper.hxx>
 #include <osl/diagnose.h>

 using namespace ::com::sun::star;
@@ -28,7 +28,6 @@
 #include <sal/log.hxx>
 #include <fmtclds.hxx>
 #include <fmtfsize.hxx>
-#include <fmthdft.hxx>
 #include <pagefrm.hxx>
 #include <pagedesc.hxx>
 #include <swtable.hxx>
@@ -25,6 +25,7 @@
 #include <editeng/prntitem.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/shaditem.hxx>
+#include <svx/ctredlin.hxx>
 #include <svx/framelink.hxx>
 #include <drawdoc.hxx>
 #include <tgrditem.hxx>
@@ -75,7 +76,6 @@
 #include <DocumentSettingManager.hxx>
 #include <IDocumentDeviceAccess.hxx>
 #include <IDocumentDrawModelAccess.hxx>
-#include <IDocumentRedlineAccess.hxx>

 #include <ndole.hxx>
 #include <PostItMgr.hxx>
@@ -89,7 +89,6 @@

 #include <bitmaps.hlst>
 #include <drawinglayer/primitive2d/PolygonHairlinePrimitive2D.hxx>
-#include <drawinglayer/primitive2d/PolygonStrokeArrowPrimitive2D.hxx>
 #include <drawinglayer/primitive2d/PolyPolygonStrokePrimitive2D.hxx>
 #include <drawinglayer/primitive2d/discreteshadowprimitive2d.hxx>
 #include <drawinglayer/primitive2d/maskprimitive2d.hxx>
@@ -63,7 +63,6 @@
 #include <layact.hxx>
 #include <ndtxt.hxx>
 #include <swtable.hxx>
-#include <tblsel.hxx>

 // RotateFlyFrame3
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
@@ -20,7 +20,7 @@
 #include <SwXMLSectionList.hxx>
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlnamespace.hxx>
-#include <xmloff/xmltkmap.hxx>
+#include <xmloff/xmltoken.hxx>
 #include <vector>

 using namespace ::com::sun::star;
@@ -38,7 +38,6 @@
 #include <docary.hxx>
 #include <frame.hxx>
 #include <swtable.hxx>
-#include <swcrsr.hxx>
 #include <ndtxt.hxx>
 #include <tabcol.hxx>
 #include <tabfrm.hxx>
@@ -19,8 +19,6 @@

 #include <sal/config.h>

-#include <o3tl/safeint.hxx>
-
 #include <frminf.hxx>
 #include "itrtxt.hxx"

@@ -29,7 +29,6 @@
 #include <editeng/hyphenzoneitem.hxx>
 #include <editeng/hngpnctitem.hxx>
 #include <editeng/scriptspaceitem.hxx>
-#include <editeng/brushitem.hxx>
 #include <editeng/splwrap.hxx>
 #include <editeng/pgrditem.hxx>
 #include <editeng/tstpitem.hxx>
@@ -38,7 +37,6 @@
 #include <SwSmartTagMgr.hxx>
 #include <breakit.hxx>
 #include <editeng/forbiddenruleitem.hxx>
-#include <paintfrm.hxx>
 #include <swmodule.hxx>
 #include <vcl/svapp.hxx>
 #include <viewsh.hxx>
@@ -27,12 +27,10 @@
 #include <viewsh.hxx>
 #include <textboxhelper.hxx>
 #include <IDocumentState.hxx>
-#include <frmatr.hxx>

 #include <sal/log.hxx>
 #include <fmtanchr.hxx>
 #include <fmtflcnt.hxx>
-#include <fmtornt.hxx>
 #include <flyfrms.hxx>
 #include <txatbase.hxx>
 #include "porfly.hxx"
@@ -47,19 +47,17 @@
 #include <unotools/charclass.hxx>
 #include <charfmt.hxx>
 #include <docary.hxx>
+#include <fmtanchr.hxx>
 #include <redline.hxx>
 #include <calbck.hxx>
 #include <doc.hxx>
 #include <swscanner.hxx>
 #include <txatbase.hxx>
-#include <calc.hxx>
 #include <IDocumentRedlineAccess.hxx>
 #include <IDocumentSettingAccess.hxx>
 #include <IDocumentContentOperations.hxx>
-#include <IDocumentFieldsAccess.hxx>
 #include <IMark.hxx>
 #include <sortedobjs.hxx>
-#include <dcontact.hxx>

 using namespace ::com::sun::star;
 using namespace i18n::ScriptType;
@@ -41,7 +41,8 @@
 #include "redlnitr.hxx"
 #include "atrhndl.hxx"
 #include <rootfrm.hxx>
-#include <textlinebreak.hxx>
+#include <formatlinebreak.hxx>
+#include <txatbase.hxx>

 #include <IDocumentRedlineAccess.hxx>
 #include <IDocumentSettingAccess.hxx>
@@ -43,9 +43,7 @@
 #include <tgrditem.hxx>
 #include <scriptinfo.hxx>
 #include <editeng/brushitem.hxx>
-#include <swmodule.hxx>
 #include <accessibilityoptions.hxx>
-#include <svtools/accessibilityoptions.hxx>
 #include <svx/sdr/attribute/sdrallfillattributeshelper.hxx>
 #include <doc.hxx>
 #include <editeng/fhgtitem.hxx>
@@ -61,7 +61,6 @@
 #include <expfld.hxx>
 #include <section.hxx>
 #include <mvsave.hxx>
-#include <swcache.hxx>
 #include <SwGrammarMarkUp.hxx>
 #include <redline.hxx>
 #include <IMark.hxx>
@@ -80,7 +79,6 @@
 #include <memory>
 #include <unoparagraph.hxx>
 #include <wrtsh.hxx>
-#include <frameformats.hxx>
 #include <fmtpdsc.hxx>
 #include <svx/sdr/attribute/sdrallfillattributeshelper.hxx>
 #include <svl/itemiter.hxx>
@@ -74,7 +74,6 @@
 #include <algorithm>
 #include <map>
 #include <memory>
-#include <unordered_map>

 #include <rdfhelper.hxx>
 #include <hints.hxx>
@@ -40,7 +40,6 @@
 #include <ndole.hxx>
 #include <frameformats.hxx>
 #include <svx/svdobj.hxx>
-#include <svx/unoshape.hxx>

 SwUndoFlyBase::SwUndoFlyBase( SwFrameFormat* pFormat, SwUndoId nUndoId )
    : SwUndo(nUndoId, pFormat->GetDoc())
@@ -47,9 +47,6 @@
 #include <rolbck.hxx>
 #include <ddefld.hxx>
 #include <tabfrm.hxx>
-#include <rowfrm.hxx>
-#include <cellfrm.hxx>
-#include <swcache.hxx>
 #include <tblafmt.hxx>
 #include <poolfmt.hxx>
 #include <mvsave.hxx>
@@ -23,7 +23,6 @@
 #include <comphelper/sequence.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <osl/mutex.hxx>
 #include <svl/itemprop.hxx>
 #include <svl/listener.hxx>
 #include <vcl/svapp.hxx>
@@ -66,7 +66,6 @@
 #include <pagefrm.hxx>
 #include <svl/eitem.hxx>
 #include <svl/lngmisc.hxx>
-#include <docary.hxx>
 #include <swtable.hxx>
 #include <tox.hxx>
 #include <doctxm.hxx>
@@ -31,7 +31,6 @@
 #include <com/sun/star/text/XTextDocument.hpp>

 #include <osl/mutex.hxx>
-#include <cppuhelper/interfacecontainer.h>
 #include <comphelper/interfacecontainer4.hxx>
 #include <comphelper/multicontainer2.hxx>
 #include <cppuhelper/supportsservice.hxx>
@@ -33,7 +33,6 @@
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/style/GraphicLocation.hpp>
-#include <com/sun/star/style/VerticalAlignment.hpp>
 #include <com/sun/star/table/BorderLine.hpp>
 #include <com/sun/star/text/PageNumberType.hpp>
 #include <com/sun/star/text/TableColumnSeparator.hpp>
@@ -37,7 +37,6 @@
 #include <unocrsrhelper.hxx>
 #include <doc.hxx>
 #include <ndtxt.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <docsh.hxx>
 #include <swunohelper.hxx>
@@ -26,7 +26,6 @@
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weak.hxx>
-#include <osl/mutex.hxx>
 #include <sal/config.h>
 #include <svl/listener.hxx>
 #include <vcl/svapp.hxx>
@@ -36,7 +36,6 @@
 #include <editeng/xmlcnitm.hxx>
 #include <sfx2/linkmgr.hxx>
 #include <sfx2/lnkbase.hxx>
-#include <osl/mutex.hxx>
 #include <osl/diagnose.h>
 #include <vcl/svapp.hxx>
 #include <fmtclds.hxx>
@@ -25,7 +25,6 @@
 #include <poolfmt.hxx>
 #include <fmtcol.hxx>
 #include <unomap.hxx>
-//#include <unostyle.hxx>
 #include <unosett.hxx>
 #include <unoprnms.hxx>
 #include <ftninfo.hxx>
@@ -37,7 +36,6 @@
 #include <docsh.hxx>
 #include <docary.hxx>
 #include <docstyle.hxx>
-#include <fmtclds.hxx>
 #include <editeng/brushitem.hxx>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/text/FootnoteNumbering.hpp>
@@ -47,7 +45,6 @@
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/style/VerticalAlignment.hpp>
 #include <o3tl/any.hxx>
 #include <o3tl/enumarray.hxx>
 #include <tools/UnitConversion.hxx>
@@ -73,7 +70,6 @@
 #include <svl/listener.hxx>
 #include <paratr.hxx>
 #include <sal/log.hxx>
-#include <numeric>

 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -91,13 +91,11 @@
 #include <editeng/keepitem.hxx>
 #include <fmtlsplt.hxx>
 #include <swundo.hxx>
-#include <osl/mutex.hxx>
 #include <SwStyleNameMapper.hxx>
 #include <frmatr.hxx>
 #include <sortopt.hxx>
 #include <sal/log.hxx>
 #include <editeng/frmdiritem.hxx>
-#include <comphelper/interfacecontainer3.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <comphelper/string.hxx>
 #include <cppuhelper/supportsservice.hxx>
@@ -27,7 +27,6 @@
 #include <viewsh.hxx>
 #include <docfld.hxx>

-#include <svl/languageoptions.hxx>
 #include <svl/cjkoptions.hxx>
 #include <svl/ctloptions.hxx>
 #include <toolkit/awt/vclxdevice.hxx>
@@ -20,8 +20,6 @@
 #include <officecfg/Office/Common.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
-#include <swmodule.hxx>
-#include <svtools/accessibilityoptions.hxx>
 #include <svx/svdpagv.hxx>
 #include <fmtanchr.hxx>
 #include <frmfmt.hxx>
@@ -26,7 +26,6 @@
 #include <flyfrm.hxx>
 #include <layact.hxx>
 #include <dview.hxx>
-#include <swmodule.hxx>
 #include <svx/svdpage.hxx>
 #include <accmap.hxx>

@@ -39,7 +39,6 @@
 #include <IDocumentState.hxx>
 #include <rootfrm.hxx>
 #include <pagefrm.hxx>
-#include <cntfrm.hxx>
 #include <viewimp.hxx>
 #include <frmtool.hxx>
 #include <viewopt.hxx>
@@ -53,7 +52,6 @@
 #include <fntcache.hxx>
 #include <ptqueue.hxx>
 #include <docsh.hxx>
-#include <pagedesc.hxx>
 #include <bookmark.hxx>
 #include <ndole.hxx>
 #include <ndindex.hxx>
@@ -20,7 +20,6 @@
 #include <iodetect.hxx>
 #include <memory>
 #include <osl/endian.h>
-#include <osl/thread.h>
 #include <sot/storage.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/moduleoptions.hxx>
@@ -65,7 +65,6 @@
 #include <com/sun/star/awt/XImageConsumer.hpp>
 #include <com/sun/star/awt/ImageStatus.hpp>
 #include <com/sun/star/form/XImageProducerSupplier.hpp>
-#include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
 #include <com/sun/star/form/XForm.hpp>
 #include <doc.hxx>
 #include <IDocumentLayoutAccess.hxx>
@@ -51,7 +51,6 @@
 #include <editeng/widwitem.hxx>
 #include <editeng/frmdiritem.hxx>
 #include <editeng/orphitem.hxx>
-#include <svtools/svparser.hxx>
 #include <vcl/svapp.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
@@ -48,7 +48,6 @@
 #include <sfx2/event.hxx>
 #include <sfx2/docfile.hxx>

-#include <svtools/htmlcfg.hxx>
 #include <sfx2/linkmgr.hxx>
 #include <editeng/kernitem.hxx>
 #include <editeng/boxitem.hxx>
@@ -12,7 +12,6 @@

 #include <ndtxt.hxx>
 #include <ndole.hxx>
-#include <ndnotxt.hxx>
 #include <ndgrf.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdotext.hxx>
@@ -14,7 +14,6 @@
 #include <docsh.hxx>

 #include <unotools/mediadescriptor.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <comphelper/servicehelper.hxx>

 #include <com/sun/star/io/XOutputStream.hpp>
@@ -90,7 +90,6 @@
 #include <editeng/editobj.hxx>
 #include <editeng/keepitem.hxx>
 #include <editeng/borderline.hxx>
-#include <editeng/prntitem.hxx>
 #include <sax/tools/converter.hxx>
 #include <svx/xdef.hxx>
 #include <svx/xfillit0.hxx>
@@ -104,7 +103,6 @@
 #include <tools/date.hxx>
 #include <tools/datetime.hxx>
 #include <tools/datetimeutils.hxx>
-#include <tools/UnitConversion.hxx>
 #include <svl/whiter.hxx>
 #include <rtl/tencinfo.h>
 #include <sal/log.hxx>
--- a/Show More
+++ b/Show More