diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2020-11-19 20:11:29 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-11-24 15:45:27 +0100 |
| commit | fe88ffb661053f8fff9bd77affdf4de820c43ca8 (patch) | |
| tree | dde9201a1a7e3d67cf6fe1b45296e57e89d60d1a /sw/source/core | |
| parent | 7c0fcb016718b25981903ad2b979e186638a6031 (diff) | |
tdf#42949 Fix new IWYU warnings in directory sw
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I4bb84c3f401aba8a3dede9cec3a7f2187a2ba02a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106473
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sw/source/core')
146 files changed, 94 insertions, 119 deletions
diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx index c433a4e36351..a097f3b7a74f 100644 --- a/sw/source/core/SwNumberTree/SwNodeNum.cxx +++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx @@ -18,7 +18,6 @@ */ #include <osl/diagnose.h> -#include <svl/stritem.hxx> #include <numrule.hxx> #include <SwNodeNum.hxx> #include <ndtxt.hxx> diff --git a/sw/source/core/access/AccessibilityCheck.cxx b/sw/source/core/access/AccessibilityCheck.cxx index b2299ca36c59..b8dc54b69ccf 100644 --- a/sw/source/core/access/AccessibilityCheck.cxx +++ b/sw/source/core/access/AccessibilityCheck.cxx @@ -11,8 +11,7 @@ #include <AccessibilityCheck.hxx> #include <AccessibilityIssue.hxx> #include <AccessibilityCheckStrings.hrc> -#include <ndgrf.hxx> -#include <ndole.hxx> +#include <ndnotxt.hxx> #include <ndtxt.hxx> #include <docsh.hxx> #include <IDocumentDrawModelAccess.hxx> diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index cf59efdb21ce..4b9777b74c36 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -44,7 +44,6 @@ #include <txtfrm.hxx> #include <sectfrm.hxx> #include <section.hxx> -#include <svx/unoapi.hxx> #include <swmodule.hxx> #include <svtools/colorcfg.hxx> diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx index c472490f8b59..6b2f57682316 100644 --- a/sw/source/core/access/accportions.cxx +++ b/sw/source/core/access/accportions.cxx @@ -22,6 +22,7 @@ #include <string_view> #include "accportions.hxx" +#include <osl/diagnose.h> #include <rtl/ustring.hxx> #include <com/sun/star/i18n/Boundary.hpp> #include <com/sun/star/i18n/XBreakIterator.hpp> diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 9564aa7a8f26..2adcda28e35a 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -36,7 +36,6 @@ #include <swtable.hxx> #include <crsrsh.hxx> #include <viscrs.hxx> -#include <hints.hxx> #include "accfrmobjslist.hxx" #include <accmap.hxx> #include <strings.hrc> diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx index eea56e379015..a1207986c347 100644 --- a/sw/source/core/access/acctable.hxx +++ b/sw/source/core/access/acctable.hxx @@ -24,7 +24,6 @@ #include <vector> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> -#include <svl/poolitem.hxx> #include <svl/listener.hxx> #include "acccontext.hxx" diff --git a/sw/source/core/access/parachangetrackinginfo.cxx b/sw/source/core/access/parachangetrackinginfo.cxx index 5fcc6f41c8db..0943dc15ea25 100644 --- a/sw/source/core/access/parachangetrackinginfo.cxx +++ b/sw/source/core/access/parachangetrackinginfo.cxx @@ -21,6 +21,7 @@ #include <wrong.hxx> #include <com/sun/star/text/TextMarkupType.hpp> +#include <osl/diagnose.h> #include <txtfrm.hxx> #include <rootfrm.hxx> diff --git a/sw/source/core/access/textmarkuphelper.cxx b/sw/source/core/access/textmarkuphelper.cxx index 887633412248..5329241c6f1b 100644 --- a/sw/source/core/access/textmarkuphelper.cxx +++ b/sw/source/core/access/textmarkuphelper.cxx @@ -21,7 +21,6 @@ #include "accportions.hxx" #include <vector> -#include <algorithm> #include <com/sun/star/text/TextMarkupType.hpp> #include <com/sun/star/accessibility/TextSegment.hpp> diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx index 8b97ff2095fa..09003a7fff64 100644 --- a/sw/source/core/attr/cellatr.cxx +++ b/sw/source/core/attr/cellatr.cxx @@ -25,7 +25,6 @@ #include <hints.hxx> #include <node.hxx> #include <rolbck.hxx> -#include <rtl/math.hxx> #include <rtl/ustring.hxx> #include <calbck.hxx> #include <swtable.hxx> diff --git a/sw/source/core/attr/fmtfollowtextflow.cxx b/sw/source/core/attr/fmtfollowtextflow.cxx index 71c390d4bbbe..5b424053731e 100644 --- a/sw/source/core/attr/fmtfollowtextflow.cxx +++ b/sw/source/core/attr/fmtfollowtextflow.cxx @@ -18,9 +18,6 @@ */ #include <fmtfollowtextflow.hxx> -#include <unomid.h> - -#include <sal/log.hxx> SwFormatFollowTextFlow* SwFormatFollowTextFlow::Clone(SfxItemPool*) const { diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx index 459f66ccd3f2..1af9e993a35a 100644 --- a/sw/source/core/attr/format.cxx +++ b/sw/source/core/attr/format.cxx @@ -27,6 +27,7 @@ #include <hints.hxx> #include <swcache.hxx> #include <frmatr.hxx> +#include <osl/diagnose.h> #include <svl/grabbagitem.hxx> #include <svx/sdr/attribute/sdrallfillattributeshelper.hxx> #include <svx/unobrushitemhelper.hxx> diff --git a/sw/source/core/crsr/annotationmark.cxx b/sw/source/core/crsr/annotationmark.cxx index 061d88a08323..62895ab852c9 100644 --- a/sw/source/core/crsr/annotationmark.cxx +++ b/sw/source/core/crsr/annotationmark.cxx @@ -24,7 +24,6 @@ #include <IDocumentFieldsAccess.hxx> #include <IDocumentState.hxx> #include <fldbas.hxx> -#include <calbck.hxx> #include <fmtfld.hxx> #include <docufld.hxx> #include <IDocumentUndoRedo.hxx> diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx index 89352072ac70..d2359c82a0cc 100644 --- a/sw/source/core/crsr/bookmrk.cxx +++ b/sw/source/core/crsr/bookmrk.cxx @@ -27,6 +27,7 @@ #include <pam.hxx> #include <swserv.hxx> #include <sfx2/linkmgr.hxx> +#include <sfx2/viewsh.hxx> #include <UndoBookmark.hxx> #include <unobookmark.hxx> #include <xmloff/odffields.hxx> @@ -41,11 +42,8 @@ #include <DocumentContentOperationsManager.hxx> #include <comphelper/lok.hxx> #include <txtfrm.hxx> -#include <view.hxx> #include <LibreOfficeKit/LibreOfficeKitEnums.h> -#include <wrtsh.hxx> #include <rtl/strbuf.hxx> -#include <sfx2/lokhelper.hxx> #include <strings.hrc> using namespace ::sw::mark; diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx index 300691c950a0..955622409af8 100644 --- a/sw/source/core/crsr/callnk.cxx +++ b/sw/source/core/crsr/callnk.cxx @@ -18,6 +18,7 @@ */ #include <com/sun/star/i18n/XBreakIterator.hpp> +#include <osl/diagnose.h> #include <fmtcntnt.hxx> #include <txatbase.hxx> #include "callnk.hxx" diff --git a/sw/source/core/crsr/callnk.hxx b/sw/source/core/crsr/callnk.hxx index 713f469bb6cc..ca47821c147f 100644 --- a/sw/source/core/crsr/callnk.hxx +++ b/sw/source/core/crsr/callnk.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_SW_SOURCE_CORE_CRSR_CALLNK_HXX #define INCLUDED_SW_SOURCE_CORE_CRSR_CALLNK_HXX +#include <tools/long.hxx> #include <tools/solar.h> #include <ndtyp.hxx> diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx index 5824a83007fd..85d7830c502f 100644 --- a/sw/source/core/crsr/findattr.cxx +++ b/sw/source/core/crsr/findattr.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/util/SearchFlags.hpp> #include <i18nlangtag/languagetag.hxx> #include <i18nutil/searchopt.hxx> +#include <osl/diagnose.h> #include <unotools/syslocale.hxx> #include <hintids.hxx> #include <svl/itemiter.hxx> diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx index 55775a358826..6d7e8e388046 100644 --- a/sw/source/core/crsr/pam.cxx +++ b/sw/source/core/crsr/pam.cxx @@ -44,6 +44,7 @@ #include <DocumentSettingManager.hxx> #include <hints.hxx> #include <txatbase.hxx> +#include <osl/diagnose.h> #include <xmloff/odffields.hxx> #include <rtl/ustrbuf.hxx> diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx index fb093622b51a..92285077fc95 100644 --- a/sw/source/core/crsr/trvltbl.cxx +++ b/sw/source/core/crsr/trvltbl.cxx @@ -32,6 +32,7 @@ #include <shellres.hxx> #include <cellfrm.hxx> #include <IDocumentLayoutAccess.hxx> +#include <osl/diagnose.h> #include <svx/srchdlg.hxx> /// set cursor into next/previous cell diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx index 92dbbdb29f49..7a364b2ee83a 100644 --- a/sw/source/core/crsr/viscrs.cxx +++ b/sw/source/core/crsr/viscrs.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <config_features.h> +#include <config_feature_desktop.h> #include <vcl/weld.hxx> #include <vcl/svapp.hxx> diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index 360b3fae7f9c..62e5b078f73e 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx @@ -22,6 +22,7 @@ #include <IDocumentMarkAccess.hxx> #include <IDocumentState.hxx> #include <IDocumentLayoutAccess.hxx> +#include <IDocumentRedlineAccess.hxx> #include <IDocumentStylePoolAccess.hxx> #include <IDocumentSettingAccess.hxx> #include <UndoManager.hxx> diff --git a/sw/source/core/doc/DocumentDeviceManager.cxx b/sw/source/core/doc/DocumentDeviceManager.cxx index 5dadd15d2130..5083838684aa 100644 --- a/sw/source/core/doc/DocumentDeviceManager.cxx +++ b/sw/source/core/doc/DocumentDeviceManager.cxx @@ -27,6 +27,7 @@ #include <IDocumentDrawModelAccess.hxx> #include <IDocumentState.hxx> #include <IDocumentLayoutAccess.hxx> +#include <osl/diagnose.h> #include <sfx2/printer.hxx> #include <vcl/virdev.hxx> #include <vcl/outdev.hxx> diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx index cbae4727e10d..4ef9322d7c91 100644 --- a/sw/source/core/doc/DocumentFieldsManager.cxx +++ b/sw/source/core/doc/DocumentFieldsManager.cxx @@ -53,6 +53,7 @@ #include <ndindex.hxx> #include <pam.hxx> #include <o3tl/deleter.hxx> +#include <osl/diagnose.h> #include <unotools/transliterationwrapper.hxx> #include <comphelper/scopeguard.hxx> #include <com/sun/star/uno/Any.hxx> diff --git a/sw/source/core/doc/DocumentLayoutManager.cxx b/sw/source/core/doc/DocumentLayoutManager.cxx index 7df5d2871f91..727aa8428611 100644 --- a/sw/source/core/doc/DocumentLayoutManager.cxx +++ b/sw/source/core/doc/DocumentLayoutManager.cxx @@ -35,7 +35,6 @@ #include <fmtflcnt.hxx> #include <ndtxt.hxx> #include <unoframe.hxx> -#include <docary.hxx> #include <textboxhelper.hxx> #include <ndindex.hxx> #include <pam.hxx> diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx index 466ffa0464a0..7b004695dbd6 100644 --- a/sw/source/core/doc/DocumentRedlineManager.cxx +++ b/sw/source/core/doc/DocumentRedlineManager.cxx @@ -37,6 +37,7 @@ #include <authfld.hxx> #include <strings.hrc> #include <swmodule.hxx> +#include <osl/diagnose.h> using namespace com::sun::star; diff --git a/sw/source/core/doc/DocumentSettingManager.cxx b/sw/source/core/doc/DocumentSettingManager.cxx index 5f609221752f..f6c15065a453 100644 --- a/sw/source/core/doc/DocumentSettingManager.cxx +++ b/sw/source/core/doc/DocumentSettingManager.cxx @@ -26,6 +26,7 @@ #include <IDocumentLayoutAccess.hxx> #include <comphelper/processfactory.hxx> #include <editeng/forbiddencharacterstable.hxx> +#include <osl/diagnose.h> #include <svx/svdmodel.hxx> #include <svl/asiancfg.hxx> #include <unotools/compatibility.hxx> diff --git a/sw/source/core/doc/DocumentStatisticsManager.cxx b/sw/source/core/doc/DocumentStatisticsManager.cxx index dd67d88ea89e..c222017cfda8 100644 --- a/sw/source/core/doc/DocumentStatisticsManager.cxx +++ b/sw/source/core/doc/DocumentStatisticsManager.cxx @@ -25,7 +25,6 @@ #include <IDocumentLayoutAccess.hxx> #include <view.hxx> #include <ndtxt.hxx> -#include <calbck.hxx> #include <fmtfld.hxx> #include <rootfrm.hxx> #include <docufld.hxx> diff --git a/sw/source/core/doc/DocumentTimerManager.cxx b/sw/source/core/doc/DocumentTimerManager.cxx index 4b3d6dd3856f..4f4875cf775c 100644 --- a/sw/source/core/doc/DocumentTimerManager.cxx +++ b/sw/source/core/doc/DocumentTimerManager.cxx @@ -26,7 +26,6 @@ #include <viewsh.hxx> #include <unotools/lingucfg.hxx> #include <unotools/linguprops.hxx> -#include <set> #include <fldupde.hxx> #include <sfx2/progress.hxx> #include <viewopt.hxx> diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx index ebf380b6e081..3aa05a5f579a 100644 --- a/sw/source/core/doc/acmplwrd.cxx +++ b/sw/source/core/doc/acmplwrd.cxx @@ -19,7 +19,6 @@ #include <tools/urlobj.hxx> #include <hintids.hxx> -#include <hints.hxx> #include <acmplwrd.hxx> #include <doc.hxx> #include <pagedesc.hxx> diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx index 05a8e0b2d810..a742754f6010 100644 --- a/sw/source/core/doc/dbgoutsw.cxx +++ b/sw/source/core/doc/dbgoutsw.cxx @@ -23,7 +23,6 @@ #include <rtl/ustring.hxx> #include <svl/poolitem.hxx> #include <svl/itemiter.hxx> -#include <string> #include <map> #include <node.hxx> #include <ndtxt.hxx> @@ -31,7 +30,6 @@ #include <txatbase.hxx> #include <pam.hxx> #include <docary.hxx> -#include <swundo.hxx> #include <undobj.hxx> #include <numrule.hxx> #include <doc.hxx> diff --git a/sw/source/core/doc/docbasic.cxx b/sw/source/core/doc/docbasic.cxx index 4fb0db9641c5..e0d62e645644 100644 --- a/sw/source/core/doc/docbasic.cxx +++ b/sw/source/core/doc/docbasic.cxx @@ -28,7 +28,6 @@ #include <fmtinfmt.hxx> #include <fmturl.hxx> #include <frmatr.hxx> -#include <docary.hxx> #include <doc.hxx> #include <docsh.hxx> #include <swevent.hxx> diff --git a/sw/source/core/doc/docchart.cxx b/sw/source/core/doc/docchart.cxx index 053fbad4f3ee..cfa3f153074b 100644 --- a/sw/source/core/doc/docchart.cxx +++ b/sw/source/core/doc/docchart.cxx @@ -21,7 +21,6 @@ #include <IDocumentChartDataProviderAccess.hxx> #include <IDocumentState.hxx> #include <IDocumentLayoutAccess.hxx> -#include <docary.hxx> #include <ndindex.hxx> #include <swtable.hxx> #include <viewsh.hxx> @@ -30,6 +29,7 @@ #include <tblsel.hxx> #include <frameformats.hxx> #include <unochart.hxx> +#include <osl/diagnose.h> void SwTable::UpdateCharts() const { diff --git a/sw/source/core/doc/doccorr.cxx b/sw/source/core/doc/doccorr.cxx index 9a31c6ad01e6..2c8ce7eec4c0 100644 --- a/sw/source/core/doc/doccorr.cxx +++ b/sw/source/core/doc/doccorr.cxx @@ -19,6 +19,7 @@ #include <doc.hxx> #include <IDocumentLayoutAccess.hxx> +#include <IDocumentRedlineAccess.hxx> #include <node.hxx> #include <editsh.hxx> #include <viscrs.hxx> diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx index 1e0c8d1d6a1d..bd5308e27790 100644 --- a/sw/source/core/doc/docdesc.cxx +++ b/sw/source/core/doc/docdesc.cxx @@ -57,7 +57,6 @@ #include <unotools/configmgr.hxx> #include <unotools/syslocale.hxx> #include <svx/swframetypes.hxx> -#include <svx/svxids.hrc> #include <com/sun/star/embed/XEmbeddedObject.hpp> using namespace com::sun::star; diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index 3f0b3802b417..9efeb5c1ec75 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -43,6 +43,7 @@ #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; using namespace ::com::sun::star::linguistic2; diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx index 6646c903d6e6..ad21d076a3ac 100644 --- a/sw/source/core/doc/docfld.cxx +++ b/sw/source/core/doc/docfld.cxx @@ -22,8 +22,8 @@ #include <hintids.hxx> #include <comphelper/string.hxx> +#include <osl/diagnose.h> #include <unotools/charclass.hxx> -#include <unotools/transliterationwrapper.hxx> #include <doc.hxx> #include <IDocumentFieldsAccess.hxx> #include <IDocumentState.hxx> @@ -51,8 +51,6 @@ #include <txtinet.hxx> #include <fmtcntnt.hxx> -#include <calbck.hxx> - using namespace ::com::sun::star::uno; // the StartIndex can be supplied optionally (e.g. if it was queried before - is a virtual diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx index 988e59c76a58..1c2408e235ae 100644 --- a/sw/source/core/doc/docfly.cxx +++ b/sw/source/core/doc/docfly.cxx @@ -31,7 +31,6 @@ #include <IDocumentState.hxx> #include <IDocumentLayoutAccess.hxx> #include <ndindex.hxx> -#include <docary.hxx> #include <drawdoc.hxx> #include <fmtcntnt.hxx> #include <fmtanchr.hxx> diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index 281e9cb9de64..c4c8b1a64ebc 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -26,6 +26,7 @@ #include <editeng/rsiditem.hxx> #include <editeng/colritem.hxx> #include <officecfg/Office/Common.hxx> +#include <osl/diagnose.h> #include <svl/zforlist.hxx> #include <comphelper/doublecheckedinit.hxx> #include <comphelper/processfactory.hxx> @@ -47,6 +48,7 @@ #include <IDocumentFieldsAccess.hxx> #include <IDocumentState.hxx> #include <IDocumentLayoutAccess.hxx> +#include <IDocumentRedlineAccess.hxx> #include <IDocumentStylePoolAccess.hxx> #include <rootfrm.hxx> #include <txtfrm.hxx> diff --git a/sw/source/core/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx index 44963f66b781..286f0b4ad47f 100644 --- a/sw/source/core/doc/docftn.cxx +++ b/sw/source/core/doc/docftn.cxx @@ -25,7 +25,6 @@ #include <pagedesc.hxx> #include <charfmt.hxx> #include <UndoAttribute.hxx> -#include <hints.hxx> #include <rolbck.hxx> #include <doc.hxx> #include <IDocumentFieldsAccess.hxx> diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index 3380b5e6bc15..e656ee85e78d 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -103,7 +103,6 @@ #include <svx/xfillit0.hxx> #include <unotools/configmgr.hxx> #include <i18nlangtag/mslangid.hxx> -#include <editeng/langitem.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::document; diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index 29905b64a246..f8ac5687b6cc 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -18,13 +18,13 @@ */ #include <hintids.hxx> -#include <editeng/lrspitem.hxx> #include <ftninfo.hxx> #include <ftnidx.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> #include <IDocumentListsAccess.hxx> #include <IDocumentFieldsAccess.hxx> +#include <IDocumentRedlineAccess.hxx> #include <IDocumentState.hxx> #include <IDocumentStylePoolAccess.hxx> #include <pam.hxx> @@ -49,6 +49,7 @@ #include <comphelper/string.hxx> #include <comphelper/random.hxx> #include <o3tl/safeint.hxx> +#include <osl/diagnose.h> #include <tools/datetimeutils.hxx> #include <map> diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx index b15a22dbe1f9..25a664d17bf8 100644 --- a/sw/source/core/doc/docsort.cxx +++ b/sw/source/core/doc/docsort.cxx @@ -28,6 +28,7 @@ #include <doc.hxx> #include <IDocumentUndoRedo.hxx> #include <IDocumentFieldsAccess.hxx> +#include <IDocumentRedlineAccess.hxx> #include <IDocumentState.hxx> #include <node.hxx> #include <pam.hxx> diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index 9f274cb1f8c0..d367ce54a482 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -59,7 +59,6 @@ #include <node2lay.hxx> #include <SwStyleNameMapper.hxx> #include <breakit.hxx> -#include <scriptinfo.hxx> #include <calbck.hxx> #include <ToxTextGenerator.hxx> #include <ToxTabStopTokenHandler.hxx> @@ -68,6 +67,7 @@ #include <tools/globname.hxx> #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <o3tl/safeint.hxx> +#include <osl/diagnose.h> #include <memory> diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx index 31edb6dff0bc..67dc9b9c56b5 100644 --- a/sw/source/core/doc/htmltbl.cxx +++ b/sw/source/core/doc/htmltbl.cxx @@ -39,6 +39,7 @@ #include <htmltbl.hxx> #include <calbck.hxx> #include <o3tl/numeric.hxx> +#include <osl/diagnose.h> #ifdef DBG_UTIL #include <tblrwcl.hxx> #endif diff --git a/sw/source/core/doc/lineinfo.cxx b/sw/source/core/doc/lineinfo.cxx index 094c3854a8e9..2a9963f39cda 100644 --- a/sw/source/core/doc/lineinfo.cxx +++ b/sw/source/core/doc/lineinfo.cxx @@ -25,7 +25,7 @@ #include <charfmt.hxx> #include <poolfmt.hxx> #include <rootfrm.hxx> -#include <set> +#include <osl/diagnose.h> void SwDoc::SetLineNumberInfo( const SwLineNumberInfo &rNew ) { diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index 8bf008297233..15778a3a5863 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -55,7 +55,6 @@ #include <ndole.hxx> #include <swregion.hxx> #include <poolfmt.hxx> -#include <mdiexp.hxx> #include <strings.hrc> #include <accessibilityoptions.hxx> #include <com/sun/star/embed/EmbedMisc.hpp> diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx index ba2eac002e9b..6bc270801873 100644 --- a/sw/source/core/doc/tblcpy.cxx +++ b/sw/source/core/doc/tblcpy.cxx @@ -36,7 +36,6 @@ #include <poolfmt.hxx> #include <cellatr.hxx> #include <mvsave.hxx> -#include <docary.hxx> #include <fmtanchr.hxx> #include <hints.hxx> #include <UndoTable.hxx> diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx index 37fe854f88c4..6ccc17003f53 100644 --- a/sw/source/core/docnode/ndcopy.cxx +++ b/sw/source/core/docnode/ndcopy.cxx @@ -24,7 +24,6 @@ #include <ndtxt.hxx> #include <swtblfmt.hxx> #include <cellatr.hxx> -#include <docary.hxx> #include <ddefld.hxx> #include <swddetbl.hxx> #include <ndindex.hxx> diff --git a/sw/source/core/docnode/ndnotxt.cxx b/sw/source/core/docnode/ndnotxt.cxx index 3da7273bfc7c..4e04943b92c3 100644 --- a/sw/source/core/docnode/ndnotxt.cxx +++ b/sw/source/core/docnode/ndnotxt.cxx @@ -18,6 +18,7 @@ */ #include <hintids.hxx> +#include <osl/diagnose.h> #include <tools/poly.hxx> #include <svl/stritem.hxx> #include <svx/contdlg.hxx> diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx index be7774ae238a..b13c8fe662ce 100644 --- a/sw/source/core/docnode/ndsect.cxx +++ b/sw/source/core/docnode/ndsect.cxx @@ -18,6 +18,7 @@ */ #include <hintids.hxx> +#include <osl/diagnose.h> #include <sfx2/linkmgr.hxx> #include <svl/itemiter.hxx> #include <sal/log.hxx> @@ -28,6 +29,7 @@ #include <IDocumentLinksAdministration.hxx> #include <IDocumentLayoutAccess.hxx> #include <IDocumentFieldsAccess.hxx> +#include <IDocumentRedlineAccess.hxx> #include <IDocumentState.hxx> #include <rootfrm.hxx> #include <pam.hxx> @@ -52,7 +54,6 @@ #include <strings.hrc> #include <viewsh.hxx> #include <txtfrm.hxx> -#include <hints.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 7c4155f5badf..2ed5ff85a3c4 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -19,6 +19,7 @@ #include <hintids.hxx> #include <editeng/protitem.hxx> +#include <osl/diagnose.h> #include <tools/gen.hxx> #include <com/sun/star/i18n/CharacterIteratorMode.hpp> #include <com/sun/star/i18n/XBreakIterator.hpp> @@ -28,7 +29,6 @@ #include <txtftn.hxx> #include <ftnfrm.hxx> #include <doc.hxx> -#include <docary.hxx> #include <node.hxx> #include <ndindex.hxx> #include <numrule.hxx> diff --git a/sw/source/core/docnode/node2lay.cxx b/sw/source/core/docnode/node2lay.cxx index 17b8a82e707d..e44c7d2f3083 100644 --- a/sw/source/core/docnode/node2lay.cxx +++ b/sw/source/core/docnode/node2lay.cxx @@ -28,6 +28,7 @@ #include <frmtool.hxx> #include <section.hxx> #include <node2lay.hxx> +#include <osl/diagnose.h> /** * The SwNode2LayImpl class does the actual work, the SwNode2Layout class is diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx index 00adf5a40f47..e20a5f14319a 100644 --- a/sw/source/core/docnode/section.cxx +++ b/sw/source/core/docnode/section.cxx @@ -21,6 +21,7 @@ #include <libxml/xmlwriter.h> #include <stdlib.h> #include <hintids.hxx> +#include <osl/diagnose.h> #include <sot/exchange.hxx> #include <svl/stritem.hxx> #include <sfx2/docfile.hxx> @@ -53,7 +54,6 @@ #include <poolfmt.hxx> #include <swbaslnk.hxx> #include <mvsave.hxx> -#include <fmtftntx.hxx> #include <ftnidx.hxx> #include <doctxm.hxx> #include <fmteiro.hxx> diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx index 544aa0f414bd..1929575a94c6 100644 --- a/sw/source/core/docnode/swbaslnk.cxx +++ b/sw/source/core/docnode/swbaslnk.cxx @@ -17,12 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <hintids.hxx> #include <vcl/svapp.hxx> -#include <sfx2/docfile.hxx> +#include <osl/diagnose.h> #include <sfx2/lnkbase.hxx> -#include <sfx2/objsh.hxx> #include <editeng/boxitem.hxx> #include <sfx2/linkmgr.hxx> #include <sfx2/event.hxx> @@ -32,8 +30,8 @@ #include <frmatr.hxx> #include <frmfmt.hxx> #include <doc.hxx> -#include <DocumentLinksAdministrationManager.hxx> #include <IDocumentLayoutAccess.hxx> +#include <IDocumentLinksAdministration.hxx> #include <pam.hxx> #include <swtable.hxx> #include <swevent.hxx> @@ -41,10 +39,7 @@ #include <swserv.hxx> #include <viewsh.hxx> #include <ndgrf.hxx> -#include <hints.hxx> -#include <cntfrm.hxx> #include <htmltbl.hxx> -#include <calbck.hxx> #include <dialoghelp.hxx> #include <memory> diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index 8707bcbaeb84..eb406e418ac9 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -19,7 +19,6 @@ #include <memory> #include <hintids.hxx> -#include <editeng/lrspitem.hxx> #include <svx/svdpage.hxx> #include <svx/svditer.hxx> #include <svx/svdogrp.hxx> @@ -54,7 +53,6 @@ #include <hints.hxx> #include <txtfrm.hxx> #include <frameformats.hxx> -#include <docary.hxx> #include <sortedobjs.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx index a1c06e0442d1..a45f1a7de11c 100644 --- a/sw/source/core/edit/acorrect.cxx +++ b/sw/source/core/edit/acorrect.cxx @@ -31,16 +31,12 @@ #include <shellio.hxx> #include <swundo.hxx> #include <viscrs.hxx> -#include <com/sun/star/i18n/BreakType.hpp> -#include <com/sun/star/i18n/WordType.hpp> -#include <com/sun/star/i18n/XBreakIterator.hpp> #include <com/sun/star/linguistic2/XHyphenator.hpp> #include <com/sun/star/linguistic2/XHyphenatedWord.hpp> +#include <osl/diagnose.h> #include <svl/zforlist.hxx> -#include <svl/zformat.hxx> #include <editeng/acorrcfg.hxx> -#include <redline.hxx> #include <IDocumentRedlineAccess.hxx> #include <rootfrm.hxx> diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index bd0cfc1972fb..f6dfd99988e8 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -19,6 +19,7 @@ #include <hintids.hxx> +#include <osl/diagnose.h> #include <unotools/charclass.hxx> #include <editeng/boxitem.hxx> diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx index 58bb555c2e08..dc8769f2a61a 100644 --- a/sw/source/core/edit/edattr.cxx +++ b/sw/source/core/edit/edattr.cxx @@ -23,6 +23,7 @@ #include <editeng/lrspitem.hxx> #include <com/sun/star/i18n/ScriptType.hpp> #include <com/sun/star/i18n/XBreakIterator.hpp> +#include <osl/diagnose.h> #include <txatbase.hxx> #include <txtftn.hxx> #include <fmtftn.hxx> diff --git a/sw/source/core/edit/edglss.cxx b/sw/source/core/edit/edglss.cxx index ce1aaecad7a4..536a0c1643ff 100644 --- a/sw/source/core/edit/edglss.cxx +++ b/sw/source/core/edit/edglss.cxx @@ -20,13 +20,13 @@ #include <sal/config.h> #include <o3tl/safeint.hxx> +#include <osl/diagnose.h> #include <osl/endian.h> #include <tools/urlobj.hxx> #include <doc.hxx> #include <IDocumentRedlineAccess.hxx> #include <IDocumentFieldsAccess.hxx> #include <pam.hxx> -#include <docary.hxx> #include <editsh.hxx> #include <frmfmt.hxx> #include <rootfrm.hxx> diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx index 2a665015cc50..c956c2544c44 100644 --- a/sw/source/core/edit/editsh.cxx +++ b/sw/source/core/edit/editsh.cxx @@ -18,6 +18,7 @@ */ #include <hintids.hxx> +#include <osl/diagnose.h> #include <vcl/commandevent.hxx> #include <unotools/charclass.hxx> #include <comphelper/processfactory.hxx> diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx index b9bf879a5cbe..51e63d16c6f3 100644 --- a/sw/source/core/edit/edlingu.cxx +++ b/sw/source/core/edit/edlingu.cxx @@ -31,6 +31,7 @@ #include <strings.hrc> #include <hintids.hxx> +#include <osl/diagnose.h> #include <unotools/linguprops.hxx> #include <linguistic/lngprops.hxx> #include <editeng/langitem.hxx> diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx index 354e2782e20c..58b587e11dcb 100644 --- a/sw/source/core/edit/ednumber.cxx +++ b/sw/source/core/edit/ednumber.cxx @@ -26,6 +26,7 @@ #include <txtfrm.hxx> #include <swundo.hxx> #include <numrule.hxx> +#include <osl/diagnose.h> SwPamRanges::SwPamRanges( const SwPaM& rRing ) { diff --git a/sw/source/core/edit/edredln.cxx b/sw/source/core/edit/edredln.cxx index a1ff08b5df9c..3fd94b4a64d5 100644 --- a/sw/source/core/edit/edredln.cxx +++ b/sw/source/core/edit/edredln.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <IDocumentRedlineAccess.hxx> #include <docary.hxx> #include <redline.hxx> #include <doc.hxx> diff --git a/sw/source/core/edit/edsect.cxx b/sw/source/core/edit/edsect.cxx index 662293a8d5c8..bbc58b2747a7 100644 --- a/sw/source/core/edit/edsect.cxx +++ b/sw/source/core/edit/edsect.cxx @@ -29,6 +29,7 @@ #include <cntfrm.hxx> #include <tabfrm.hxx> #include <rootfrm.hxx> +#include <osl/diagnose.h> SwSection const* SwEditShell::InsertSection( diff --git a/sw/source/core/edit/edws.cxx b/sw/source/core/edit/edws.cxx index d7876e31a4fb..e21469f6408b 100644 --- a/sw/source/core/edit/edws.cxx +++ b/sw/source/core/edit/edws.cxx @@ -20,6 +20,7 @@ #include <editsh.hxx> #include <officecfg/Office/Common.hxx> +#include <osl/diagnose.h> #include <unotools/configmgr.hxx> #include <vcl/window.hxx> @@ -27,7 +28,6 @@ #include <IDocumentUndoRedo.hxx> #include <IDocumentState.hxx> #include <pam.hxx> -#include <docary.hxx> #include <acorrect.hxx> #include <swtable.hxx> #include <ndtxt.hxx> diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx index d75b079cf639..7efac3af55f3 100644 --- a/sw/source/core/fields/authfld.cxx +++ b/sw/source/core/fields/authfld.cxx @@ -21,6 +21,7 @@ #include <comphelper/string.hxx> #include <i18nlangtag/languagetag.hxx> #include <o3tl/any.hxx> +#include <osl/diagnose.h> #include <swtypes.hxx> #include <strings.hrc> #include <authfld.hxx> @@ -38,7 +39,6 @@ #include <IDocumentLayoutAccess.hxx> #include <unofldmid.h> #include <unoprnms.hxx> -#include <calbck.hxx> #include <com/sun/star/beans/PropertyValues.hpp> diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx index 04321a37a4f8..6f7c7789a848 100644 --- a/sw/source/core/fields/cellfml.cxx +++ b/sw/source/core/fields/cellfml.cxx @@ -32,7 +32,6 @@ #include <tabfrm.hxx> #include <doc.hxx> #include <IDocumentLayoutAccess.hxx> -#include <docary.hxx> #include <ndtxt.hxx> #include <swtable.hxx> #include <tblsel.hxx> @@ -46,6 +45,7 @@ #include <frameformats.hxx> #include <comphelper/string.hxx> #include <o3tl/safeint.hxx> +#include <osl/diagnose.h> namespace { diff --git a/sw/source/core/fields/chpfld.cxx b/sw/source/core/fields/chpfld.cxx index e275aedf8592..191c1de85110 100644 --- a/sw/source/core/fields/chpfld.cxx +++ b/sw/source/core/fields/chpfld.cxx @@ -18,6 +18,7 @@ */ #include <com/sun/star/text/ChapterFormat.hpp> +#include <osl/diagnose.h> #include <doc.hxx> #include <frame.hxx> #include <rootfrm.hxx> diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx index 62559485e76b..b93c30d8f8f4 100644 --- a/sw/source/core/fields/dbfld.cxx +++ b/sw/source/core/fields/dbfld.cxx @@ -29,11 +29,9 @@ #include <IDocumentFieldsAccess.hxx> #include <docary.hxx> #include <fldbas.hxx> -#include <ndtxt.hxx> #include <dbfld.hxx> #include <dbmgr.hxx> #include <unofldmid.h> -#include <calbck.hxx> using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star; diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx index 9c4ba9c762cb..817545ad2a04 100644 --- a/sw/source/core/fields/ddefld.cxx +++ b/sw/source/core/fields/ddefld.cxx @@ -35,7 +35,6 @@ #include <swbaslnk.hxx> #include <unofldmid.h> #include <hints.hxx> -#include <calbck.hxx> using namespace ::com::sun::star; diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx index 0e486a2963e1..6384010b9bde 100644 --- a/sw/source/core/fields/expfld.cxx +++ b/sw/source/core/fields/expfld.cxx @@ -24,6 +24,7 @@ #include <UndoTable.hxx> #include <hintids.hxx> #include <o3tl/any.hxx> +#include <osl/diagnose.h> #include <unotools/collatorwrapper.hxx> #include <unotools/charclass.hxx> #include <editeng/langitem.hxx> @@ -57,7 +58,6 @@ #include <SwStyleNameMapper.hxx> #include <unofldmid.h> #include <numrule.hxx> -#include <calbck.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::text; diff --git a/sw/source/core/fields/fldlst.cxx b/sw/source/core/fields/fldlst.cxx index aa937cb22140..39b5ec2c181c 100644 --- a/sw/source/core/fields/fldlst.cxx +++ b/sw/source/core/fields/fldlst.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <calbck.hxx> #include <editsh.hxx> #include <doc.hxx> #include <IDocumentFieldsAccess.hxx> diff --git a/sw/source/core/fields/tblcalc.cxx b/sw/source/core/fields/tblcalc.cxx index c93d04a5c4bd..d9c78be88ede 100644 --- a/sw/source/core/fields/tblcalc.cxx +++ b/sw/source/core/fields/tblcalc.cxx @@ -22,7 +22,6 @@ #include <o3tl/any.hxx> #include <calc.hxx> -#include <calbck.hxx> #include <doc.hxx> #include <ndtxt.hxx> #include <fmtfld.hxx> diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index bad9f4a671cb..c3e7b0be030c 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -22,7 +22,6 @@ #include <vcl/graph.hxx> #include <sot/formats.hxx> -#include <sfx2/docfile.hxx> #include <svx/xfillit0.hxx> #include <svx/svdocapt.hxx> #include <svx/svdouno.hxx> @@ -34,13 +33,13 @@ #include <svx/unomodel.hxx> #include <svx/svditer.hxx> #include <svx/svdograf.hxx> +#include <tools/stream.hxx> #include <unotools/streamwrap.hxx> #include <fmtanchr.hxx> #include <fmtcntnt.hxx> #include <fmtornt.hxx> #include <fmtflcnt.hxx> #include <frmfmt.hxx> -#include <docary.hxx> #include <txtfrm.hxx> #include <txtflcnt.hxx> #include <fesh.hxx> diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index 7afe6ee04afa..5ddbd7de1e31 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -35,7 +35,6 @@ #include <fmtornt.hxx> #include <fmturl.hxx> #include <fmtfsize.hxx> -#include <docary.hxx> #include <fesh.hxx> #include <rootfrm.hxx> #include <pagefrm.hxx> diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx index 11129ec7c225..067786a6c2a2 100644 --- a/sw/source/core/frmedt/tblsel.cxx +++ b/sw/source/core/frmedt/tblsel.cxx @@ -19,6 +19,7 @@ #include <editeng/boxitem.hxx> #include <editeng/protitem.hxx> +#include <osl/diagnose.h> #include <hintids.hxx> #include <fmtanchr.hxx> @@ -29,7 +30,6 @@ #include <doc.hxx> #include <IDocumentUndoRedo.hxx> #include <IDocumentLayoutAccess.hxx> -#include <docary.hxx> #include <pam.hxx> #include <ndtxt.hxx> #include <swtable.hxx> diff --git a/sw/source/core/graphic/grfatr.cxx b/sw/source/core/graphic/grfatr.cxx index a8e2e63c7dcb..9c30a4bc9072 100644 --- a/sw/source/core/graphic/grfatr.cxx +++ b/sw/source/core/graphic/grfatr.cxx @@ -19,7 +19,7 @@ #include <com/sun/star/drawing/ColorMode.hpp> #include <o3tl/any.hxx> -#include <vcl/GraphicObject.hxx> +#include <vcl/GraphicAttributes.hxx> #include <grfatr.hxx> #include <swunohelper.hxx> #include <osl/diagnose.h> diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index df244ccf1865..5446ba6eed00 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -42,7 +42,6 @@ #include <hints.hxx> #include <swbaslnk.hxx> #include <pagefrm.hxx> -#include <cntfrm.hxx> #include <rtl/ustring.hxx> #include <o3tl/deleter.hxx> diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx b/sw/source/core/inc/SwXMLBlockImport.hxx index 178ab57b7b25..07a4dc69695c 100644 --- a/sw/source/core/inc/SwXMLBlockImport.hxx +++ b/sw/source/core/inc/SwXMLBlockImport.hxx @@ -24,7 +24,6 @@ #include <xmloff/xmlnamespace.hxx> #include <com/sun/star/xml/sax/FastToken.hpp> #include <sax/fastattribs.hxx> -#include <cppuhelper/implbase.hxx> namespace com::sun::star::xml::sax { class XFastTokenHandler; } diff --git a/sw/source/core/inc/UndoBookmark.hxx b/sw/source/core/inc/UndoBookmark.hxx index c10ed451c57d..f8fb3dd54dc9 100644 --- a/sw/source/core/inc/UndoBookmark.hxx +++ b/sw/source/core/inc/UndoBookmark.hxx @@ -22,6 +22,7 @@ #include <memory> #include <undobj.hxx> +#include "rolbck.hxx" class SwHistoryBookmark; class SwHistoryNoTextFieldmark; diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index d2dc6a15eaaa..ff1a3aba26de 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SW_SOURCE_CORE_INC_FRAME_HXX #define INCLUDED_SW_SOURCE_CORE_INC_FRAME_HXX -#include <drawinglayer/primitive2d/baseprimitive2d.hxx> +#include <drawinglayer/primitive2d/Primitive2DContainer.hxx> #include <editeng/borderline.hxx> #include <svl/poolitem.hxx> #include <swtypes.hxx> diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx index a5ed0c4eb37e..4729ea85ebff 100644 --- a/sw/source/core/inc/layact.hxx +++ b/sw/source/core/inc/layact.hxx @@ -21,7 +21,6 @@ #include <sal/config.h> -#include <vcl/inputtypes.hxx> #include <vcl/TaskStopwatch.hxx> #include <tools/color.hxx> diff --git a/sw/source/core/inc/pamtyp.hxx b/sw/source/core/inc/pamtyp.hxx index b1bb6c1f4722..3e99dd8787cf 100644 --- a/sw/source/core/inc/pamtyp.hxx +++ b/sw/source/core/inc/pamtyp.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SW_SOURCE_CORE_INC_PAMTYP_HXX #include <unotools/textsearch.hxx> -#include <swdllapi.h> #include <memory> diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 8755ee81235d..c73201436f0c 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -67,7 +67,6 @@ #include <pagedesc.hxx> #include <grfatr.hxx> #include <ndnotxt.hxx> -#include <docary.hxx> #include <node2lay.hxx> #include <fmtclbl.hxx> #include <swunohelper.hxx> diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index b5511d83682c..71a598c229bc 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -28,6 +28,7 @@ #include <ndtxt.hxx> #include <editeng/ulspitem.hxx> #include <editeng/keepitem.hxx> +#include <osl/diagnose.h> #include <svx/sdtaitm.hxx> #include <fmtfsize.hxx> diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx index 2040d4f9bf93..4b13576a7b0b 100644 --- a/sw/source/core/layout/colfrm.cxx +++ b/sw/source/core/layout/colfrm.cxx @@ -18,6 +18,7 @@ */ #include <editeng/ulspitem.hxx> +#include <osl/diagnose.h> #include <fmtclds.hxx> #include <fmtfordr.hxx> #include <frmfmt.hxx> diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx index 29dd86b63a23..3696e2a02e0c 100644 --- a/sw/source/core/layout/findfrm.cxx +++ b/sw/source/core/layout/findfrm.cxx @@ -36,6 +36,7 @@ #include <calbck.hxx> #include <viewopt.hxx> #include <ndtxt.hxx> +#include <osl/diagnose.h> #include <sal/log.hxx> /// Searches the first ContentFrame in BodyText below the page. diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index 9987d682dbfc..5dd10dee4eae 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -72,7 +72,6 @@ #include <bodyfrm.hxx> #include <FrameControlsManager.hxx> #include <ndtxt.hxx> -#include <officecfg/Office/Compatibility.hxx> using namespace ::com::sun::star; diff --git a/sw/source/core/layout/flypos.cxx b/sw/source/core/layout/flypos.cxx index b65eb966a468..0a7ab2dcae4a 100644 --- a/sw/source/core/layout/flypos.cxx +++ b/sw/source/core/layout/flypos.cxx @@ -19,7 +19,6 @@ #include <doc.hxx> #include <IDocumentLayoutAccess.hxx> -#include <docary.hxx> #include <fmtanchr.hxx> #include <ndindex.hxx> #include <frameformats.hxx> diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx index 51e97fb1c25c..d65d7c70d546 100644 --- a/sw/source/core/layout/ftnfrm.cxx +++ b/sw/source/core/layout/ftnfrm.cxx @@ -36,6 +36,7 @@ #include <ndindex.hxx> #include <pam.hxx> #include <ndtxt.hxx> +#include <osl/diagnose.h> #include <sal/log.hxx> #include <IDocumentSettingAccess.hxx> diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx index ec97ae693029..2ad55a8bb0ab 100644 --- a/sw/source/core/layout/hffrm.cxx +++ b/sw/source/core/layout/hffrm.cxx @@ -32,6 +32,7 @@ #include <sortedobjs.hxx> #include <objectformatter.hxx> #include <ndindex.hxx> +#include <osl/diagnose.h> #include <sal/log.hxx> static SwTwips lcl_GetFrameMinHeight(const SwLayoutFrame & rFrame) diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx index ce33076182aa..afa012400d81 100644 --- a/sw/source/core/layout/laycache.cxx +++ b/sw/source/core/layout/laycache.cxx @@ -24,7 +24,6 @@ #include <IDocumentStatistics.hxx> #include <IDocumentLayoutAccess.hxx> #include <docstat.hxx> -#include <docary.hxx> #include <fmtpdsc.hxx> #include <laycache.hxx> #include "layhelp.hxx" @@ -49,7 +48,6 @@ #include <frameformats.hxx> #include <limits> -#include <set> using namespace ::com::sun::star; diff --git a/sw/source/core/layout/layouter.cxx b/sw/source/core/layout/layouter.cxx index b3e8f83ca2a6..57f2ee0aeae1 100644 --- a/sw/source/core/layout/layouter.cxx +++ b/sw/source/core/layout/layouter.cxx @@ -28,6 +28,7 @@ #include <movedfwdfrmsbyobjpos.hxx> #include "objstmpconsiderwrapinfl.hxx" +#include <osl/diagnose.h> #define LOOP_DETECT 250 diff --git a/sw/source/core/layout/objectformatter.cxx b/sw/source/core/layout/objectformatter.cxx index ca7d713273d4..184fcc820e33 100644 --- a/sw/source/core/layout/objectformatter.cxx +++ b/sw/source/core/layout/objectformatter.cxx @@ -27,6 +27,7 @@ #include <txtfrm.hxx> #include <layact.hxx> #include <IDocumentSettingAccess.hxx> +#include <osl/diagnose.h> #include <vector> diff --git a/sw/source/core/layout/objectformatterlayfrm.cxx b/sw/source/core/layout/objectformatterlayfrm.cxx index cc9f332167b4..a9b5201b3b50 100644 --- a/sw/source/core/layout/objectformatterlayfrm.cxx +++ b/sw/source/core/layout/objectformatterlayfrm.cxx @@ -23,6 +23,7 @@ #include <pagefrm.hxx> #include <layact.hxx> +#include <osl/diagnose.h> SwObjectFormatterLayFrame::SwObjectFormatterLayFrame( SwLayoutFrame& _rAnchorLayFrame, const SwPageFrame& _rPageFrame, diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx b/sw/source/core/layout/objectformattertxtfrm.cxx index 85313839f889..5c4aa770b86e 100644 --- a/sw/source/core/layout/objectformattertxtfrm.cxx +++ b/sw/source/core/layout/objectformattertxtfrm.cxx @@ -33,8 +33,7 @@ #include <ftnfrm.hxx> #include <fmtornt.hxx> #include <textboxhelper.hxx> -#include <svx/svdobj.hxx> -#include <svx/svdpage.hxx> +#include <osl/diagnose.h> using namespace ::com::sun::star; diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index a40b9d18bdcc..f1e2c35f52f1 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -35,7 +35,6 @@ #include <wrtsh.hxx> #include <view.hxx> #include <edtwin.hxx> -#include <docary.hxx> #include <frameformats.hxx> #include <viewimp.hxx> diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx index 0deff1919ce3..2f7c9e0047bd 100644 --- a/sw/source/core/layout/pagedesc.cxx +++ b/sw/source/core/layout/pagedesc.cxx @@ -24,6 +24,7 @@ #include <editeng/boxitem.hxx> #include <editeng/shaditem.hxx> #include <editeng/frmdiritem.hxx> +#include <osl/diagnose.h> #include <sal/log.hxx> #include <fmtclds.hxx> #include <fmtfsize.hxx> @@ -39,7 +40,6 @@ #include <IDocumentStylePoolAccess.hxx> #include <poolfmt.hxx> #include <calbck.hxx> -#include <hints.hxx> SwPageDesc::SwPageDesc(const OUString& rName, SwFrameFormat *pFormat, SwDoc *const pDoc) : sw::BroadcastingModify() diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 43c655e5c856..201b63be1fcd 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -89,7 +89,6 @@ #include <bitmaps.hlst> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/PolyPolygonStrokePrimitive2D.hxx> -#include <drawinglayer/primitive2d/borderlineprimitive2d.hxx> #include <drawinglayer/primitive2d/discreteshadowprimitive2d.hxx> #include <drawinglayer/primitive2d/maskprimitive2d.hxx> #include <drawinglayer/primitive2d/textprimitive2d.hxx> diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index e293be36a2ed..aa2af7d515f7 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -21,6 +21,7 @@ #include <sal/log.hxx> #include <o3tl/safeint.hxx> +#include <osl/diagnose.h> #include <svl/itemiter.hxx> #include <txtftn.hxx> #include <fmtftn.hxx> diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 953e2a9be87b..ed54f255c052 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -58,7 +58,6 @@ #include <layouter.hxx> #include <calbck.hxx> #include <DocumentSettingManager.hxx> -#include <docary.hxx> #include <sal/log.hxx> #include <frmatr.hxx> #include <frmtool.hxx> diff --git a/sw/source/core/layout/unusedf.cxx b/sw/source/core/layout/unusedf.cxx index fea1c055167b..e8322c896b12 100644 --- a/sw/source/core/layout/unusedf.cxx +++ b/sw/source/core/layout/unusedf.cxx @@ -20,6 +20,7 @@ #include <rootfrm.hxx> #include <cntfrm.hxx> #include <flyfrm.hxx> +#include <osl/diagnose.h> void SwFrame::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderAttrs * ) { diff --git a/sw/source/core/layout/virtoutp.cxx b/sw/source/core/layout/virtoutp.cxx index ad0fa58eb0a5..dd044317dbd0 100644 --- a/sw/source/core/layout/virtoutp.cxx +++ b/sw/source/core/layout/virtoutp.cxx @@ -20,6 +20,7 @@ #include "virtoutp.hxx" #include <viewopt.hxx> #include <rootfrm.hxx> +#include <osl/diagnose.h> /* The SWLayVout class manages the virtual output devices. * RootFrame has a static member of this class which is created in FrameInit diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index e7efffdec412..472c0bf619e8 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -18,6 +18,7 @@ */ #include <hints.hxx> +#include <osl/diagnose.h> #include <o3tl/safeint.hxx> #include <svl/itemiter.hxx> #include <editeng/brushitem.hxx> diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx index a5180ac06536..ae6c338fd716 100644 --- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx @@ -30,7 +30,6 @@ #include <dcontact.hxx> #include <frmfmt.hxx> #include <fmtornt.hxx> -#include <fmtfsize.hxx> #include <fmtfollowtextflow.hxx> #include <editeng/lrspitem.hxx> #include <editeng/ulspitem.hxx> @@ -38,7 +37,6 @@ #include <IDocumentSettingAccess.hxx> #include <textboxhelper.hxx> #include <fmtsrnd.hxx> -#include <svx/sdtagitm.hxx> using namespace ::com::sun::star; using namespace objectpositioning; diff --git a/sw/source/core/objectpositioning/environmentofanchoredobject.cxx b/sw/source/core/objectpositioning/environmentofanchoredobject.cxx index b8fb4f02a7fd..8d197f464f02 100644 --- a/sw/source/core/objectpositioning/environmentofanchoredobject.cxx +++ b/sw/source/core/objectpositioning/environmentofanchoredobject.cxx @@ -20,6 +20,7 @@ #include <environmentofanchoredobject.hxx> #include <frame.hxx> #include <pagefrm.hxx> +#include <osl/diagnose.h> using namespace objectpositioning; diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index 74ceed65d2e0..d52cbd09722f 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -55,6 +55,7 @@ #include <deque> #include <libxml/xmlwriter.h> #include <sfx2/xmldump.hxx> +#include <osl/diagnose.h> using namespace utl; using namespace com::sun::star::uno; diff --git a/sw/source/core/swg/SwXMLSectionList.cxx b/sw/source/core/swg/SwXMLSectionList.cxx index 4fe4c1b0c710..77e1fcbd6e86 100644 --- a/sw/source/core/swg/SwXMLSectionList.cxx +++ b/sw/source/core/swg/SwXMLSectionList.cxx @@ -19,7 +19,6 @@ #include <SwXMLSectionList.hxx> #include <xmloff/xmlictxt.hxx> -#include <xmloff/namespacemap.hxx> #include <xmloff/xmlnamespace.hxx> #include <vector> diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx index 84d7185c3ec2..85592b9a7458 100644 --- a/sw/source/core/table/swnewtable.cxx +++ b/sw/source/core/table/swnewtable.cxx @@ -31,13 +31,9 @@ #include <fmtfsize.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> -#include <IDocumentChartDataProviderAccess.hxx> #include <IDocumentContentOperations.hxx> #include <IDocumentFieldsAccess.hxx> #include <IDocumentLayoutAccess.hxx> -#include <IDocumentMarkAccess.hxx> -#include <IDocumentRedlineAccess.hxx> -#include <ftnidx.hxx> #include <cstdlib> #include <vector> #include <set> @@ -48,6 +44,7 @@ #include <swtblfmt.hxx> #include <calbck.hxx> #include <sal/log.hxx> +#include <osl/diagnose.h> #ifdef DBG_UTIL #define CHECK_TABLE(t) (t).CheckConsistency(); diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 97e999b1e21f..8864701cb59b 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -23,6 +23,7 @@ #include <editeng/shaditem.hxx> #include <editeng/adjustitem.hxx> #include <editeng/colritem.hxx> +#include <osl/diagnose.h> #include <sfx2/linkmgr.hxx> #include <fmtfsize.hxx> #include <fmtornt.hxx> diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx index 6e8f19a98e72..0360bc35667c 100644 --- a/sw/source/core/text/EnhancedPDFExportHelper.cxx +++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx @@ -54,7 +54,6 @@ #include <reffld.hxx> #include <doc.hxx> #include <IDocumentOutlineNodes.hxx> -#include <docary.hxx> #include <mdiexp.hxx> #include <docufld.hxx> #include <ftnidx.hxx> diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx index b1dc40bf4879..e30d03816da5 100644 --- a/sw/source/core/text/atrstck.cxx +++ b/sw/source/core/text/atrstck.cxx @@ -36,7 +36,6 @@ #include <editeng/wghtitem.hxx> #include <editeng/wrlmitem.hxx> #include <editeng/autokernitem.hxx> -#include <editeng/blinkitem.hxx> #include <editeng/charrotateitem.hxx> #include <editeng/emphasismarkitem.hxx> #include <editeng/charscaleitem.hxx> diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx index 731ecdc324bf..aee8bcae2985 100644 --- a/sw/source/core/text/frmform.cxx +++ b/sw/source/core/text/frmform.cxx @@ -20,6 +20,7 @@ #include <sal/config.h> #include <sal/log.hxx> +#include <IDocumentRedlineAccess.hxx> #include <anchoredobject.hxx> #include <bodyfrm.hxx> #include <hintids.hxx> diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx index 0127b8a04083..706d265ab43e 100644 --- a/sw/source/core/text/frmpaint.cxx +++ b/sw/source/core/text/frmpaint.cxx @@ -46,6 +46,7 @@ #include <EnhancedPDFExportHelper.hxx> +#include <IDocumentRedlineAccess.hxx> #include <IDocumentStylePoolAccess.hxx> #define REDLINE_DISTANCE 567/4 diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index e006148e79b7..d9f745a2de71 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -31,7 +31,6 @@ #include <txtfrm.hxx> #include <ndtxt.hxx> #include <editeng/paravertalignitem.hxx> -#include <sal/log.hxx> namespace com::sun::star::linguistic2 { class XHyphenatedWord; } diff --git a/sw/source/core/text/pordrop.hxx b/sw/source/core/text/pordrop.hxx index c8948197fe45..5e01906cdd55 100644 --- a/sw/source/core/text/pordrop.hxx +++ b/sw/source/core/text/pordrop.hxx @@ -20,6 +20,9 @@ #define INCLUDED_SW_SOURCE_CORE_TEXT_PORDROP_HXX #include "portxt.hxx" +#include <swfont.hxx> + +#include <memory> class SwFont; diff --git a/sw/source/core/text/redlnitr.hxx b/sw/source/core/text/redlnitr.hxx index 1623a31aacc2..84c3dd0d7980 100644 --- a/sw/source/core/text/redlnitr.hxx +++ b/sw/source/core/text/redlnitr.hxx @@ -19,8 +19,7 @@ #ifndef INCLUDED_SW_SOURCE_CORE_TEXT_REDLNITR_HXX #define INCLUDED_SW_SOURCE_CORE_TEXT_REDLNITR_HXX -#include <IDocumentRedlineAccess.hxx> - +#include <docary.hxx> #include <swfont.hxx> #include <vcl/commandevent.hxx> diff --git a/sw/source/core/tox/ToxTextGenerator.cxx b/sw/source/core/tox/ToxTextGenerator.cxx index 0cd6babd20b1..ba76ecdaaa62 100644 --- a/sw/source/core/tox/ToxTextGenerator.cxx +++ b/sw/source/core/tox/ToxTextGenerator.cxx @@ -39,6 +39,7 @@ #include <txatbase.hxx> #include <modeltoviewhelper.hxx> +#include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include <svl/itemiter.hxx> diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx index d69e57ba2c3b..962c6edf3044 100644 --- a/sw/source/core/tox/txmsrt.cxx +++ b/sw/source/core/tox/txmsrt.cxx @@ -18,6 +18,7 @@ */ #include <unotools/charclass.hxx> +#include <osl/diagnose.h> #include <txtfld.hxx> #include <doc.hxx> #include <IDocumentLayoutAccess.hxx> diff --git a/sw/source/core/txtnode/SwGrammarContact.cxx b/sw/source/core/txtnode/SwGrammarContact.cxx index ad1e510e6d2a..7b061bdaf9ba 100644 --- a/sw/source/core/txtnode/SwGrammarContact.cxx +++ b/sw/source/core/txtnode/SwGrammarContact.cxx @@ -18,7 +18,6 @@ */ #include <vcl/timer.hxx> -#include <hints.hxx> #include <IGrammarContact.hxx> #include <pam.hxx> #include <ndtxt.hxx> diff --git a/sw/source/core/txtnode/atrftn.cxx b/sw/source/core/txtnode/atrftn.cxx index 2274eb5e960b..7f7e6e1dba4c 100644 --- a/sw/source/core/txtnode/atrftn.cxx +++ b/sw/source/core/txtnode/atrftn.cxx @@ -40,6 +40,7 @@ #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> #include <unotextrange.hxx> +#include <osl/diagnose.h> namespace { /// Get a sorted list of the used footnote reference numbers. diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx index add813112a29..16fb03cfb941 100644 --- a/sw/source/core/txtnode/fmtatr2.cxx +++ b/sw/source/core/txtnode/fmtatr2.cxx @@ -31,7 +31,6 @@ #include <txtatr.hxx> #include <fmtruby.hxx> #include <charfmt.hxx> -#include <hints.hxx> #include <unoevent.hxx> #include <com/sun/star/text/RubyAdjust.hpp> #include <com/sun/star/text/RubyPosition.hpp> diff --git a/sw/source/core/txtnode/ndhints.cxx b/sw/source/core/txtnode/ndhints.cxx index e7f34081c8ec..cd136f21a9c5 100644 --- a/sw/source/core/txtnode/ndhints.cxx +++ b/sw/source/core/txtnode/ndhints.cxx @@ -26,7 +26,6 @@ #ifdef DBG_UTIL #include <pam.hxx> #include <fmtautofmt.hxx> -#include <set> #endif /// sort order: Start, End (reverse), Which (reverse), diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 6b00cf30e9cd..8ebdc1322a68 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -42,7 +42,6 @@ #include <ftnidx.hxx> #include <ftninfo.hxx> #include <fmtftn.hxx> -#include <fmtmeta.hxx> #include <charfmt.hxx> #include <ndtxt.hxx> #include <doc.hxx> diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index 1bc5a3f6ba3b..2a2801c0517e 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -23,7 +23,6 @@ #include <vcl/outdev.hxx> #include <editeng/brushitem.hxx> #include <editeng/wrlmitem.hxx> -#include <editeng/blinkitem.hxx> #include <editeng/kernitem.hxx> #include <editeng/cmapitem.hxx> #include <editeng/langitem.hxx> diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index af1f220fa448..a5626e71f053 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -22,8 +22,8 @@ #include <DocumentContentOperationsManager.hxx> #include <hintids.hxx> -#include <editeng/xmlcnitm.hxx> #include <editeng/rsiditem.hxx> +#include <osl/diagnose.h> #include <svl/whiter.hxx> #include <svl/itemiter.hxx> #include <editeng/charhiddenitem.hxx> diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index ba47a0021b73..67aae7f85650 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -28,6 +28,7 @@ #include <i18nutil/transliteration.hxx> #include <SwSmartTagMgr.hxx> #include <o3tl/safeint.hxx> +#include <osl/diagnose.h> #include <officecfg/Office/Writer.hxx> #include <unotools/transliterationwrapper.hxx> #include <unotools/charclass.hxx> diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx index df3b1caba424..b8570b17c533 100644 --- a/sw/source/core/undo/undel.cxx +++ b/sw/source/core/undo/undel.cxx @@ -22,6 +22,7 @@ #include <libxml/xmlwriter.h> #include <hintids.hxx> +#include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include <unotools/charclass.hxx> #include <frmfmt.hxx> diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx index fb779e53d4f9..83e49c114ae0 100644 --- a/sw/source/core/undo/undobj1.cxx +++ b/sw/source/core/undo/undobj1.cxx @@ -32,7 +32,6 @@ #include <rolbck.hxx> #include <doc.hxx> #include <IDocumentLayoutAccess.hxx> -#include <docary.hxx> #include <rootfrm.hxx> #include <swundo.hxx> #include <pam.hxx> diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx index 1a2ad32bb0e8..060cc08e6559 100644 --- a/sw/source/core/undo/undraw.cxx +++ b/sw/source/core/undo/undraw.cxx @@ -26,7 +26,6 @@ #include <svx/svdview.hxx> #include <hintids.hxx> -#include <hints.hxx> #include <fmtanchr.hxx> #include <fmtflcnt.hxx> #include <txtflcnt.hxx> @@ -34,7 +33,6 @@ #include <doc.hxx> #include <IDocumentUndoRedo.hxx> #include <IDocumentLayoutAccess.hxx> -#include <docary.hxx> #include <swundo.hxx> #include <pam.hxx> #include <ndtxt.hxx> diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx index dcd3c4c689f0..06a56636d7a8 100644 --- a/sw/source/core/undo/unins.cxx +++ b/sw/source/core/undo/unins.cxx @@ -21,7 +21,6 @@ #include <hintids.hxx> #include <unotools/charclass.hxx> -#include <sot/storage.hxx> #include <editeng/keepitem.hxx> #include <svx/svdobj.hxx> diff --git a/sw/source/core/undo/unredln.cxx b/sw/source/core/undo/unredln.cxx index 564eb781f3ed..c592c0bbb1f4 100644 --- a/sw/source/core/undo/unredln.cxx +++ b/sw/source/core/undo/unredln.cxx @@ -19,6 +19,7 @@ #include <UndoRedline.hxx> #include <hintids.hxx> +#include <osl/diagnose.h> #include <unotools/charclass.hxx> #include <doc.hxx> #include <IDocumentRedlineAccess.hxx> diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index fa423875dbb2..7aca78714e65 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -32,7 +32,6 @@ #include <IDocumentStylePoolAccess.hxx> #include <IDocumentLayoutAccess.hxx> #include <IDocumentState.hxx> -#include <hints.hxx> #include <fmtfld.hxx> #include <txtfld.hxx> #include <ndtxt.hxx> diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index a73b8e74fa95..c853a6653d3b 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/frame/XTitle.hpp> #include <com/sun/star/frame/XModel.hpp> #include <o3tl/any.hxx> -#include <svx/svxids.hrc> #include <svx/xfillit0.hxx> #include <svx/xflgrit.hxx> #include <svx/sdtaitm.hxx> diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index bb0782e07cfc..459a2b4e7b6e 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -38,7 +38,6 @@ #include <vcl/svapp.hxx> #include <i18nlangtag/languagetag.hxx> #include <editeng/memberids.h> -#include <hints.hxx> #include <swtypes.hxx> #include <shellres.hxx> #include <viewsh.hxx> diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx index 0ae02dedefed..abcb313351d0 100644 --- a/sw/source/core/unocore/unomap.cxx +++ b/sw/source/core/unocore/unomap.cxx @@ -54,7 +54,6 @@ #include <unomid.h> #include <cmdid.h> #include <unofldmid.h> -#include <editeng/colritem.hxx> #include <editeng/memberids.h> #include <editeng/unoprnms.hxx> #include <svl/itemprop.hxx> diff --git a/sw/source/core/unocore/unomap1.cxx b/sw/source/core/unocore/unomap1.cxx index 11508d462912..f9474dc92e27 100644 --- a/sw/source/core/unocore/unomap1.cxx +++ b/sw/source/core/unocore/unomap1.cxx @@ -19,7 +19,6 @@ #include <hintids.hxx> -#include <svx/svxids.hrc> #include <svx/unomid.hxx> #include <com/sun/star/awt/FontSlant.hpp> #include <com/sun/star/awt/Gradient.hpp> @@ -74,7 +73,6 @@ #include <unoprnms.hxx> #include <unomid.h> #include <cmdid.h> -#include <editeng/colritem.hxx> #include <editeng/memberids.h> #include <editeng/unoprnms.hxx> #include <svl/itemprop.hxx> diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index 63dc5a50d392..f88ee9b84a9f 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -41,7 +41,6 @@ #include <swundo.hxx> #include <rootfrm.hxx> #include <ftnidx.hxx> -#include <docary.hxx> #include <pam.hxx> #include <swtblfmt.hxx> #include <docsh.hxx> diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx index 4a25cd38cd61..7095280585f1 100644 --- a/sw/source/core/unocore/unoredline.cxx +++ b/sw/source/core/unocore/unoredline.cxx @@ -37,6 +37,7 @@ #include <unoport.hxx> #include <unoredline.hxx> #include <doc.hxx> +#include <IDocumentRedlineAccess.hxx> #include <IDocumentStylePoolAccess.hxx> #include <docary.hxx> diff --git a/sw/source/core/unocore/unoredlines.cxx b/sw/source/core/unocore/unoredlines.cxx index bbab06ed6a13..637e16b52c6b 100644 --- a/sw/source/core/unocore/unoredlines.cxx +++ b/sw/source/core/unocore/unoredlines.cxx @@ -30,6 +30,7 @@ #include <pagedesc.hxx> #include <poolfmt.hxx> #include <doc.hxx> +#include <IDocumentRedlineAccess.hxx> #include <IDocumentStylePoolAccess.hxx> #include <docary.hxx> #include <redline.hxx> diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx index a0c158cc2897..132a4dde5aec 100644 --- a/sw/source/core/unocore/unosect.cxx +++ b/sw/source/core/unocore/unosect.cxx @@ -47,6 +47,7 @@ #include <unomap.hxx> #include <section.hxx> #include <doc.hxx> +#include <IDocumentRedlineAccess.hxx> #include <IDocumentUndoRedo.hxx> #include <docsh.hxx> #include <sfx2/docfile.hxx> diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 2f1d9d6f7e3d..1235417db455 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -20,7 +20,6 @@ #include <sal/config.h> #include <o3tl/safeint.hxx> -#include <svx/svxids.hrc> #include <hintids.hxx> #include <vcl/svapp.hxx> #include <svl/hint.hxx> diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index c28a6a38f325..527b56099cb0 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -23,9 +23,9 @@ #include <vector> #include <algorithm> +#include <cppuhelper/interfacecontainer.hxx> #include <o3tl/any.hxx> #include <o3tl/safeint.hxx> -#include <svx/svxids.hrc> #include <editeng/memberids.h> #include <float.h> #include <swtypes.hxx> @@ -42,12 +42,12 @@ #include <IDocumentUndoRedo.hxx> #include <IDocumentContentOperations.hxx> #include <IDocumentFieldsAccess.hxx> +#include <IDocumentRedlineAccess.hxx> #include <IDocumentState.hxx> #include <IDocumentLayoutAccess.hxx> #include <shellres.hxx> #include <docary.hxx> #include <ndole.hxx> -#include <ndtxt.hxx> #include <frame.hxx> #include <vcl/svapp.hxx> #include <fmtfsize.hxx> @@ -105,7 +105,6 @@ #include <docsh.hxx> #include <fesh.hxx> #include <itabenum.hxx> -#include <poolfmt.hxx> #include <frameformats.hxx> using namespace ::com::sun::star; diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 590141a5693e..4c0f0afda5f6 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -59,6 +59,7 @@ #include <unocrsrhelper.hxx> #include <docary.hxx> #include <doc.hxx> +#include <IDocumentRedlineAccess.hxx> #include <IDocumentUndoRedo.hxx> #include <redline.hxx> #include <swundo.hxx> diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx index 57fda67e4e2c..c7d22e89e787 100644 --- a/sw/source/core/view/pagepreviewlayout.cxx +++ b/sw/source/core/view/pagepreviewlayout.cxx @@ -21,6 +21,7 @@ #include <prevwpage.hxx> #include <algorithm> +#include <osl/diagnose.h> #include <tools/fract.hxx> #include <vcl/window.hxx> #include <vcl/settings.hxx> diff --git a/sw/source/core/view/viewpg.cxx b/sw/source/core/view/viewpg.cxx index 98df16715059..2c4d195ba3eb 100644 --- a/sw/source/core/view/viewpg.cxx +++ b/sw/source/core/view/viewpg.cxx @@ -18,6 +18,7 @@ */ #include <tools/fract.hxx> +#include <osl/diagnose.h> #include <viewsh.hxx> #include <pagefrm.hxx> #include <viewimp.hxx> diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 1cc7288a6200..acfd1dac62af 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -72,7 +72,6 @@ #include <vcl/virdev.hxx> #include <vcl/svapp.hxx> #include <svx/sdrpaintwindow.hxx> -#include <svx/sdr/overlay/overlaymanager.hxx> #include <svx/sdrpagewindow.hxx> #include <svx/svdpagv.hxx> #include <comphelper/lok.hxx> |