diff options
64 files changed, 40 insertions, 249 deletions
diff --git a/sw/IwyuFilter_sw.yaml b/sw/IwyuFilter_sw.yaml index e1b03eb15d62..c4e8143616d2 100644 --- a/sw/IwyuFilter_sw.yaml +++ b/sw/IwyuFilter_sw.yaml @@ -464,3 +464,13 @@ blacklist: sw/source/core/undo/untbl.cxx: # Needed for linker visibility of sw_DebugRedline - docredln.hxx + sw/source/core/edit/edglss.cxx: + # OSL_BIGENDIAN is being checked + - osl/endian.h + sw/source/core/edit/edfcol.cxx: + # Actually used + - comphelper/scopeguard.hxx + sw/source/core/fields/textapi.cxx: + # Needed for macros to work + - editeng/unoprnms.hxx + - com/sun/star/lang/Locale.hpp diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx index 45af22ab2176..da544315a9ff 100644 --- a/sw/source/core/edit/acorrect.cxx +++ b/sw/source/core/edit/acorrect.cxx @@ -19,15 +19,12 @@ #include <hintids.hxx> -#include <svx/svxids.hrc> -#include <editeng/langitem.hxx> #include <fmtinfmt.hxx> -#include <txtatr.hxx> -#include <txtinet.hxx> #include <editsh.hxx> #include <doc.hxx> #include <pam.hxx> #include <unocrsr.hxx> +#include <txatbase.hxx> #include <txtfrm.hxx> #include <ndtxt.hxx> #include <acorrect.hxx> diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index 591c4a988d20..a31ea3a8d3a8 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -19,10 +19,6 @@ #include <hintids.hxx> -#include <officecfg/Office/Common.hxx> - -#include <comphelper/processfactory.hxx> - #include <unotools/charclass.hxx> #include <editeng/boxitem.hxx> @@ -32,12 +28,10 @@ #include <editeng/tstpitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/langitem.hxx> -#include <editeng/unolingu.hxx> #include <editeng/acorrcfg.hxx> #include <swwait.hxx> #include <fmtpdsc.hxx> -#include <fmtanchr.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> #include <DocumentRedlineManager.hxx> @@ -48,8 +42,6 @@ #include <editsh.hxx> #include <index.hxx> #include <pam.hxx> -#include <edimp.hxx> -#include <fesh.hxx> #include <swundo.hxx> #include <poolfmt.hxx> #include <ndtxt.hxx> @@ -58,7 +50,6 @@ #include <frminf.hxx> #include <pagedesc.hxx> #include <paratr.hxx> -#include <swtable.hxx> #include <acorrect.hxx> #include <shellres.hxx> #include <section.hxx> diff --git a/sw/source/core/edit/edatmisc.cxx b/sw/source/core/edit/edatmisc.cxx index e8f82956106f..06546d81dcfe 100644 --- a/sw/source/core/edit/edatmisc.cxx +++ b/sw/source/core/edit/edatmisc.cxx @@ -22,7 +22,6 @@ #include <IDocumentUndoRedo.hxx> #include <IDocumentRedlineAccess.hxx> #include <pam.hxx> -#include <edimp.hxx> #include <swundo.hxx> #include <ndtxt.hxx> diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx index 13304fb3ad03..64227cde6291 100644 --- a/sw/source/core/edit/edattr.cxx +++ b/sw/source/core/edit/edattr.cxx @@ -21,7 +21,6 @@ #include <hintids.hxx> #include <editeng/tstpitem.hxx> #include <editeng/lrspitem.hxx> -#include <editeng/scripttypeitem.hxx> #include <com/sun/star/i18n/ScriptType.hpp> #include <com/sun/star/i18n/XBreakIterator.hpp> #include <txatbase.hxx> @@ -37,18 +36,14 @@ #include <rootfrm.hxx> #include <cntfrm.hxx> #include <breakit.hxx> -#include <txtfld.hxx> #include <fmtfld.hxx> #include <txtfrm.hxx> #include <scriptinfo.hxx> -#include <svl/ctloptions.hxx> #include <svl/itemiter.hxx> +#include <svl/languageoptions.hxx> #include <charfmt.hxx> #include <numrule.hxx> -#include <algorithm> -#include <charatr.hxx> - /* * hard Formatting (Attributes) */ diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx index 6d2d83902c85..e1f30a275ead 100644 --- a/sw/source/core/edit/eddel.cxx +++ b/sw/source/core/edit/eddel.cxx @@ -18,21 +18,14 @@ */ #include <memory> -#include <hintids.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> #include <IDocumentContentOperations.hxx> -#include <IDocumentRedlineAccess.hxx> #include <editsh.hxx> -#include <cntfrm.hxx> #include <pam.hxx> -#include <unocrsr.hxx> #include <swundo.hxx> -#include <edimp.hxx> -#include <IMark.hxx> -#include <docary.hxx> #include <SwRewriter.hxx> -#include <globals.hrc> +#include <osl/diagnose.h> #include <strings.hrc> #include <vector> diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx index 7216ab102c87..eb3036093329 100644 --- a/sw/source/core/edit/edfcol.cxx +++ b/sw/source/core/edit/edfcol.cxx @@ -28,7 +28,6 @@ #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp> -#include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> @@ -43,7 +42,6 @@ #include <com/sun/star/text/XParagraphAppend.hpp> #include <com/sun/star/text/XParagraphCursor.hpp> #include <com/sun/star/awt/FontWeight.hpp> -#include <com/sun/star/xml/crypto/SEInitializer.hpp> #include <com/sun/star/rdf/XMetadatable.hpp> #include <com/sun/star/security/DocumentDigitalSignatures.hpp> #include <com/sun/star/security/XCertificate.hpp> @@ -55,7 +53,6 @@ #include <comphelper/sequence.hxx> #include <comphelper/scopeguard.hxx> #include <comphelper/string.hxx> -#include <editeng/formatbreakitem.hxx> #include <editeng/unoprnms.hxx> #include <sfx2/classificationhelper.hxx> #include <svx/ClassificationCommon.hxx> @@ -70,10 +67,8 @@ #include <hintids.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> -#include <edimp.hxx> #include <ndtxt.hxx> #include <paratr.hxx> -#include <fmtpdsc.hxx> #include <viewopt.hxx> #include <SwRewriter.hxx> #include <numrule.hxx> @@ -88,16 +83,12 @@ #include <sfx2/watermarkitem.hxx> #include <unoparagraph.hxx> -#include <unotextrange.hxx> -#include <cppuhelper/bootstrap.hxx> -#include <modeltoviewhelper.hxx> #include <strings.hrc> #include <undobj.hxx> #include <UndoParagraphSignature.hxx> #include <txtatr.hxx> #include <fmtmeta.hxx> -#include <com/sun/star/beans/PropertyAttribute.hpp> #include <tools/diagnose_ex.h> #include <IDocumentRedlineAccess.hxx> diff --git a/sw/source/core/edit/edfld.cxx b/sw/source/core/edit/edfld.cxx index 7525a9af80af..54ee70970787 100644 --- a/sw/source/core/edit/edfld.cxx +++ b/sw/source/core/edit/edfld.cxx @@ -30,13 +30,9 @@ #include <fmtfld.hxx> #include <txtfld.hxx> #include <pamtyp.hxx> -#include <edimp.hxx> -#include <dbfld.hxx> #include <expfld.hxx> -#include <flddat.hxx> #include <swundo.hxx> #include <dbmgr.hxx> -#include <swddetbl.hxx> #include <hints.hxx> #include <calbck.hxx> #include <fieldhint.hxx> diff --git a/sw/source/core/edit/edfldexp.cxx b/sw/source/core/edit/edfldexp.cxx index 91d573c4dcd7..ff2d0d1cdcc4 100644 --- a/sw/source/core/edit/edfldexp.cxx +++ b/sw/source/core/edit/edfldexp.cxx @@ -19,16 +19,12 @@ #include <editsh.hxx> #include <dbfld.hxx> -#include <dbmgr.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/sdb/DatabaseContext.hpp> #include <doc.hxx> #include <IDocumentFieldsAccess.hxx> #include <docary.hxx> -#include <txtfld.hxx> #include <fmtfld.hxx> -#include <edimp.hxx> -#include <flddat.hxx> #include <calbck.hxx> using namespace com::sun::star; diff --git a/sw/source/core/edit/edfmt.cxx b/sw/source/core/edit/edfmt.cxx index a2142249b5c7..de6e0a18a531 100644 --- a/sw/source/core/edit/edfmt.cxx +++ b/sw/source/core/edit/edfmt.cxx @@ -20,14 +20,12 @@ #include <doc.hxx> #include <IDocumentStylePoolAccess.hxx> #include <editsh.hxx> -#include <swtable.hxx> #include <pam.hxx> #include <docary.hxx> #include <fchrfmt.hxx> #include <frmfmt.hxx> #include <charfmt.hxx> #include <ndtxt.hxx> -#include <hints.hxx> sal_uInt16 SwEditShell::GetCharFormatCount() const { diff --git a/sw/source/core/edit/edglbldc.cxx b/sw/source/core/edit/edglbldc.cxx index edd9d0ed21cf..a49b1ca8c235 100644 --- a/sw/source/core/edit/edglbldc.cxx +++ b/sw/source/core/edit/edglbldc.cxx @@ -25,7 +25,6 @@ #include <pam.hxx> #include <ndtxt.hxx> #include <docary.hxx> -#include <swwait.hxx> #include <swundo.hxx> #include <section.hxx> #include <doctxm.hxx> diff --git a/sw/source/core/edit/edglss.cxx b/sw/source/core/edit/edglss.cxx index 807eaa3e19cb..45e8043e13e5 100644 --- a/sw/source/core/edit/edglss.cxx +++ b/sw/source/core/edit/edglss.cxx @@ -18,23 +18,18 @@ */ #include <osl/endian.h> -#include <hintids.hxx> -#include <svl/urihelper.hxx> +#include <tools/urlobj.hxx> #include <doc.hxx> #include <IDocumentRedlineAccess.hxx> #include <IDocumentFieldsAccess.hxx> #include <pam.hxx> #include <docary.hxx> #include <editsh.hxx> -#include <edimp.hxx> #include <frmfmt.hxx> #include <rootfrm.hxx> -#include <swundo.hxx> #include <ndtxt.hxx> #include <swtable.hxx> #include <shellio.hxx> -#include <acorrect.hxx> -#include <swerror.h> #include <iodetect.hxx> void SwEditShell::InsertGlossary( SwTextBlocks& rGlossary, const OUString& rStr ) diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx index 8f84ce42ed75..0b932fba1652 100644 --- a/sw/source/core/edit/editsh.cxx +++ b/sw/source/core/edit/editsh.cxx @@ -23,7 +23,6 @@ #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> #include <unotools/transliterationwrapper.hxx> -#include <swwait.hxx> #include <fmtsrnd.hxx> #include <fmtinfmt.hxx> #include <txtinet.hxx> @@ -41,14 +40,10 @@ #include <frame.hxx> #include <cntfrm.hxx> #include <pam.hxx> -#include <pamtyp.hxx> #include <ndtxt.hxx> -#include <grfatr.hxx> #include <flyfrm.hxx> -#include <swtable.hxx> #include <swundo.hxx> #include <calc.hxx> -#include <edimp.hxx> #include <ndgrf.hxx> #include <ndole.hxx> #include <txtfrm.hxx> @@ -57,7 +52,6 @@ #include <scriptinfo.hxx> #include <unocrsrhelper.hxx> #include <section.hxx> -#include <unochart.hxx> #include <numrule.hxx> #include <SwNodeNum.hxx> #include <unocrsr.hxx> diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx index 6d13356cee13..fa1078cdecf7 100644 --- a/sw/source/core/edit/edlingu.cxx +++ b/sw/source/core/edit/edlingu.cxx @@ -32,23 +32,18 @@ #include <hintids.hxx> #include <unotools/linguprops.hxx> #include <linguistic/lngprops.hxx> -#include <editeng/unolingu.hxx> -#include <editeng/svxacorr.hxx> #include <editeng/langitem.hxx> #include <editeng/SpellPortions.hxx> -#include <editeng/scripttypeitem.hxx> -#include <charatr.hxx> +#include <svl/languageoptions.hxx> #include <editsh.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> #include <IDocumentRedlineAccess.hxx> #include <rootfrm.hxx> #include <pam.hxx> -#include <pamtyp.hxx> #include <swundo.hxx> #include <ndtxt.hxx> #include <viewopt.hxx> -#include <viscrs.hxx> #include <SwGrammarMarkUp.hxx> #include <mdiexp.hxx> #include <cntfrm.hxx> diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx index 8a484b085406..650a88816ae4 100644 --- a/sw/source/core/edit/ednumber.cxx +++ b/sw/source/core/edit/ednumber.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <hintids.hxx> #include <editsh.hxx> #include <edimp.hxx> #include <doc.hxx> @@ -25,7 +24,6 @@ #include <IDocumentState.hxx> #include <ndtxt.hxx> #include <txtfrm.hxx> -#include <paratr.hxx> #include <swundo.hxx> #include <numrule.hxx> diff --git a/sw/source/core/edit/edredln.cxx b/sw/source/core/edit/edredln.cxx index 1baf94bcf46e..f65f6319ccb5 100644 --- a/sw/source/core/edit/edredln.cxx +++ b/sw/source/core/edit/edredln.cxx @@ -20,9 +20,7 @@ #include <docary.hxx> #include <redline.hxx> #include <doc.hxx> -#include <swundo.hxx> #include <editsh.hxx> -#include <edimp.hxx> #include <frmtool.hxx> RedlineFlags SwEditShell::GetRedlineFlags() const diff --git a/sw/source/core/edit/edsect.cxx b/sw/source/core/edit/edsect.cxx index deafce2a7286..7c26915befe9 100644 --- a/sw/source/core/edit/edsect.cxx +++ b/sw/source/core/edit/edsect.cxx @@ -25,7 +25,6 @@ #include <docary.hxx> #include <swundo.hxx> #include <section.hxx> -#include <edimp.hxx> #include <sectfrm.hxx> #include <cntfrm.hxx> #include <tabfrm.hxx> diff --git a/sw/source/core/edit/edtab.cxx b/sw/source/core/edit/edtab.cxx index 5c8e50cf1254..93036f73534d 100644 --- a/sw/source/core/edit/edtab.cxx +++ b/sw/source/core/edit/edtab.cxx @@ -21,11 +21,7 @@ #include <hintids.hxx> #include <hints.hxx> -#include <vcl/svapp.hxx> -#include <editeng/boxitem.hxx> #include <swwait.hxx> -#include <fmtfsize.hxx> -#include <frmatr.hxx> #include <editsh.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> @@ -35,18 +31,14 @@ #include <cntfrm.hxx> #include <pam.hxx> #include <ndtxt.hxx> -#include <fldbas.hxx> #include <swtable.hxx> #include <swundo.hxx> #include <tblsel.hxx> -#include <edimp.hxx> -#include <tabfrm.hxx> #include <cellfrm.hxx> #include <cellatr.hxx> #include <swtblfmt.hxx> #include <swddetbl.hxx> #include <mdiexp.hxx> -#include <unochart.hxx> #include <itabenum.hxx> #include <vcl/uitest/logger.hxx> #include <vcl/uitest/eventdescription.hxx> diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx index ce68f1506c00..98ae87d85906 100644 --- a/sw/source/core/edit/edtox.cxx +++ b/sw/source/core/edit/edtox.cxx @@ -23,32 +23,24 @@ #include <i18nutil/transliteration.hxx> #include <i18nutil/searchopt.hxx> #include <svl/fstathelper.hxx> +#include <osl/diagnose.h> #include <osl/thread.h> -#include <unotools/textsearch.hxx> #include <unotools/syslocale.hxx> #include <sfx2/docfile.hxx> -#include <xmloff/odffields.hxx> - -#include <editeng/unolingu.hxx> - #include <swtypes.hxx> #include <editsh.hxx> #include <doc.hxx> +#include <IDocumentContentOperations.hxx> #include <IDocumentUndoRedo.hxx> #include <pam.hxx> -#include <viewopt.hxx> -#include <ndtxt.hxx> #include <swundo.hxx> -#include <txttxmrk.hxx> -#include <edimp.hxx> #include <tox.hxx> #include <doctxm.hxx> #include <docary.hxx> #include <mdiexp.hxx> #include <strings.hrc> -#include <bookmrk.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::i18n; diff --git a/sw/source/core/edit/edundo.cxx b/sw/source/core/edit/edundo.cxx index 6eb7cb365cf0..5c1e661e88f4 100644 --- a/sw/source/core/edit/edundo.cxx +++ b/sw/source/core/edit/edundo.cxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/svdview.hxx> -#include <sal/log.hxx> +#include <svx/svdmark.hxx> #include <tools/diagnose_ex.h> #include <com/sun/star/frame/XModel.hpp> @@ -27,15 +26,12 @@ #include <fesh.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> -#include <IDocumentContentOperations.hxx> #include <IDocumentRedlineAccess.hxx> #include <pam.hxx> #include <UndoCore.hxx> #include <swundo.hxx> -#include <dcontact.hxx> #include <flyfrm.hxx> #include <frmfmt.hxx> -#include <viewimp.hxx> #include <docsh.hxx> #include <pagefrm.hxx> diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx index 06e9ccabceba..8e2ee76b2994 100644 --- a/sw/source/core/fields/authfld.cxx +++ b/sw/source/core/fields/authfld.cxx @@ -18,10 +18,7 @@ */ #include <memory> -#include <hintids.hxx> #include <comphelper/string.hxx> -#include <editeng/unolingu.hxx> -#include <editeng/langitem.hxx> #include <i18nlangtag/languagetag.hxx> #include <o3tl/any.hxx> #include <swtypes.hxx> @@ -33,7 +30,6 @@ #include <rootfrm.hxx> #include <tox.hxx> #include <txmsrt.hxx> -#include <doctxm.hxx> #include <fmtfld.hxx> #include <txtfld.hxx> #include <ndtxt.hxx> @@ -43,7 +39,6 @@ #include <unofldmid.h> #include <unoprnms.hxx> #include <calbck.hxx> -#include <unomid.h> #include <com/sun/star/beans/PropertyValues.hpp> diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx index 8b161561d846..b7bf466a12e1 100644 --- a/sw/source/core/fields/dbfld.cxx +++ b/sw/source/core/fields/dbfld.cxx @@ -19,25 +19,19 @@ #include <float.h> #include <o3tl/any.hxx> -#include <sfx2/app.hxx> +#include <osl/diagnose.h> #include <svl/zforlist.hxx> -#include <svx/pageitem.hxx> -#include <svx/dataaccessdescriptor.hxx> #include <com/sun/star/sdbc/DataType.hpp> #include <fmtfld.hxx> #include <txtfld.hxx> +#include <calc.hxx> #include <doc.hxx> #include <IDocumentFieldsAccess.hxx> #include <docary.hxx> -#include <frame.hxx> #include <fldbas.hxx> -#include <pam.hxx> #include <ndtxt.hxx> #include <dbfld.hxx> #include <dbmgr.hxx> -#include <docfld.hxx> -#include <expfld.hxx> -#include <txtatr.hxx> #include <unofldmid.h> #include <calbck.hxx> diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx index 700c3de2fc92..e1e5ce3daf23 100644 --- a/sw/source/core/fields/ddefld.cxx +++ b/sw/source/core/fields/ddefld.cxx @@ -29,13 +29,9 @@ #include <IDocumentState.hxx> #include <IDocumentLayoutAccess.hxx> #include <editsh.hxx> -#include <ndtxt.hxx> #include <fmtfld.hxx> -#include <txtfld.hxx> #include <ddefld.hxx> -#include <swtable.hxx> #include <swbaslnk.hxx> -#include <swddetbl.hxx> #include <unofldmid.h> #include <hints.hxx> #include <calbck.hxx> diff --git a/sw/source/core/fields/ddetbl.cxx b/sw/source/core/fields/ddetbl.cxx index d42b387cb44e..5e7f3f7e5023 100644 --- a/sw/source/core/fields/ddetbl.cxx +++ b/sw/source/core/fields/ddetbl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <frmfmt.hxx> #include <doc.hxx> #include <IDocumentSettingAccess.hxx> #include <IDocumentFieldsAccess.hxx> diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index 37a3a67d59f6..13394c76cb64 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -28,18 +28,15 @@ #include <com/sun/star/text/TemplateDisplayFormat.hpp> #include <com/sun/star/text/PageNumberType.hpp> #include <com/sun/star/text/FilenameDisplayFormat.hpp> -#include <com/sun/star/text/DocumentStatistic.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/Duration.hpp> #include <o3tl/any.hxx> #include <unotools/localedatawrapper.hxx> -#include <editeng/unolingu.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> #include <tools/urlobj.hxx> -#include <vcl/svapp.hxx> #include <svl/urihelper.hxx> #include <unotools/useroptions.hxx> #include <unotools/syslocale.hxx> @@ -51,10 +48,8 @@ #include <tools/datetime.hxx> #include <com/sun/star/util/DateTime.hpp> -#include <com/sun/star/util/Time.hpp> #include <swmodule.hxx> -#include <sfx2/app.hxx> #include <sfx2/docfile.hxx> #include <sfx2/doctempl.hxx> #include <fmtfld.hxx> @@ -86,10 +81,8 @@ #include <swunohelper.hxx> #include <strings.hrc> -#include <editeng/outliner.hxx> #include <editeng/outlobj.hxx> #include <calbck.hxx> -#include <docary.hxx> #include <hints.hxx> #define URL_DECODE INetURLObject::DecodeMechanism::Unambiguous diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx index 673e257e0554..304f8a796fed 100644 --- a/sw/source/core/fields/expfld.cxx +++ b/sw/source/core/fields/expfld.cxx @@ -26,8 +26,6 @@ #include <o3tl/any.hxx> #include <unotools/collatorwrapper.hxx> #include <unotools/charclass.hxx> -#include <editeng/unolingu.hxx> -#include <svx/pageitem.hxx> #include <editeng/langitem.hxx> #include <editeng/fontitem.hxx> #include <com/sun/star/text/SetVariableType.hpp> @@ -54,7 +52,6 @@ #include <calc.hxx> #include <pam.hxx> #include <docfld.hxx> -#include <swcache.hxx> #include <swtable.hxx> #include <breakit.hxx> #include <SwStyleNameMapper.hxx> diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx index 5e686c26668f..cb69dde129fe 100644 --- a/sw/source/core/fields/fldbas.cxx +++ b/sw/source/core/fields/fldbas.cxx @@ -20,26 +20,17 @@ #include <fldbas.hxx> #include <float.h> -#include <math.h> #include <libxml/xmlwriter.h> #include <rtl/math.hxx> #include <svl/zforlist.hxx> #include <svl/zformat.hxx> -#include <editeng/unolingu.hxx> #include <o3tl/enumarray.hxx> +#include <osl/diagnose.h> #include <unofldmid.h> #include <doc.hxx> -#include <editsh.hxx> -#include <frame.hxx> -#include <flddat.hxx> -#include <ndtxt.hxx> #include <fmtfld.hxx> -#include <txtfld.hxx> -#include <pam.hxx> -#include <docfld.hxx> -#include <swtable.hxx> #include <docufld.hxx> #include <expfld.hxx> #include <shellres.hxx> @@ -48,6 +39,7 @@ #include <docary.hxx> #include <authfld.hxx> #include <calbck.hxx> +#include <viewsh.hxx> using namespace ::com::sun::star; using namespace nsSwDocInfoSubType; diff --git a/sw/source/core/fields/flddropdown.cxx b/sw/source/core/fields/flddropdown.cxx index a90da4a2a4b7..25c31230af47 100644 --- a/sw/source/core/fields/flddropdown.cxx +++ b/sw/source/core/fields/flddropdown.cxx @@ -25,7 +25,6 @@ #include <comphelper/sequence.hxx> #include <unofldmid.h> -#include <unoprnms.hxx> using namespace com::sun::star; diff --git a/sw/source/core/fields/fldlst.cxx b/sw/source/core/fields/fldlst.cxx index e967daa38fe7..7085894bc22a 100644 --- a/sw/source/core/fields/fldlst.cxx +++ b/sw/source/core/fields/fldlst.cxx @@ -24,7 +24,6 @@ #include <docary.hxx> #include <fmtfld.hxx> #include <txtfld.hxx> -#include <edimp.hxx> #include <expfld.hxx> #include <pam.hxx> #include <docfld.hxx> diff --git a/sw/source/core/fields/macrofld.cxx b/sw/source/core/fields/macrofld.cxx index aa0576e61395..2847ecbb16c9 100644 --- a/sw/source/core/fields/macrofld.cxx +++ b/sw/source/core/fields/macrofld.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <hintids.hxx> #include <doc.hxx> #include <docufld.hxx> #include <unofldmid.h> diff --git a/sw/source/core/fields/postithelper.cxx b/sw/source/core/fields/postithelper.cxx index c650ef634492..614d73cf2c9e 100644 --- a/sw/source/core/fields/postithelper.cxx +++ b/sw/source/core/fields/postithelper.cxx @@ -23,24 +23,19 @@ #include <fmtfld.hxx> #include <txtfld.hxx> -#include <docufld.hxx> #include <ndtxt.hxx> -#include <cntfrm.hxx> #include <pagefrm.hxx> #include <rootfrm.hxx> #include <txtfrm.hxx> -#include <tabfrm.hxx> #include <IDocumentRedlineAccess.hxx> #include <IDocumentFieldsAccess.hxx> #include <redline.hxx> #include <scriptinfo.hxx> -#include <editeng/charhiddenitem.hxx> #include <calbck.hxx> #include <IMark.hxx> #include <sortedobjs.hxx> #include <anchoredobject.hxx> #include <fmtanchr.hxx> -#include <tools/solar.h> class Point; diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index c4825a9343df..19c258c86cd3 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -22,7 +22,6 @@ #include <o3tl/unreachable.hxx> #include <unotools/localedatawrapper.hxx> #include <unotools/charclass.hxx> -#include <editeng/unolingu.hxx> #include <doc.hxx> #include <IDocumentFieldsAccess.hxx> #include <IDocumentLayoutAccess.hxx> @@ -32,7 +31,6 @@ #include <pagefrm.hxx> #include <rootfrm.hxx> #include <modeltoviewhelper.hxx> -#include <docary.hxx> #include <fmtfld.hxx> #include <txtfld.hxx> #include <txtftn.hxx> @@ -59,8 +57,6 @@ #include <SwNodeNum.hxx> #include <calbck.hxx> -#include <sfx2/childwin.hxx> - #include <cstddef> #include <memory> #include <vector> diff --git a/sw/source/core/fields/tblcalc.cxx b/sw/source/core/fields/tblcalc.cxx index 4ea4087efef1..a289c3a84430 100644 --- a/sw/source/core/fields/tblcalc.cxx +++ b/sw/source/core/fields/tblcalc.cxx @@ -21,15 +21,13 @@ #include <o3tl/any.hxx> +#include <calc.hxx> #include <calbck.hxx> -#include <cntfrm.hxx> #include <doc.hxx> -#include <pam.hxx> #include <ndtxt.hxx> #include <fmtfld.hxx> #include <txtfld.hxx> #include <expfld.hxx> -#include <docfld.hxx> #include <unofldmid.h> using namespace ::com::sun::star; diff --git a/sw/source/core/fields/textapi.cxx b/sw/source/core/fields/textapi.cxx index ed8f6bead855..08331d40b882 100644 --- a/sw/source/core/fields/textapi.cxx +++ b/sw/source/core/fields/textapi.cxx @@ -21,7 +21,6 @@ #include <doc.hxx> #include <IDocumentDrawModelAccess.hxx> #include <docsh.hxx> -#include <comphelper/propertysetinfo.hxx> #include <editeng/eeitem.hxx> #include <editeng/editeng.hxx> #include <editeng/outlobj.hxx> diff --git a/sw/source/core/fields/usrfld.cxx b/sw/source/core/fields/usrfld.cxx index 56c8ff44b318..642f47c7f156 100644 --- a/sw/source/core/fields/usrfld.cxx +++ b/sw/source/core/fields/usrfld.cxx @@ -24,20 +24,14 @@ #include <o3tl/any.hxx> #include <svl/zforlist.hxx> -#include <svl/zformat.hxx> #include <unotools/charclass.hxx> -#include <svx/svdmodel.hxx> - -#include <calbck.hxx> #include <calc.hxx> #include <usrfld.hxx> #include <doc.hxx> #include <IDocumentFieldsAccess.hxx> #include <IDocumentUndoRedo.hxx> #include <IDocumentState.hxx> -#include <editsh.hxx> -#include <dpage.hxx> #include <unofldmid.h> using namespace ::com::sun::star; diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index cd6a9ba15c79..8dadded1e2a6 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -22,20 +22,13 @@ #include <vcl/graph.hxx> #include <sot/formats.hxx> -#include <sot/storage.hxx> -#include <sfx2/dispatch.hxx> #include <sfx2/docfile.hxx> -#include <sfx2/viewsh.hxx> -#include <svx/xflasit.hxx> #include <svx/xfillit0.hxx> -#include <svx/xflclit.hxx> -#include <editeng/brushitem.hxx> #include <svx/svdocapt.hxx> #include <svx/svdouno.hxx> #include <svx/xbtmpit.hxx> #include <svx/svdpage.hxx> #include <svx/svdogrp.hxx> -#include <svx/xoutbmp.hxx> #include <svx/svdoole2.hxx> #include <svx/fmmodel.hxx> #include <svx/unomodel.hxx> @@ -65,7 +58,6 @@ #include <flyfrm.hxx> #include <pagefrm.hxx> #include <fldbas.hxx> -#include <edimp.hxx> #include <swundo.hxx> #include <viewimp.hxx> #include <dview.hxx> diff --git a/sw/source/core/frmedt/fedesc.cxx b/sw/source/core/frmedt/fedesc.cxx index aa0c44d9d64b..55c81cc7fc2c 100644 --- a/sw/source/core/frmedt/fedesc.cxx +++ b/sw/source/core/frmedt/fedesc.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <hintids.hxx> #include <fesh.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> @@ -32,7 +31,6 @@ #include <fmtpdsc.hxx> #include <pagedesc.hxx> #include <tabfrm.hxx> -#include <edimp.hxx> #include <SwStyleNameMapper.hxx> #include <ndtxt.hxx> diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index db4c88897024..ce770a70bb4f 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -21,11 +21,9 @@ #include <o3tl/any.hxx> #include <svl/itemiter.hxx> #include <vcl/imapobj.hxx> -#include <svtools/soerr.hxx> #include <editeng/protitem.hxx> #include <svx/svdogrp.hxx> #include <svx/svdouno.hxx> -#include <svx/fmglob.hxx> #include <tools/globname.hxx> #include <sot/exchange.hxx> #include <com/sun/star/form/FormButtonType.hpp> @@ -33,12 +31,9 @@ #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <comphelper/types.hxx> #include <fmtanchr.hxx> -#include <txtflcnt.hxx> #include <fmtcntnt.hxx> #include <fmtornt.hxx> -#include <fmtflcnt.hxx> #include <fmturl.hxx> -#include <fmtclds.hxx> #include <fmtfsize.hxx> #include <docary.hxx> #include <fesh.hxx> @@ -59,22 +54,19 @@ #include <frmfmt.hxx> #include <flyfrm.hxx> #include <ndtxt.hxx> -#include <edimp.hxx> #include <swtable.hxx> -#include <mvsave.hxx> #include <ndgrf.hxx> #include <flyfrms.hxx> -#include <flypos.hxx> #include <fldbas.hxx> #include <fmtfld.hxx> #include <swundo.hxx> +#include <txatbase.hxx> #include <frame.hxx> #include <notxtfrm.hxx> #include <HandleAnchorNodeChg.hxx> #include <frmatr.hxx> #include <fmtsrnd.hxx> #include <ndole.hxx> -#include <editeng/opaqitem.hxx> #include <fefly.hxx> #include <fmtcnct.hxx> diff --git a/sw/source/core/frmedt/feflyole.cxx b/sw/source/core/frmedt/feflyole.cxx index 0bb75aa65845..33ec9cc9a3b1 100644 --- a/sw/source/core/frmedt/feflyole.cxx +++ b/sw/source/core/frmedt/feflyole.cxx @@ -20,20 +20,11 @@ #include <sfx2/ipclient.hxx> #include <sfx2/viewsh.hxx> -#include <sfx2/app.hxx> -#include <unotools/moduleoptions.hxx> -#include <sfx2/viewfrm.hxx> -#include <sot/exchange.hxx> -#include <fmtcntnt.hxx> -#include <fmtanchr.hxx> #include <fesh.hxx> #include <cntfrm.hxx> -#include <frmfmt.hxx> #include <flyfrm.hxx> -#include <pam.hxx> #include <doc.hxx> -#include <ndtxt.hxx> #include <notxtfrm.hxx> #include <ndole.hxx> #include <swcli.hxx> diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index 41b46703f017..8f9d2af42df5 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -24,7 +24,6 @@ #include <svx/svditer.hxx> #include <svx/svdobj.hxx> #include <svx/svdouno.hxx> -#include <svx/svdoole2.hxx> #include <svx/svdogrp.hxx> #include <svx/svdocirc.hxx> #include <svx/svdopath.hxx> @@ -39,8 +38,6 @@ #include <svx/sdtagitm.hxx> #include <svx/sdtacitm.hxx> #include <svx/sdtaaitm.hxx> -#include <sfx2/app.hxx> -#include <editeng/boxitem.hxx> #include <editeng/opaqitem.hxx> #include <editeng/protitem.hxx> #include <svx/svdpage.hxx> @@ -53,7 +50,6 @@ #include <DocumentSettingManager.hxx> #include <IDocumentState.hxx> #include <IDocumentLayoutAccess.hxx> -#include <cmdid.h> #include <drawdoc.hxx> #include <textboxhelper.hxx> #include <frmfmt.hxx> @@ -66,11 +62,7 @@ #include <fmtcntnt.hxx> #include <fmtflcnt.hxx> #include <fmtcnct.hxx> -#include <docary.hxx> -#include <tblsel.hxx> #include <swmodule.hxx> -#include <swtable.hxx> -#include <flyfrms.hxx> #include <fesh.hxx> #include <rootfrm.hxx> #include <pagefrm.hxx> @@ -90,7 +82,6 @@ #include <swundo.hxx> #include <notxtfrm.hxx> #include <txtfrm.hxx> -#include <txatbase.hxx> #include <mdiexp.hxx> #include <sortedobjs.hxx> #include <HandleAnchorNodeChg.hxx> diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx index a6cd65a55d15..f6bda8ebc469 100644 --- a/sw/source/core/frmedt/fetab.cxx +++ b/sw/source/core/frmedt/fetab.cxx @@ -21,9 +21,7 @@ #include <hintids.hxx> #include <vcl/errinf.hxx> -#include <vcl/svapp.hxx> #include <basegfx/vector/b2dvector.hxx> -#include <svx/svxids.hrc> #include <editeng/protitem.hxx> #include <editeng/brushitem.hxx> #include <editeng/frmdiritem.hxx> @@ -32,7 +30,6 @@ #include <fmtfsize.hxx> #include <fmtornt.hxx> #include <frmatr.hxx> -#include <docary.hxx> #include <fesh.hxx> #include <doc.hxx> #include <IDocumentState.hxx> @@ -46,7 +43,6 @@ #include <rowfrm.hxx> #include <cellfrm.hxx> #include <flyfrm.hxx> -#include <dflyobj.hxx> #include <swtable.hxx> #include <swddetbl.hxx> #include <ndtxt.hxx> @@ -56,10 +52,8 @@ #include <tblafmt.hxx> #include <cellatr.hxx> #include <pam.hxx> -#include <pamtyp.hxx> #include <viscrs.hxx> #include <tblsel.hxx> -#include <swtblfmt.hxx> #include <swerror.h> #include <swundo.hxx> #include <frmtool.hxx> diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx index 2f874fd34e24..9adc93bfbdd1 100644 --- a/sw/source/core/frmedt/fews.cxx +++ b/sw/source/core/frmedt/fews.cxx @@ -40,11 +40,9 @@ #include <fmtcntnt.hxx> #include <fmtfsize.hxx> #include <tabfrm.hxx> -#include <cellfrm.hxx> #include <flyfrms.hxx> #include <txtfrm.hxx> #include <mdiexp.hxx> -#include <edimp.hxx> #include <pagedesc.hxx> #include <fmtanchr.hxx> #include <environmentofanchoredobject.hxx> diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx index 52b3551b2eb5..318453df4dd4 100644 --- a/sw/source/core/frmedt/tblsel.cxx +++ b/sw/source/core/frmedt/tblsel.cxx @@ -32,18 +32,15 @@ #include <docary.hxx> #include <pam.hxx> #include <ndtxt.hxx> -#include <ndole.hxx> #include <swtable.hxx> #include <cntfrm.hxx> #include <tabfrm.hxx> #include <rowfrm.hxx> #include <cellfrm.hxx> -#include <pagefrm.hxx> #include <rootfrm.hxx> #include <viscrs.hxx> #include <swtblfmt.hxx> #include <UndoTable.hxx> -#include <mvsave.hxx> #include <sectfrm.hxx> #include <frmtool.hxx> #include <calbck.hxx> diff --git a/sw/source/core/graphic/grfatr.cxx b/sw/source/core/graphic/grfatr.cxx index 680dfc0c30ea..e82f7e5a3f74 100644 --- a/sw/source/core/graphic/grfatr.cxx +++ b/sw/source/core/graphic/grfatr.cxx @@ -20,12 +20,10 @@ #include <com/sun/star/drawing/ColorMode.hpp> #include <o3tl/any.hxx> #include <vcl/GraphicObject.hxx> -#include <swtypes.hxx> #include <grfatr.hxx> #include <swunohelper.hxx> #include <osl/diagnose.h> -#include <cmdid.h> #include <unomid.h> using namespace ::com::sun::star; diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index f52780ae9001..66649cde6312 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -18,15 +18,11 @@ */ #include <hintids.hxx> -#include <mdiexp.hxx> #include <tools/helpers.hxx> #include <tools/urlobj.hxx> #include <tools/fract.hxx> -#include <svl/undo.hxx> #include <svl/fstathelper.hxx> #include <vcl/imap.hxx> -#include <vcl/graphicfilter.hxx> -#include <sot/storage.hxx> #include <sfx2/docfile.hxx> #include <sfx2/linkmgr.hxx> #include <editeng/boxitem.hxx> @@ -45,14 +41,9 @@ #include <hints.hxx> #include <swbaslnk.hxx> #include <pagefrm.hxx> -#include <editsh.hxx> -#include <pam.hxx> #include <rtl/ustring.hxx> -#include <unotools/ucbstreamhelper.hxx> -#include <com/sun/star/embed/ElementModes.hpp> #include <o3tl/deleter.hxx> -#include <vcl/svapp.hxx> #include <retrieveinputstreamconsumer.hxx> #include <drawinglayer/processor2d/objectinfoextractor2d.hxx> #include <drawinglayer/primitive2d/objectinfoprimitive2d.hxx> diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx index 0914fad4d1c7..c7bc0cd08e8b 100644 --- a/sw/source/core/layout/anchoredobject.cxx +++ b/sw/source/core/layout/anchoredobject.cxx @@ -30,7 +30,6 @@ #include <sortedobjs.hxx> #include <pagefrm.hxx> #include <layouter.hxx> -#include <pam.hxx> using namespace ::com::sun::star; diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 79235781896d..3f54d259ec2f 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -32,7 +32,6 @@ #include <frmfmt.hxx> #include <unocoll.hxx> #include <unosett.hxx> -#include <unostyle.hxx> #include <fmtclds.hxx> #include <fmtornt.hxx> #include <fmthdft.hxx> @@ -73,7 +72,6 @@ #include <fmtclbl.hxx> #include <swunohelper.hxx> #include <unoframe.hxx> -#include <unotextbodyhf.hxx> #include <SwStyleNameMapper.hxx> #include <editeng/brushitem.hxx> #include <vcl/GraphicObject.hxx> @@ -90,7 +88,6 @@ #include <ndtxt.hxx> #include <svx/sdr/attribute/sdrallfillattributeshelper.hxx> -#include <svx/xfillit0.hxx> #include <svl/itemiter.hxx> #include <wrtsh.hxx> #include <txtfld.hxx> diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx index 9df20a47fc69..a7e727fc2669 100644 --- a/sw/source/core/layout/dbg_lay.cxx +++ b/sw/source/core/layout/dbg_lay.cxx @@ -97,11 +97,9 @@ #include <dbg_lay.hxx> -#include <flyfrm.hxx> #include <txtfrm.hxx> #include <fntcache.hxx> #include <tabfrm.hxx> -#include <swtblfmt.hxx> #include <rowfrm.hxx> #include <cellfrm.hxx> #include <layfrm.hxx> diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx index a35af84d54a1..fc7ba0b9bfff 100644 --- a/sw/source/core/layout/findfrm.cxx +++ b/sw/source/core/layout/findfrm.cxx @@ -26,7 +26,7 @@ #include <tabfrm.hxx> #include <sectfrm.hxx> #include <frmatr.hxx> -#include <flyfrms.hxx> +#include <flyfrm.hxx> #include <ftnfrm.hxx> #include <txtftn.hxx> #include <fmtftn.hxx> diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index 027e6a8182b2..29d0b6172cf0 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -20,7 +20,9 @@ #include <memory> #include <sal/config.h> #include <sal/log.hxx> +#include <svx/svdobj.hxx> +#include <anchoredobject.hxx> #include <bodyfrm.hxx> #include <swtable.hxx> #include <rootfrm.hxx> @@ -30,9 +32,9 @@ #include <frmatr.hxx> #include <frmtool.hxx> #include <IDocumentFieldsAccess.hxx> -#include <dcontact.hxx> #include <editeng/formatbreakitem.hxx> #include <editeng/keepitem.hxx> +#include <fmtanchr.hxx> #include <fmtsrnd.hxx> #include <fmtpdsc.hxx> #include <editeng/ulspitem.hxx> @@ -48,7 +50,7 @@ #include <rowfrm.hxx> #include <pagedesc.hxx> #include <layact.hxx> -#include <flyfrms.hxx> +#include <flyfrm.hxx> #include <sectfrm.hxx> #include <section.hxx> #include <dbg_lay.hxx> diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index b5f364511f6e..ee4cf8f8587a 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -25,7 +25,6 @@ #include <editeng/ulspitem.hxx> #include <editeng/frmdiritem.hxx> #include <editeng/outlobj.hxx> -#include <drawdoc.hxx> #include <fmtfsize.hxx> #include <fmtclds.hxx> #include <fmtcntnt.hxx> @@ -40,7 +39,6 @@ #include <objectformatter.hxx> #include <ndole.hxx> #include <swtable.hxx> -#include <svx/svdpage.hxx> #include <svx/svdoashp.hxx> #include <layouter.hxx> #include <pagefrm.hxx> @@ -66,8 +64,6 @@ #include <textboxhelper.hxx> #include <txtfly.hxx> #include <ndindex.hxx> -#include <pam.hxx> -#include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <wrtsh.hxx> diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx index f3c442ac8cfa..1e449338331e 100644 --- a/sw/source/core/layout/flycnt.cxx +++ b/sw/source/core/layout/flycnt.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <tools/bigint.hxx> #include <sal/log.hxx> +#include <svx/swframetypes.hxx> #include <pagefrm.hxx> #include <txtfrm.hxx> #include <notxtfrm.hxx> @@ -30,6 +30,7 @@ #include <frmtool.hxx> #include <dflyobj.hxx> #include <hints.hxx> +#include <fmtanchr.hxx> #include <fmtornt.hxx> #include <fmtfsize.hxx> #include <fmtsrnd.hxx> @@ -41,7 +42,6 @@ #include <sectfrm.hxx> #include <tocntntanchoredobjectposition.hxx> -#include <dcontact.hxx> #include <sortedobjs.hxx> #include <layouter.hxx> #include "objectformattertxtfrm.hxx" diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx index 4c23164d9de3..9e1aa984212d 100644 --- a/sw/source/core/layout/flyincnt.cxx +++ b/sw/source/core/layout/flyincnt.cxx @@ -22,7 +22,6 @@ #include <hints.hxx> #include <fmtornt.hxx> #include <rootfrm.hxx> -#include <txtfrm.hxx> #include <flyfrms.hxx> #include <dflyobj.hxx> #include <IDocumentSettingAccess.hxx> diff --git a/sw/source/core/layout/flypos.cxx b/sw/source/core/layout/flypos.cxx index 70fd4b981923..f507eed9c171 100644 --- a/sw/source/core/layout/flypos.cxx +++ b/sw/source/core/layout/flypos.cxx @@ -20,11 +20,9 @@ #include <doc.hxx> #include <IDocumentLayoutAccess.hxx> #include <docary.hxx> -#include <dcontact.hxx> -#include <flyfrm.hxx> -#include <dflyobj.hxx> -#include <calbck.hxx> -#include <pam.hxx> +#include <fmtanchr.hxx> +#include <ndindex.hxx> +#include <svx/swframetypes.hxx> bool SwPosFlyFrameCmp::operator()(const SwPosFlyFramePtr& rA, const SwPosFlyFramePtr& rB) const { diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index f0ef0a38314d..a99db24d21db 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> #include <editeng/brushitem.hxx> #include <editeng/shaditem.hxx> diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 04201e1c6f5e..2f15852b8ac3 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.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 <ctime> #include <rootfrm.hxx> @@ -27,7 +27,6 @@ #include <dflyobj.hxx> #include <frmatr.hxx> #include <frmtool.hxx> -#include <dcontact.hxx> #include <viewopt.hxx> #include <dbg_lay.hxx> #include <layouter.hxx> @@ -40,7 +39,6 @@ #include <sfx2/event.hxx> #include <ftnidx.hxx> -#include <vcl/svapp.hxx> #include <editeng/opaqitem.hxx> #include <SwSmartTagMgr.hxx> #include <sal/log.hxx> @@ -50,6 +48,7 @@ #include <fmtsrnd.hxx> #include <docsh.hxx> +#include <anchoreddrawobject.hxx> #include <ndtxt.hxx> #include <tabfrm.hxx> #include <ftnfrm.hxx> diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx index e4ae9a45c53e..f53cc95412a6 100644 --- a/sw/source/core/layout/newfrm.cxx +++ b/sw/source/core/layout/newfrm.cxx @@ -20,7 +20,6 @@ #include <sal/config.h> #include <o3tl/safeint.hxx> -#include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> #include <drawdoc.hxx> #include <fmtpdsc.hxx> @@ -31,7 +30,6 @@ #include <frmtool.hxx> #include "virtoutp.hxx" #include <blink.hxx> -#include <sectfrm.hxx> #include <notxtfrm.hxx> #include <pagedesc.hxx> #include <viewimp.hxx> diff --git a/sw/source/core/layout/objectformatter.cxx b/sw/source/core/layout/objectformatter.cxx index 393c182b9e40..e48439a2bdf0 100644 --- a/sw/source/core/layout/objectformatter.cxx +++ b/sw/source/core/layout/objectformatter.cxx @@ -26,8 +26,6 @@ #include <flyfrms.hxx> #include <txtfrm.hxx> #include <layact.hxx> -#include <fmtanchr.hxx> -#include <doc.hxx> #include <IDocumentSettingAccess.hxx> #include <vector> diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx b/sw/source/core/layout/objectformattertxtfrm.cxx index 1ba020a84901..9d25adc56f03 100644 --- a/sw/source/core/layout/objectformattertxtfrm.cxx +++ b/sw/source/core/layout/objectformattertxtfrm.cxx @@ -20,7 +20,7 @@ #include "objectformattertxtfrm.hxx" #include <sortedobjs.hxx> #include <rootfrm.hxx> -#include <flyfrms.hxx> +#include <anchoredobject.hxx> #include <txtfrm.hxx> #include <pagefrm.hxx> #include <rowfrm.hxx> diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx index 06c28a3e5a40..f56f25b20c15 100644 --- a/sw/source/core/layout/pagedesc.cxx +++ b/sw/source/core/layout/pagedesc.cxx @@ -22,7 +22,6 @@ #include <editeng/pbinitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/boxitem.hxx> -#include <editeng/brushitem.hxx> #include <editeng/shaditem.hxx> #include <editeng/frmdiritem.hxx> #include <sal/log.hxx> diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 1ca2e28d858e..e0976ce43803 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -96,7 +96,6 @@ #include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <drawinglayer/processor2d/processorfromoutputdevice.hxx> #include <svx/unoapi.hxx> -#include <svx/framelinkarray.hxx> #include <svx/svdpagv.hxx> #include <svx/xfillit0.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index 524562585bd1..f4bb297b6df5 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -42,7 +42,7 @@ #include <viewimp.hxx> #include <editeng/brushitem.hxx> #include <fmtftntx.hxx> -#include <flyfrms.hxx> +#include <flyfrm.hxx> #include <sortedobjs.hxx> #include <hints.hxx> #include <frmatr.hxx> diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index a967739bc87a..55c2eb66e6e1 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -50,7 +50,6 @@ #include <ndtxt.hxx> #include <undobj.hxx> -#include <cfloat> #include <swselectionlist.hxx> #include <comphelper/lok.hxx> diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index f17a7ba68870..0775d895143f 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -33,7 +33,6 @@ #include <IDocumentFieldsAccess.hxx> #include <IDocumentRedlineAccess.hxx> #include <redline.hxx> -#include <fesh.hxx> #include <docsh.hxx> #include <ftninfo.hxx> #include <ftnidx.hxx> @@ -46,7 +45,7 @@ #include <fmtcntnt.hxx> #include <ftnfrm.hxx> #include <tabfrm.hxx> -#include <flyfrms.hxx> +#include <flyfrm.hxx> #include <sectfrm.hxx> #include <fmtclds.hxx> #include <txtfrm.hxx> @@ -58,6 +57,7 @@ #include <frmatr.hxx> #include <frmtool.hxx> #include <ndtxt.hxx> +#include <swtable.hxx> // RotateFlyFrame3 #include <basegfx/matrix/b2dhommatrixtools.hxx> |