diff options
author | Gabor Kelemen <kelemeng@ubuntu.com> | 2022-03-24 12:42:44 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2022-03-28 14:24:47 +0200 |
commit | 6b147d3369ece427e490d3108de6ec9f7448c570 (patch) | |
tree | 3387e9a4b36ff39ebca5f3c1166315dd45027590 | |
parent | ff0783ce6c74178ae44d6b5e402b0feecff918a9 (diff) |
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>
163 files changed, 60 insertions, 266 deletions
diff --git a/sw/IwyuFilter_sw.yaml b/sw/IwyuFilter_sw.yaml index 5c8bd9b409bb..a93cd2e81eb7 100644 --- a/sw/IwyuFilter_sw.yaml +++ b/sw/IwyuFilter_sw.yaml @@ -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 diff --git a/sw/qa/api/SwXTextFrame.cxx b/sw/qa/api/SwXTextFrame.cxx index 81b6e1c847a4..c1fa862fb6e1 100644 --- a/sw/qa/api/SwXTextFrame.cxx +++ b/sw/qa/api/SwXTextFrame.cxx @@ -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; diff --git a/sw/qa/api/SwXTextTable.cxx b/sw/qa/api/SwXTextTable.cxx index 71a3a502cabc..229583ebcfd9 100644 --- a/sw/qa/api/SwXTextTable.cxx +++ b/sw/qa/api/SwXTextTable.cxx @@ -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> diff --git a/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx b/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx index 2545171d6c38..169a3fa03191 100644 --- a/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx +++ b/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx @@ -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/"; diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx index bc4b8b19bf1e..3ba4abc9719a 100644 --- a/sw/qa/core/uwriter.cxx +++ b/sw/qa/core/uwriter.cxx @@ -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> diff --git a/sw/qa/extras/indexing/IndexingExportTest.cxx b/sw/qa/extras/indexing/IndexingExportTest.cxx index 87ab70758de3..445e2008340a 100644 --- a/sw/qa/extras/indexing/IndexingExportTest.cxx +++ b/sw/qa/extras/indexing/IndexingExportTest.cxx @@ -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> diff --git a/sw/qa/extras/indexing/SearchResultLocatorTest.cxx b/sw/qa/extras/indexing/SearchResultLocatorTest.cxx index 69aeba0003af..98d4669da966 100644 --- a/sw/qa/extras/indexing/SearchResultLocatorTest.cxx +++ b/sw/qa/extras/indexing/SearchResultLocatorTest.cxx @@ -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> diff --git a/sw/qa/extras/layout/layout2.cxx b/sw/qa/extras/layout/layout2.cxx index 7c8914b814d7..61199249604c 100644 --- a/sw/qa/extras/layout/layout2.cxx +++ b/sw/qa/extras/layout/layout2.cxx @@ -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> diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx b/sw/qa/extras/mailmerge/mailmerge.cxx index e1fee48d74da..c797b03dd859 100644 --- a/sw/qa/extras/mailmerge/mailmerge.cxx +++ b/sw/qa/extras/mailmerge/mailmerge.cxx @@ -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> diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx index 33c6a2deb4a5..4a033f80687d 100644 --- a/sw/qa/extras/odfexport/odfexport.cxx +++ b/sw/qa/extras/odfexport/odfexport.cxx @@ -9,7 +9,6 @@ #include <algorithm> #include <memory> -#include <string_view> #include <swmodeltestbase.hxx> #include <com/sun/star/awt/FontSlant.hpp> diff --git a/sw/qa/extras/odfexport/odfexport2.cxx b/sw/qa/extras/odfexport/odfexport2.cxx index c931aefd30ca..c128d7be52d1 100644 --- a/sw/qa/extras/odfexport/odfexport2.cxx +++ b/sw/qa/extras/odfexport/odfexport2.cxx @@ -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 { diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx index b1637cfa3ad1..53db9cfccf3b 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx @@ -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/"; diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx index 6d62d866f4b2..6fc7c4e59ac1 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx @@ -18,7 +18,6 @@ #include <queue> #include <swmodeltestbase.hxx> -#include <unotxdoc.hxx> constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/extras/ooxmlexport/data/"; diff --git a/sw/qa/extras/ooxmlexport/ooxmllinks.cxx b/sw/qa/extras/ooxmlexport/ooxmllinks.cxx index 743c5a3ad31c..0446427e0b03 100644 --- a/sw/qa/extras/ooxmlexport/ooxmllinks.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmllinks.cxx @@ -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 diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 29b44675b33c..8473e44270c1 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -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> diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx index 0cc7c52cbafe..4a2c6771674d 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx @@ -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> diff --git a/sw/qa/extras/txtencexport/txtencexport.cxx b/sw/qa/extras/txtencexport/txtencexport.cxx index bce9b81b4564..7db93ba3a140 100644 --- a/sw/qa/extras/txtencexport/txtencexport.cxx +++ b/sw/qa/extras/txtencexport/txtencexport.cxx @@ -9,8 +9,6 @@ #include <swmodeltestbase.hxx> -#include <osl/thread.hxx> - class TxtEncExportTest : public SwModelTestBase { public: diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index d6d486919bcf..8c59dfdc5935 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -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> diff --git a/sw/qa/extras/uiwriter/uiwriter4.cxx b/sw/qa/extras/uiwriter/uiwriter4.cxx index d710155dc763..b3825a1535e5 100644 --- a/sw/qa/extras/uiwriter/uiwriter4.cxx +++ b/sw/qa/extras/uiwriter/uiwriter4.cxx @@ -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> diff --git a/sw/qa/extras/uiwriter/uiwriter6.cxx b/sw/qa/extras/uiwriter/uiwriter6.cxx index ca5a8747939b..a9fa0858548a 100644 --- a/sw/qa/extras/uiwriter/uiwriter6.cxx +++ b/sw/qa/extras/uiwriter/uiwriter6.cxx @@ -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> diff --git a/sw/qa/extras/uiwriter/uiwriter7.cxx b/sw/qa/extras/uiwriter/uiwriter7.cxx index b8d5b2f3eff0..38554544e212 100644 --- a/sw/qa/extras/uiwriter/uiwriter7.cxx +++ b/sw/qa/extras/uiwriter/uiwriter7.cxx @@ -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> diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx index 35bff9a42124..298bdbaa8e02 100644 --- a/sw/qa/extras/ww8export/ww8export.cxx +++ b/sw/qa/extras/ww8export/ww8export.cxx @@ -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> diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx index 419206c56f00..546c0457c1c0 100644 --- a/sw/source/core/access/acccell.cxx +++ b/sw/source/core/access/acccell.cxx @@ -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> diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index 76638a251913..601e05a98e09 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -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> diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx index d2d3217c9297..c9a1ea73e8a8 100644 --- a/sw/source/core/access/accframebase.cxx +++ b/sw/source/core/access/accframebase.cxx @@ -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> diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index e8a106aa5892..d5c30b9d9be0 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -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> diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 6de03d5abdc2..f8e3b5966f91 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -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> diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx index d7aaaa560e1e..9f43435a7dc4 100644 --- a/sw/source/core/access/accportions.cxx +++ b/sw/source/core/access/accportions.cxx @@ -19,8 +19,6 @@ #include <sal/config.h> -#include <string_view> - #include "accportions.hxx" #include <osl/diagnose.h> #include <rtl/ustring.hxx> diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx index 5f88e36abebc..81a249203dc8 100644 --- a/sw/source/core/attr/calbck.cxx +++ b/sw/source/core/attr/calbck.cxx @@ -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> diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx index bbb1cddd1576..94b6af99df68 100644 --- a/sw/source/core/attr/format.cxx +++ b/sw/source/core/attr/format.cxx @@ -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; diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx index 02983568e0f9..07efe7528f3b 100644 --- a/sw/source/core/bastyp/calc.cxx +++ b/sw/source/core/bastyp/calc.cxx @@ -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> diff --git a/sw/source/core/crsr/DateFormFieldButton.cxx b/sw/source/core/crsr/DateFormFieldButton.cxx index 4d6510f9b6a2..b16845a63318 100644 --- a/sw/source/core/crsr/DateFormFieldButton.cxx +++ b/sw/source/core/crsr/DateFormFieldButton.cxx @@ -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) diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index e4b1d55b1d9e..eb5caf60a0ab 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -19,7 +19,6 @@ #include <config_wasm_strip.h> -#include <memory> #include <com/sun/star/text/XTextRange.hpp> #include <hintids.hxx> diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx index 896d7108c0b1..c54d500cb15d 100644 --- a/sw/source/core/crsr/pam.cxx +++ b/sw/source/core/crsr/pam.cxx @@ -19,8 +19,6 @@ #include <sal/config.h> -#include <string_view> - #include <tools/gen.hxx> #include <editeng/protitem.hxx> #include <officecfg/Office/Common.hxx> diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx index c7915021be87..e1f3b7a0d58e 100644 --- a/sw/source/core/doc/DocumentFieldsManager.cxx +++ b/sw/source/core/doc/DocumentFieldsManager.cxx @@ -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> diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx index dfed2005eaa9..ced0488228e4 100644 --- a/sw/source/core/doc/dbgoutsw.cxx +++ b/sw/source/core/doc/dbgoutsw.cxx @@ -41,7 +41,6 @@ #include <SwNodeNum.hxx> #include <dbgoutsw.hxx> #include <frameformats.hxx> -#include <iostream> #include <cstdio> static OString aDbgOutResult; diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index a325c487702b..779d07a14851 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -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; diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index 128c2dcd925e..6fd9c72928c9 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -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> diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index 667cb4283207..72182b7435d0 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -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> diff --git a/sw/source/core/doc/list.cxx b/sw/source/core/doc/list.cxx index 8ae6ecc1c18f..7965856519cc 100644 --- a/sw/source/core/doc/list.cxx +++ b/sw/source/core/doc/list.cxx @@ -19,7 +19,6 @@ #include <list.hxx> -#include <vector> #include <numrule.hxx> #include <ndarr.hxx> #include <node.hxx> diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index 96ed231f8ab7..a4cbbe7cd531 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -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> diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx index b685c265ddd5..135d558bb702 100644 --- a/sw/source/core/doc/tblcpy.cxx +++ b/sw/source/core/doc/tblcpy.cxx @@ -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> diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx index 6c0a2a3a9cc4..84f281b9fe91 100644 --- a/sw/source/core/docnode/ndsect.cxx +++ b/sw/source/core/docnode/ndsect.cxx @@ -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> diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index 05100a091cd5..330ffa5fe5f6 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -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> diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx index b7e0aa638839..93b787c9176a 100644 --- a/sw/source/core/draw/dview.cxx +++ b/sw/source/core/draw/dview.cxx @@ -58,7 +58,6 @@ #include <vector> #include <sortedobjs.hxx> -#include <UndoManager.hxx> using namespace com::sun::star; diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx index 0cb794e23847..75b45488465d 100644 --- a/sw/source/core/edit/acorrect.cxx +++ b/sw/source/core/edit/acorrect.cxx @@ -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> diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx index 61cfd7d9a923..094febba9b97 100644 --- a/sw/source/core/edit/edfcol.cxx +++ b/sw/source/core/edit/edfcol.cxx @@ -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) diff --git a/sw/source/core/edit/edfld.cxx b/sw/source/core/edit/edfld.cxx index b08f1b247a8d..9bd2ba252a2f 100644 --- a/sw/source/core/edit/edfld.cxx +++ b/sw/source/core/edit/edfld.cxx @@ -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> diff --git a/sw/source/core/edit/edfmt.cxx b/sw/source/core/edit/edfmt.cxx index f43fa05cd670..3e5c735c59c3 100644 --- a/sw/source/core/edit/edfmt.cxx +++ b/sw/source/core/edit/edfmt.cxx @@ -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> diff --git a/sw/source/core/edit/edglbldc.cxx b/sw/source/core/edit/edglbldc.cxx index cfc7453a902a..092cd786de30 100644 --- a/sw/source/core/edit/edglbldc.cxx +++ b/sw/source/core/edit/edglbldc.cxx @@ -29,7 +29,6 @@ #include <section.hxx> #include <doctxm.hxx> #include <edglbldc.hxx> -#include <osl/diagnose.h> bool SwEditShell::IsGlobalDoc() const { diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx index 3348540fcf29..b1d265305321 100644 --- a/sw/source/core/edit/editsh.cxx +++ b/sw/source/core/edit/editsh.cxx @@ -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> diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx index 6e71649c1e2f..b1798aa1d305 100644 --- a/sw/source/core/edit/edlingu.cxx +++ b/sw/source/core/edit/edlingu.cxx @@ -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> diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx index 8e46f915c35e..3304ddb19435 100644 --- a/sw/source/core/edit/ednumber.cxx +++ b/sw/source/core/edit/ednumber.cxx @@ -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()) diff --git a/sw/source/core/edit/edundo.cxx b/sw/source/core/edit/edundo.cxx index 826d3154ff78..df45c8bc9303 100644 --- a/sw/source/core/edit/edundo.cxx +++ b/sw/source/core/edit/edundo.cxx @@ -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> diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx index d32efeaec2df..e78a089caa35 100644 --- a/sw/source/core/fields/dbfld.cxx +++ b/sw/source/core/fields/dbfld.cxx @@ -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> diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index 902a7bcea33a..798cd337f5c8 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -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> diff --git a/sw/source/core/fields/fldlst.cxx b/sw/source/core/fields/fldlst.cxx index 39b5ec2c181c..24eb3e1a43ea 100644 --- a/sw/source/core/fields/fldlst.cxx +++ b/sw/source/core/fields/fldlst.cxx @@ -24,7 +24,6 @@ #include <fmtfld.hxx> #include <txtfld.hxx> #include <expfld.hxx> -#include <pam.hxx> #include <docfld.hxx> #include <ndtxt.hxx> diff --git a/sw/source/core/fields/usrfld.cxx b/sw/source/core/fields/usrfld.cxx index babb15c3fc32..0067d3b6d7c4 100644 --- a/sw/source/core/fields/usrfld.cxx +++ b/sw/source/core/fields/usrfld.cxx @@ -24,7 +24,6 @@ #include <o3tl/any.hxx> #include <svl/numformat.hxx> -#include <svl/zforlist.hxx> #include <unotools/charclass.hxx> #include <calc.hxx> diff --git a/sw/source/core/graphic/GraphicSizeCheck.cxx b/sw/source/core/graphic/GraphicSizeCheck.cxx index 50b1cb70a8f2..d01436e3fb6b 100644 --- a/sw/source/core/graphic/GraphicSizeCheck.cxx +++ b/sw/source/core/graphic/GraphicSizeCheck.cxx @@ -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; diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index a541f3681af7..46176999e6d1 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -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> diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index 9fb4575e98c8..891ff1574bb6 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -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> diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index 123f1f5dd02e..8de89c9b7629 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -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> diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx index bcaa65233364..cf6aa1f41029 100644 --- a/sw/source/core/layout/flycnt.cxx +++ b/sw/source/core/layout/flycnt.cxx @@ -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> diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx index ef57a72c5560..8ffa9ff3d860 100644 --- a/sw/source/core/layout/flylay.cxx +++ b/sw/source/core/layout/flylay.cxx @@ -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> diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx b/sw/source/core/layout/objectformattertxtfrm.cxx index d0fa8cf1be84..e250f7c43680 100644 --- a/sw/source/core/layout/objectformattertxtfrm.cxx +++ b/sw/source/core/layout/objectformattertxtfrm.cxx @@ -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; diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx index 120b43f10963..418bf6b2358f 100644 --- a/sw/source/core/layout/pagedesc.cxx +++ b/sw/source/core/layout/pagedesc.cxx @@ -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> diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 696860a66f83..53142f0730c6 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -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> diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index bcc4ddce252a..5b322676330d 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -63,7 +63,6 @@ #include <layact.hxx> #include <ndtxt.hxx> #include <swtable.hxx> -#include <tblsel.hxx> // RotateFlyFrame3 #include <basegfx/matrix/b2dhommatrixtools.hxx> diff --git a/sw/source/core/swg/SwXMLSectionList.cxx b/sw/source/core/swg/SwXMLSectionList.cxx index 47740a6d51c0..42ed3e736398 100644 --- a/sw/source/core/swg/SwXMLSectionList.cxx +++ b/sw/source/core/swg/SwXMLSectionList.cxx @@ -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; diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 7f2b5aef976c..8d033cf28ab0 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -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> diff --git a/sw/source/core/text/frminf.cxx b/sw/source/core/text/frminf.cxx index bd1e742ea6a7..a123691db703 100644 --- a/sw/source/core/text/frminf.cxx +++ b/sw/source/core/text/frminf.cxx @@ -19,8 +19,6 @@ #include <sal/config.h> -#include <o3tl/safeint.hxx> - #include <frminf.hxx> #include "itrtxt.hxx" diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 7408e17f43c0..32219500921a 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -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> diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx index fc1b28f990d4..f2877273f088 100644 --- a/sw/source/core/text/porfly.cxx +++ b/sw/source/core/text/porfly.cxx @@ -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" diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx index 84c6837d56c1..4601d78cb64b 100644 --- a/sw/source/core/text/porlay.cxx +++ b/sw/source/core/text/porlay.cxx @@ -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; diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx index b5e98e913f14..fe76923bc337 100644 --- a/sw/source/core/text/porrst.cxx +++ b/sw/source/core/text/porrst.cxx @@ -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> diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index 7afb53d29a9c..e1c33c85cf2f 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -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> diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 074bd82f5dc7..71513b183599 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -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> diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index 2ac714a1d02e..b6ca240fcffd 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -74,7 +74,6 @@ #include <algorithm> #include <map> #include <memory> -#include <unordered_map> #include <rdfhelper.hxx> #include <hints.hxx> diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx index 8265ac6e6617..fa88f6179442 100644 --- a/sw/source/core/undo/undobj1.cxx +++ b/sw/source/core/undo/undobj1.cxx @@ -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()) diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index 2af21afa418f..213d17c72060 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -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> diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx index 81a7cf0ac793..84ff2dd8a781 100644 --- a/sw/source/core/unocore/unobkm.cxx +++ b/sw/source/core/unocore/unobkm.cxx @@ -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> diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index 9f6884d7d087..e4f18b7a3b17 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -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> diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index 98eb107977be..b2d521c6d44e 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -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> diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx index df26fa679d6c..b8e6f166fc80 100644 --- a/sw/source/core/unocore/unomap.cxx +++ b/sw/source/core/unocore/unomap.cxx @@ -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> diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx index 428f64a53503..7e6df7e7796b 100644 --- a/sw/source/core/unocore/unoparagraph.cxx +++ b/sw/source/core/unocore/unoparagraph.cxx @@ -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> diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx index 53c12ab255a5..54adc9628f73 100644 --- a/sw/source/core/unocore/unorefmk.cxx +++ b/sw/source/core/unocore/unorefmk.cxx @@ -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> diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx index a19baae82840..148a308497d2 100644 --- a/sw/source/core/unocore/unosect.cxx +++ b/sw/source/core/unocore/unosect.cxx @@ -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> diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index 3c681ae8ff6d..5a94663ff121 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -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; diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 7033107bf720..39ebb99e2355 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -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> diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx index f191bc2f198d..95504f6b1b79 100644 --- a/sw/source/core/view/printdata.cxx +++ b/sw/source/core/view/printdata.cxx @@ -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> diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx index 194918c308b3..11029bb87bed 100644 --- a/sw/source/core/view/vdraw.cxx +++ b/sw/source/core/view/vdraw.cxx @@ -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> diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx index d6bf3833e2fb..d9f2c63267ad 100644 --- a/sw/source/core/view/viewimp.cxx +++ b/sw/source/core/view/viewimp.cxx @@ -26,7 +26,6 @@ #include <flyfrm.hxx> #include <layact.hxx> #include <dview.hxx> -#include <swmodule.hxx> #include <svx/svdpage.hxx> #include <accmap.hxx> diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index bb412cc25098..b2415419eb5e 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -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> diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx index 9e80ade94244..86395100501d 100644 --- a/sw/source/filter/basflt/iodetect.cxx +++ b/sw/source/filter/basflt/iodetect.cxx @@ -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> diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 86a21f594f22..12a5a8c912dd 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -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> diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index e8c965d6547d..ee46ff297821 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -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> diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 655db333d94e..b40633119673 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -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> diff --git a/sw/source/filter/indexing/IndexingExport.cxx b/sw/source/filter/indexing/IndexingExport.cxx index 7bc1b60e3b74..3839b5598875 100644 --- a/sw/source/filter/indexing/IndexingExport.cxx +++ b/sw/source/filter/indexing/IndexingExport.cxx @@ -12,7 +12,6 @@ #include <ndtxt.hxx> #include <ndole.hxx> -#include <ndnotxt.hxx> #include <ndgrf.hxx> #include <svx/svdobj.hxx> #include <svx/svdotext.hxx> diff --git a/sw/source/filter/indexing/IndexingExportFilter.cxx b/sw/source/filter/indexing/IndexingExportFilter.cxx index 13001764a573..6ac3b6e3a88b 100644 --- a/sw/source/filter/indexing/IndexingExportFilter.cxx +++ b/sw/source/filter/indexing/IndexingExportFilter.cxx @@ -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> diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 1eda7bc94f8b..efb786086f76 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -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> diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx index 7f8f86ac48ee..355770e4e1c1 100644 --- a/sw/source/filter/ww8/docxsdrexport.cxx +++ b/sw/source/filter/ww8/docxsdrexport.cxx @@ -10,10 +10,8 @@ #include "docxsdrexport.hxx" #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/PointSequenceSequence.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp> #include <editeng/lrspitem.hxx> #include <editeng/ulspitem.hxx> -#include <editeng/unoprnms.hxx> #include <editeng/shaditem.hxx> #include <editeng/opaqitem.hxx> #include <editeng/boxitem.hxx> @@ -39,12 +37,9 @@ #include <comphelper/flagguard.hxx> #include <comphelper/sequence.hxx> #include <comphelper/sequenceashashmap.hxx> -#include <sal/log.hxx> #include <frmfmt.hxx> #include <IDocumentDrawModelAccess.hxx> -#include <tools/diagnose_ex.h> -#include <svx/xlnwtit.hxx> #include <svx/svdtrans.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index d9a90438259f..f9746b13fa00 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -46,9 +46,7 @@ #include <editeng/eeitem.hxx> #include <editeng/formatbreakitem.hxx> #include <svx/svdouno.hxx> -#include <svx/unoapi.hxx> #include <svx/svdview.hxx> -#include <svx/unopage.hxx> #include <fmtcnct.hxx> #include <fmtanchr.hxx> #include <fmtsrnd.hxx> @@ -87,7 +85,6 @@ #include <fmturl.hxx> #include <frameformats.hxx> #include <sfx2/sfxsids.hrc> -#include <unotools/saveopt.hxx> #include <o3tl/enumrange.hxx> #include <o3tl/enumarray.hxx> #include <sfx2/docfile.hxx> diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx index b60d0927dd29..846a1eb48c70 100644 --- a/sw/source/filter/ww8/wrtw8num.cxx +++ b/sw/source/filter/ww8/wrtw8num.cxx @@ -34,8 +34,6 @@ #include "wrtww8.hxx" #include "ww8par.hxx" -#include <numeric> - using namespace ::com::sun::star; using namespace sw::types; using namespace sw::util; diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx index 5ec3a93a5059..68bf9eb1e760 100644 --- a/sw/source/filter/ww8/ww8graf2.cxx +++ b/sw/source/filter/ww8/ww8graf2.cxx @@ -25,7 +25,6 @@ #include <svx/svdograf.hxx> #include <svx/svdoole2.hxx> #include <filter/msfilter/msdffimp.hxx> -#include <unotools/configmgr.hxx> #include <grfatr.hxx> #include <fmtanchr.hxx> #include <fmtcntnt.hxx> diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 0feefd11d681..292b4475a216 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -57,7 +57,6 @@ #include <editeng/charhiddenitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/editeng.hxx> -#include <svx/unoapi.hxx> #include <svx/svdoole2.hxx> #include <svx/svdoashp.hxx> #include <svx/svxerr.hxx> diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index f74d8946e84f..60021665ad42 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -61,7 +61,6 @@ #include <numrule.hxx> #include "sprmids.hxx" #include <wwstyles.hxx> -#include "writerhelper.hxx" #include "ww8struc.hxx" #include "ww8par.hxx" #include "ww8par2.hxx" diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx index ff6ea0490028..613025003d7a 100644 --- a/sw/source/filter/ww8/ww8par4.cxx +++ b/sw/source/filter/ww8/ww8par4.cxx @@ -31,7 +31,6 @@ #include <svx/svdoole2.hxx> #include <filter/msfilter/msdffimp.hxx> #include "sprmids.hxx" -#include <svx/unoapi.hxx> #include <sal/log.hxx> #include <osl/diagnose.h> diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 2352dfd1c12e..963fecb13c0a 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -99,7 +99,6 @@ #include "ww8graf.hxx" #include <fmtwrapinfluenceonobjpos.hxx> -#include <textlinebreak.hxx> using namespace sw::util; using namespace sw::types; diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index 1d55cad903d2..830d989c8b5e 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/document/XExporter.hpp> #include <com/sun/star/document/XFilter.hpp> #include <com/sun/star/frame/XModule.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <officecfg/Office/Common.hxx> #include <comphelper/fileformat.h> @@ -37,10 +36,8 @@ #include <vcl/errinf.hxx> #include <osl/diagnose.h> #include <sal/log.hxx> -#include <o3tl/any.hxx> #include <svx/xmlgrhlp.hxx> #include <svx/xmleohlp.hxx> -#include <unotools/saveopt.hxx> #include <svl/stritem.hxx> #include <sfx2/frame.hxx> #include <sfx2/docfile.hxx> diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 6afabdd855e3..97d0d5bd385a 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -30,7 +30,6 @@ #include <o3tl/any.hxx> #include <xmloff/xmlnamespace.hxx> -#include <xmloff/xmltkmap.hxx> #include <xmloff/xmlictxt.hxx> #include <xmloff/txtimp.hxx> #include <xmloff/XMLTextShapeImportHelper.hxx> @@ -62,7 +61,6 @@ #include <svx/xmleohlp.hxx> #include <sfx2/printer.hxx> #include <xmloff/xmluconv.hxx> -#include <unotools/saveopt.hxx> #include <unotools/streamwrap.hxx> #include <tools/UnitConversion.hxx> #include <tools/diagnose_ex.h> diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx index 1d570b64a914..3989fb59b7cd 100644 --- a/sw/source/filter/xml/xmliteme.cxx +++ b/sw/source/filter/xml/xmliteme.cxx @@ -34,7 +34,6 @@ #include "xmlexp.hxx" #include <editeng/memberids.h> #include <editeng/prntitem.hxx> -#include <xmloff/xmlnamespace.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 413332ddc498..96c10b3546b4 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -34,7 +34,6 @@ #include <sax/tools/converter.hxx> #include <unotools/configmgr.hxx> #include <xmloff/xmlnamespace.hxx> -#include <xmloff/xmltkmap.hxx> #include <xmloff/namespacemap.hxx> #include <xmloff/families.hxx> diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx index 124ccddc95e1..140204d3dcb6 100644 --- a/sw/source/filter/xml/xmltexte.cxx +++ b/sw/source/filter/xml/xmltexte.cxx @@ -19,8 +19,6 @@ #include <sal/config.h> -#include <string_view> - #include <comphelper/classids.hxx> #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/embed/XLinkageSupport.hpp> diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index 4200421b5c62..1c48efe3eae6 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -63,7 +63,6 @@ #include <svl/urihelper.hxx> #include <sfx2/frmdescr.hxx> #include <tools/globname.hxx> -#include <tools/UnitConversion.hxx> #include <algorithm> #include <utility> diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index 848d424b6db0..663faf7be2c6 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -36,8 +36,6 @@ #include <officecfg/Office/Compatibility.hxx> #include <osl/diagnose.h> -#include <com/sun/star/beans/PropertyValue.hpp> - using namespace ::com::sun::star::beans; using namespace ::com::sun::star::document; using namespace ::com::sun::star::uno; diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index 36803bcde5b6..1fec0f8612d5 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -27,7 +27,6 @@ #include "customizeaddresslistdialog.hxx" #include <mmconfigitem.hxx> #include <vcl/svapp.hxx> -#include <unotools/pathoptions.hxx> #include <sfx2/filedlghelper.hxx> #include <sfx2/docfile.hxx> #include <rtl/textenc.h> diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx index 7e92af1a02ad..180a6d044168 100644 --- a/sw/source/ui/dbui/mmdocselectpage.cxx +++ b/sw/source/ui/dbui/mmdocselectpage.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <unotools/pathoptions.hxx> #include <sfx2/filedlghelper.hxx> #include <sfx2/new.hxx> #include <sfx2/docfilt.hxx> diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index dd5211277832..83634fbecb6d 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -81,7 +81,6 @@ #include <optload.hxx> #include <optpage.hxx> #include <swuiidxmrk.hxx> -#include <svl/numformat.hxx> #include <svx/dialogs.hrc> #include <mailmergewizard.hxx> #include <mailconfigpage.hxx> diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx index 893da83a9d7a..d8129dce3aa8 100644 --- a/sw/source/ui/envelp/labprt.cxx +++ b/sw/source/ui/envelp/labprt.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <osl/diagnose.h> #include <svtools/prnsetup.hxx> #include <unotools/cmdoptions.hxx> #include <vcl/print.hxx> diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 8c65eb766788..bf9dc812e16c 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -45,7 +45,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/sdbcx/XRowLocate.hpp> #include <com/sun/star/sdb/XResultSetAccess.hpp> -#include <com/sun/star/ui/dialogs/FolderPicker.hpp> +#include <com/sun/star/ui/dialogs/XFolderPicker2.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <comphelper/processfactory.hxx> #include <cppuhelper/implbase.hxx> diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index 39cffc34f4b9..90595da0450c 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -19,8 +19,6 @@ #include <sal/config.h> -#include <string_view> - #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/sdb/DatabaseContext.hpp> #include <com/sun/star/sdb/CommandType.hpp> diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 86e61c60e705..0de35805ad2c 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -18,7 +18,6 @@ */ #include <sfx2/frame.hxx> -#include <sfx2/sfxsids.hrc> #include <svl/numformat.hxx> #include <svl/zforlist.hxx> #include <svl/zformat.hxx> diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index a48a939dfbeb..ebcfec09a14d 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -28,7 +28,6 @@ #include <vcl/mnemonic.hxx> #include <svl/stritem.hxx> #include <sfx2/htmlmode.hxx> -#include <editeng/sizeitem.hxx> #include <editeng/opaqitem.hxx> #include <editeng/protitem.hxx> #include <editeng/prntitem.hxx> diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 02e9f20454c0..e19881eeeed0 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -50,7 +50,6 @@ #include <fldbas.hxx> #include <strings.hrc> #include <svl/cjkoptions.hxx> -#include <comphelper/fileurl.hxx> #include <sfx2/filedlghelper.hxx> #include <ndtxt.hxx> #include <SwRewriter.hxx> diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index 2d3dc8351f21..6b54d3821bd6 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -19,7 +19,6 @@ #include <cmdid.h> #include <hintids.hxx> -#include <swtypes.hxx> #include <svx/colorbox.hxx> #include <editeng/sizeitem.hxx> #include <editeng/lrspitem.hxx> diff --git a/sw/source/ui/vba/vbadocuments.cxx b/sw/source/ui/vba/vbadocuments.cxx index 63360919c845..363d4f57ad10 100644 --- a/sw/source/ui/vba/vbadocuments.cxx +++ b/sw/source/ui/vba/vbadocuments.cxx @@ -19,7 +19,6 @@ #include <com/sun/star/text/XTextDocument.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <tools/urlobj.hxx> #include <rtl/ref.hxx> diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx index 47af40becc01..1ea666ccdf61 100644 --- a/sw/source/uibase/app/applab.cxx +++ b/sw/source/uibase/app/applab.cxx @@ -23,7 +23,6 @@ #include <hintids.hxx> #include <comphelper/string.hxx> -#include <o3tl/deleter.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/printer.hxx> #include <sfx2/request.hxx> diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx index 77033c4940f0..8334dea7a785 100644 --- a/sw/source/uibase/app/appopt.cxx +++ b/sw/source/uibase/app/appopt.cxx @@ -56,8 +56,6 @@ #include <swabstdlg.hxx> #include <swwrtshitem.hxx> -#include <ndtxt.hxx> - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 1be72f73fec8..caa360f50fbd 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -26,7 +26,6 @@ #include <vcl/jobset.hxx> #include <svl/numformat.hxx> #include <svl/whiter.hxx> -#include <svl/zforlist.hxx> #include <svl/eitem.hxx> #include <svl/stritem.hxx> #include <svl/PasswordHelper.hxx> @@ -80,7 +79,6 @@ #include <strings.hrc> #include <unotools/fltrcfg.hxx> -#include <svtools/htmlcfg.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/objface.hxx> diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index 4568f8ee685b..4ae4b02ac42a 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -37,7 +37,6 @@ #include <vcl/weld.hxx> #include <svl/eitem.hxx> #include <svl/macitem.hxx> -#include <svl/zforlist.hxx> #include <unotools/pathoptions.hxx> #include <vcl/transfer.hxx> #include <sfx2/dinfdlg.hxx> @@ -58,7 +57,6 @@ #include <sfx2/classificationhelper.hxx> #include <sfx2/watermarkitem.hxx> -#include <svtools/htmlcfg.hxx> #include <svx/ofaitem.hxx> #include <SwSmartTagMgr.hxx> #include <sfx2/app.hxx> diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx index 3694c51a0367..21cefad272cd 100644 --- a/sw/source/uibase/app/docshini.cxx +++ b/sw/source/uibase/app/docshini.cxx @@ -31,7 +31,6 @@ #include <sfx2/printer.hxx> #include <svl/asiancfg.hxx> #include <svl/intitem.hxx> -#include <tools/UnitConversion.hxx> #include <editeng/adjustitem.hxx> #include <editeng/autokernitem.hxx> #include <com/sun/star/document/UpdateDocMode.hpp> @@ -74,7 +73,6 @@ #include <swerror.h> #include <unochart.hxx> #include <drawdoc.hxx> -#include <DocumentSettingManager.hxx> #include <svx/CommonStyleManager.hxx> diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx index b4456c3066dc..a891a53daa90 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -39,7 +39,6 @@ #include <sfx2/printer.hxx> #include <sfx2/viewfrm.hxx> #include <svl/stritem.hxx> -#include <svl/languageoptions.hxx> #include <svl/ctloptions.hxx> #include <sfx2/htmlmode.hxx> #include <swmodule.hxx> @@ -75,7 +74,6 @@ #include <edtwin.hxx> #include <unochart.hxx> #include <swabstdlg.hxx> -#include <paratr.hxx> #include <tblafmt.hxx> #include <sfx2/watermarkitem.hxx> #include <svl/grabbagitem.hxx> diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx index 1eab72ad12a9..efaf6853e0ad 100644 --- a/sw/source/uibase/app/docstyle.cxx +++ b/sw/source/uibase/app/docstyle.cxx @@ -66,7 +66,6 @@ #include <svx/xfillit0.hxx> #include <svx/xflftrit.hxx> #include <svx/drawitem.hxx> -#include <editeng/eeitem.hxx> using namespace com::sun::star; diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx index f564a36d0ed0..b233bd7c989c 100644 --- a/sw/source/uibase/app/swmodule.cxx +++ b/sw/source/uibase/app/swmodule.cxx @@ -19,7 +19,6 @@ #include <config_features.h> -#include <hintids.hxx> #include <svtools/ehdl.hxx> #include <svtools/accessibilityoptions.hxx> #include <unotools/resmgr.hxx> diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx index 5e802b8a6efc..03df98e9a192 100644 --- a/sw/source/uibase/dbui/mailmergehelper.cxx +++ b/sw/source/uibase/dbui/mailmergehelper.cxx @@ -35,7 +35,6 @@ #include <o3tl/safeint.hxx> #include <vcl/event.hxx> #include <vcl/settings.hxx> -#include <vcl/svapp.hxx> #include <vcl/weldutils.hxx> #include <tools/diagnose_ex.h> diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.cxx b/sw/source/uibase/docvw/AnchorOverlayObject.cxx index 817d8260e142..482bc6b8304f 100644 --- a/sw/source/uibase/docvw/AnchorOverlayObject.cxx +++ b/sw/source/uibase/docvw/AnchorOverlayObject.cxx @@ -28,9 +28,11 @@ #include <tools/long.hxx> #include <sw_primitivetypes2d.hxx> +#include <drawinglayer/attribute/lineattribute.hxx> +#include <drawinglayer/attribute/strokeattribute.hxx> #include <drawinglayer/primitive2d/primitivetools2d.hxx> -#include <drawinglayer/primitive2d/PolygonStrokeArrowPrimitive2D.hxx> #include <drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx> +#include <drawinglayer/primitive2d/PolygonStrokePrimitive2D.hxx> namespace sw::sidebarwindows { diff --git a/sw/source/uibase/docvw/FrameControlsManager.cxx b/sw/source/uibase/docvw/FrameControlsManager.cxx index 75ad1b600ed9..ac2d58918a1c 100644 --- a/sw/source/uibase/docvw/FrameControlsManager.cxx +++ b/sw/source/uibase/docvw/FrameControlsManager.cxx @@ -19,8 +19,6 @@ #include <view.hxx> #include <wrtsh.hxx> #include <OutlineContentVisibilityWin.hxx> -#include <ndtxt.hxx> -#include <IDocumentOutlineNodes.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/weldutils.hxx> diff --git a/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx b/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx index 3e16a5e0997f..33d0b72ffd41 100644 --- a/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx +++ b/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx @@ -19,7 +19,6 @@ #include <vcl/event.hxx> #include <vcl/svapp.hxx> #include <strings.hrc> -#include <svx/svdview.hxx> #include <viewopt.hxx> diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx index 8502601e8b1e..789e6289b49d 100644 --- a/sw/source/uibase/docvw/SidebarTxtControl.cxx +++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx @@ -25,7 +25,6 @@ #include <doc.hxx> #include <PostItMgr.hxx> -#include <edtwin.hxx> #include <cmdid.h> #include <strings.hrc> @@ -39,8 +38,9 @@ #include <sfx2/sfxhelp.hxx> #include <vcl/commandevent.hxx> +#include <vcl/event.hxx> +#include <vcl/ptrstyle.hxx> #include <vcl/svapp.hxx> -#include <vcl/help.hxx> #include <vcl/weld.hxx> #include <vcl/gradient.hxx> #include <vcl/settings.hxx> @@ -49,8 +49,6 @@ #include <editeng/editeng.hxx> #include <editeng/editview.hxx> #include <editeng/flditem.hxx> -#include <comphelper/lok.hxx> -#include <sfx2/lokhelper.hxx> #include <uitool.hxx> #include <view.hxx> diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx index f1c5b7c37eec..368d4e96727a 100644 --- a/sw/source/uibase/docvw/edtwin2.cxx +++ b/sw/source/uibase/docvw/edtwin2.cxx @@ -51,7 +51,6 @@ #include <IDocumentRedlineAccess.hxx> #include <txtfrm.hxx> #include <ndtxt.hxx> -#include <FrameControlsManager.hxx> #include <comphelper/lok.hxx> #include <authfld.hxx> diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index 538467c8561c..7bed942acbf5 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -34,7 +34,6 @@ #include <swwait.hxx> #include <uitool.hxx> -#include <helpids.h> #include <cmdid.h> #include <strings.hrc> diff --git a/sw/source/uibase/ribbar/concustomshape.cxx b/sw/source/uibase/ribbar/concustomshape.cxx index da15182d17f0..e830a447a374 100644 --- a/sw/source/uibase/ribbar/concustomshape.cxx +++ b/sw/source/uibase/ribbar/concustomshape.cxx @@ -36,8 +36,6 @@ #include <svx/xfillit0.hxx> #include <editeng/adjustitem.hxx> -#include <math.h> - using namespace com::sun::star; ConstCustomShape::ConstCustomShape( SwWrtShell* pWrtShell, SwEditWin* pEditWin, SwView* pSwView, SfxRequest const & rReq ) diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index fda33da3dc12..a5e78b5f6288 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -19,8 +19,6 @@ #include <sal/config.h> -#include <string_view> - #include <i18nutil/unicode.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/bindings.hxx> @@ -49,10 +47,7 @@ #include <svx/strings.hrc> #include <bitmaps.hlst> #include <toolkit/helper/vclunohelper.hxx> -#include <svx/srchdlg.hxx> -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/util/XURLTransformer.hpp> #include <sfx2/viewfrm.hxx> diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index a4d1bc7e336b..aee2526f8029 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -19,7 +19,6 @@ #include <config_features.h> #include <config_fuzzers.h> -#include <config_wasm_strip.h> #include <sal/config.h> diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx index b31e7eb38cd8..8679a3fc4d47 100644 --- a/sw/source/uibase/shells/drwbassh.cxx +++ b/sw/source/uibase/shells/drwbassh.cxx @@ -52,8 +52,6 @@ #include <vcl/unohelp2.hxx> #include <swabstdlg.hxx> #include <swundo.hxx> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/VertOrientation.hpp> #include <com/sun/star/text/RelOrientation.hpp> diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx index 101e970ad2cb..0891d65c57d8 100644 --- a/sw/source/uibase/shells/drwtxtex.cxx +++ b/sw/source/uibase/shells/drwtxtex.cxx @@ -79,7 +79,6 @@ #include <wview.hxx> #include <swabstdlg.hxx> -#include <memory> using namespace ::com::sun::star; diff --git a/sw/source/uibase/shells/mediash.cxx b/sw/source/uibase/shells/mediash.cxx index 2eeffe659989..fb106cc2ea77 100644 --- a/sw/source/uibase/shells/mediash.cxx +++ b/sw/source/uibase/shells/mediash.cxx @@ -30,7 +30,6 @@ #define ShellClass_SwMediaShell #include <swslots.hxx> -#include <memory> using namespace svx; diff --git a/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx b/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx index 33d2ae6774e0..f6488f384344 100644 --- a/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx +++ b/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx @@ -31,7 +31,6 @@ #include <com/sun/star/text/XTextRangeCompare.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/table/BorderLine2.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> diff --git a/sw/source/uibase/uitest/uiobject.cxx b/sw/source/uibase/uitest/uiobject.cxx index 5f8a408c4b85..52b27ab3955e 100644 --- a/sw/source/uibase/uitest/uiobject.cxx +++ b/sw/source/uibase/uitest/uiobject.cxx @@ -12,7 +12,6 @@ #include <edtwin.hxx> #include <view.hxx> #include <wrtsh.hxx> -#include <navipi.hxx> #include <ndtxt.hxx> #include <viewopt.hxx> #include <sfx2/sidebar/Sidebar.hxx> diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index 80c6bc3c6f2b..4ae41bb68fff 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -27,7 +27,6 @@ #include <vcl/syswin.hxx> #include <vcl/weld.hxx> -#include <rtl/ustrbuf.hxx> #include <svl/whiter.hxx> #include <svl/slstitm.hxx> #include <svl/eitem.hxx> diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx index 050df4445d0c..e4a1e0891e82 100644 --- a/sw/source/uibase/uiview/srcview.cxx +++ b/sw/source/uibase/uiview/srcview.cxx @@ -29,7 +29,6 @@ #include <vcl/svapp.hxx> #include <svl/intitem.hxx> #include <svl/stritem.hxx> -#include <unotools/pathoptions.hxx> #include <svl/undo.hxx> #include <svl/eitem.hxx> #include <svl/whiter.hxx> diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index bd7bc6be0b17..c387d6938350 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -39,8 +39,6 @@ #include <sfx2/docfile.hxx> #include <sfx2/objface.hxx> #include <sfx2/request.hxx> -#include <sfx2/event.hxx> -#include <sfx2/infobar.hxx> #include <svx/ruler.hxx> #include <svx/srchdlg.hxx> #include <svx/fmshell.hxx> @@ -73,7 +71,6 @@ #include <gloshdl.hxx> #include <usrpref.hxx> #include <srcview.hxx> -#include <strings.hrc> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> #include <IDocumentSettingAccess.hxx> @@ -95,7 +92,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/sdb/XDatabaseContext.hpp> #include <com/sun/star/sdb/DatabaseContext.hpp> -#include <com/sun/star/sdbc/XDataSource.hpp> #include <toolkit/helper/vclunohelper.hxx> #include <sal/log.hxx> @@ -112,7 +108,6 @@ #include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <svtools/embedhlp.hxx> #include <tools/UnitConversion.hxx> -#include <svx/svdoutl.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx index a1cfb72330a5..1a80e02bb5a6 100644 --- a/sw/source/uibase/uiview/view0.cxx +++ b/sw/source/uibase/uiview/view0.cxx @@ -59,8 +59,6 @@ #include <swslots.hxx> #include <PostItMgr.hxx> -#include <ndtxt.hxx> - using namespace ::com::sun::star; #include <unotools/moduleoptions.hxx> diff --git a/sw/source/uibase/uiview/viewstat.cxx b/sw/source/uibase/uiview/viewstat.cxx index 2a672b23f8ed..cc26c1613a5b 100644 --- a/sw/source/uibase/uiview/viewstat.cxx +++ b/sw/source/uibase/uiview/viewstat.cxx @@ -25,7 +25,6 @@ #include <svl/cjkoptions.hxx> #include <sfx2/viewfrm.hxx> #include <svl/imageitm.hxx> -#include <svl/languageoptions.hxx> #include <sfx2/linkmgr.hxx> #include <editeng/langitem.hxx> #include <editeng/brushitem.hxx> diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx index 9f5d27972418..1506d197b850 100644 --- a/sw/source/uibase/uno/unomod.cxx +++ b/sw/source/uibase/uno/unomod.cxx @@ -23,7 +23,6 @@ #include <cppuhelper/supportsservice.hxx> #include <o3tl/any.hxx> #include <osl/diagnose.h> -#include <rtl/ustrbuf.hxx> #include <svl/itemprop.hxx> #include <tools/urlobj.hxx> #include <tools/UnitConversion.hxx> diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 333862f18887..b9cb5cab3db7 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -22,7 +22,6 @@ #include <comphelper/string.hxx> #include <AnnotationWin.hxx> #include <o3tl/any.hxx> -#include <osl/mutex.hxx> #include <vcl/virdev.hxx> #include <vcl/sysdata.hxx> #include <vcl/svapp.hxx> @@ -82,7 +81,6 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/lang/NoSupportException.hpp> -#include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/XFastPropertySet.hpp> #include <com/sun/star/document/RedlineDisplayType.hpp> @@ -112,7 +110,6 @@ #include <IDocumentStatistics.hxx> #include <IDocumentStylePoolAccess.hxx> #include <IDocumentState.hxx> -#include <svl/zforlist.hxx> #include <drawdoc.hxx> #include <SwStyleNameMapper.hxx> #include <osl/file.hxx> @@ -120,7 +117,6 @@ #include <comphelper/propertyvalue.hxx> #include <comphelper/storagehelper.hxx> #include <cppuhelper/supportsservice.hxx> -#include <unotools/saveopt.hxx> #include <swruler.hxx> #include <docufld.hxx> diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx index d1636de920e9..7a4751b9d202 100644 --- a/sw/source/uibase/uno/unotxvw.cxx +++ b/sw/source/uibase/uno/unotxvw.cxx @@ -20,7 +20,6 @@ #include <memory> #include <viscrs.hxx> #include <o3tl/any.hxx> -#include <sfx2/frame.hxx> #include <sfx2/printer.hxx> #include <sfx2/viewfrm.hxx> #include <cmdid.h> diff --git a/sw/source/uibase/utlui/bookctrl.cxx b/sw/source/uibase/utlui/bookctrl.cxx index 8fb7f59f2a9a..77567198257c 100644 --- a/sw/source/uibase/utlui/bookctrl.cxx +++ b/sw/source/uibase/utlui/bookctrl.cxx @@ -17,12 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <swtypes.hxx> -#include <strings.hrc> - #include <svl/intitem.hxx> #include <svl/slstitm.hxx> -#include <svl/eitem.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> #include <vcl/commandevent.hxx> diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 619424701fb6..fa5e28167be0 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -32,6 +32,7 @@ #include <vcl/weldutils.hxx> #include <sot/formats.hxx> #include <uiitems.hxx> +#include <fmtanchr.hxx> #include <fmtinfmt.hxx> #include <txtinet.hxx> #include <fmtfld.hxx> @@ -66,7 +67,6 @@ #include <com/sun/star/text/XBookmarksSupplier.hpp> #include <com/sun/star/text/XTextEmbeddedObjectsSupplier.hpp> #include <com/sun/star/text/XTextFramesSupplier.hpp> -#include <dcontact.hxx> #include <svx/svdpage.hxx> #include <svx/svdview.hxx> #include <SwRewriter.hxx> @@ -80,7 +80,6 @@ #include <swabstdlg.hxx> #include <bitmaps.hlst> -#include <navmgr.hxx> #include <AnnotationWin.hxx> #include <memory> @@ -90,19 +89,11 @@ #include <viewopt.hxx> #include <IDocumentFieldsAccess.hxx> -#include <IDocumentLayoutAccess.hxx> -#include <docfld.hxx> #include <txtfld.hxx> -#include <expfld.hxx> #include <fldmgr.hxx> -#include <docufld.hxx> #include <frameformats.hxx> -#include <unotextrange.hxx> -#include <com/sun/star/text/XTextRange.hpp> -#include <com/sun/star/text/XTextRangeCompare.hpp> - #include <ftnidx.hxx> #include <txtftn.hxx> #include <fmtftn.hxx> diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index a5949cace3f0..3d9f8f73394c 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -45,8 +45,6 @@ #include <memory> -#include <uiobject.hxx> - #include <o3tl/enumrange.hxx> #include <workctrl.hxx> diff --git a/sw/source/uibase/utlui/uitool.cxx b/sw/source/uibase/utlui/uitool.cxx index 0a9184a88610..1ead464c8963 100644 --- a/sw/source/uibase/utlui/uitool.cxx +++ b/sw/source/uibase/utlui/uitool.cxx @@ -64,7 +64,6 @@ #include <cmdid.h> #include <doc.hxx> -#include <docary.hxx> #include <charfmt.hxx> #include <SwStyleNameMapper.hxx> #include <strings.hrc> diff --git a/sw/source/uibase/wrtsh/delete.cxx b/sw/source/uibase/wrtsh/delete.cxx index c33f014f8f31..a2514381a15e 100644 --- a/sw/source/uibase/wrtsh/delete.cxx +++ b/sw/source/uibase/wrtsh/delete.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <cmdid.h> #include <hintids.hxx> #include <wrtsh.hxx> #include <swcrsr.hxx> diff --git a/sw/source/uibase/wrtsh/navmgr.cxx b/sw/source/uibase/wrtsh/navmgr.cxx index db97e2919146..7e7d2df1210f 100644 --- a/sw/source/uibase/wrtsh/navmgr.cxx +++ b/sw/source/uibase/wrtsh/navmgr.cxx @@ -17,9 +17,6 @@ #include <doc.hxx> #include <unocrsr.hxx> -#include <com/sun/star/frame/XLayoutManager.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> - // This method positions the cursor to the position rPos. void SwNavigationMgr::GotoSwPosition(const SwPosition &rPos) { |