sw/IwyuFilter_sw.yaml | 60 ++++++++++++++++++++++++++++ sw/source/core/undo/SwUndoField.cxx | 2 sw/source/core/undo/SwUndoFmt.cxx | 1 sw/source/core/undo/docundo.cxx | 5 -- sw/source/core/undo/rolbck.cxx | 1 sw/source/core/undo/unattr.cxx | 8 --- sw/source/core/undo/unbkmk.cxx | 1 sw/source/core/undo/undel.cxx | 6 -- sw/source/core/undo/undobj.cxx | 1 sw/source/core/undo/undobj1.cxx | 3 - sw/source/core/undo/undraw.cxx | 6 -- sw/source/core/undo/unfmco.cxx | 2 sw/source/core/undo/unins.cxx | 5 -- sw/source/core/undo/unmove.cxx | 1 sw/source/core/undo/unnum.cxx | 3 - sw/source/core/undo/unoutl.cxx | 1 sw/source/core/undo/unredln.cxx | 1 sw/source/core/undo/unsort.cxx | 1 sw/source/core/undo/unspnd.cxx | 2 sw/source/core/undo/untbl.cxx | 6 -- sw/source/core/undo/untblk.cxx | 2 sw/source/core/unocore/SwXTextDefaults.cxx | 1 sw/source/core/unocore/TextCursorHelper.cxx | 1 sw/source/core/unocore/XMLRangeHelper.cxx | 2 sw/source/core/unocore/swunohelper.cxx | 1 sw/source/core/unocore/unobkm.cxx | 3 - sw/source/core/unocore/unochart.cxx | 5 -- sw/source/core/unocore/unocoll.cxx | 14 ------ sw/source/core/unocore/unocrsr.cxx | 1 sw/source/core/unocore/unocrsrhelper.cxx | 6 -- sw/source/core/unocore/unodraw.cxx | 6 -- sw/source/core/unocore/unoevent.cxx | 4 - sw/source/core/unocore/unofield.cxx | 15 ------- sw/source/core/unocore/unoflatpara.cxx | 3 - sw/source/core/unocore/unoframe.cxx | 16 ------- sw/source/core/unocore/unoftn.cxx | 4 - sw/source/core/unocore/unoidx.cxx | 6 -- sw/source/core/unocore/unomap.cxx | 48 +--------------------- sw/source/core/unocore/unomap1.cxx | 41 ------------------- sw/source/core/unocore/unoobj.cxx | 45 --------------------- sw/source/core/unocore/unoobj2.cxx | 48 +--------------------- sw/source/core/unocore/unoport.cxx | 4 - sw/source/core/unocore/unoportenum.cxx | 4 - sw/source/core/unocore/unoredline.cxx | 6 -- sw/source/core/unocore/unoredlines.cxx | 1 sw/source/core/unocore/unorefmk.cxx | 3 - sw/source/core/unocore/unosect.cxx | 2 sw/source/core/unocore/unosett.cxx | 11 ----- sw/source/core/unocore/unosrch.cxx | 9 +--- sw/source/core/unocore/unostyle.cxx | 2 sw/source/core/unocore/unotbl.cxx | 14 ------ sw/source/core/unocore/unotext.cxx | 6 -- sw/source/core/unocore/unotextmarkup.cxx | 3 - sw/source/core/view/pagepreviewlayout.cxx | 2 sw/source/core/view/printdata.cxx | 1 sw/source/core/view/vdraw.cxx | 1 sw/source/core/view/viewimp.cxx | 7 --- sw/source/core/view/viewpg.cxx | 13 ------ sw/source/core/view/viewsh.cxx | 15 ------- sw/source/core/view/vprint.cxx | 26 ------------ 60 files changed, 86 insertions(+), 432 deletions(-)
New commits: commit 05db09fbe9b9de79a61a5b699dbf93fa67d9bdfd Author: Gabor Kelemen <kelemen.gab...@nisz.hu> AuthorDate: Thu Dec 5 21:33:45 2019 +0100 Commit: Miklos Vajna <vmik...@collabora.com> CommitDate: Fri Dec 6 11:53:30 2019 +0100 tdf#42949 Fix IWYU warnings in sw/source/core/[u-v]*/*cxx Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I86602514130061e47943c490005e6bbf3460b1b0 Reviewed-on: https://gerrit.libreoffice.org/84585 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmik...@collabora.com> diff --git a/sw/IwyuFilter_sw.yaml b/sw/IwyuFilter_sw.yaml index 0fddc79cfd21..e60228ab0e1f 100644 --- a/sw/IwyuFilter_sw.yaml +++ b/sw/IwyuFilter_sw.yaml @@ -486,3 +486,63 @@ blacklist: sw/source/core/text/txtfrm.cxx: # Needed for TypedWhichId macro to work - editeng/rsiditem.hxx + sw/source/core/undo/unins.cxx: + # Needed for TypedWhichId macro to work + - fchrfmt.hxx + - fmtautofmt.hxx + sw/source/core/undo/unsect.cxx: + # Actually used + - comphelper/scopeguard.hxx + sw/source/core/unocore/unoframe.cxx: + # Needed for TypedWhichId macro to work + - fmtflcnt.hxx + sw/source/core/unocore/unomap.cxx: + # Needed for TypedWhichId macro to work + - fmtruby.hxx + - fmtanchr.hxx + sw/source/core/unocore/unomap1.cxx: + # Needed for UnoType macro + - com/sun/star/container/XIndexReplace.hpp + - com/sun/star/container/XIndexContainer.hpp + - com/sun/star/drawing/LineStyle.hpp + - com/sun/star/lang/Locale.hpp + - com/sun/star/style/DropCapFormat.hpp + - com/sun/star/style/LineSpacing.hpp + - com/sun/star/style/TabStop.hpp + - com/sun/star/text/XDocumentIndexMark.hpp + - com/sun/star/text/XFootnote.hpp + - com/sun/star/text/XTextField.hpp + - com/sun/star/util/DateTime.hpp + # Needed for TypedWhichId macro to work + - fchrfmt.hxx + - fmtruby.hxx + - fmtinfmt.hxx + - fmtautofmt.hxx + - editeng/rsiditem.hxx + sw/source/core/unocore/unoport.cxx: + # Actually used + - com/sun/star/text/XFootnote.hpp + - com/sun/star/text/XTextField.hpp + - com/sun/star/beans/SetPropertyTolerantFailed.hpp + - com/sun/star/beans/GetPropertyTolerantResult.hpp + sw/source/core/unocore/unoparagraph.cxx: + # Actually used + - com/sun/star/beans/SetPropertyTolerantFailed.hpp + - com/sun/star/beans/GetPropertyTolerantResult.hpp + sw/source/core/unocore/unoobj.cxx: + # OSL_BIGENDIAN is being checked + - osl/endian.h + sw/source/core/unocore/unoobj2.cxx: + # Needed for TypedWhichId macro to work + - svl/intitem.hxx + sw/source/core/unocore/unosrch.cxx: + # Needed for TypedWhichId macro to work + - fmtinfmt.hxx + - fchrfmt.hxx + sw/source/core/unocore/unostyle.cxx: + # Needed for TypedWhichId macro to work + - fmtautofmt.hxx + sw/source/core/unocore/unotextmarkup.cxx: + # Actually used + - com/sun/star/text/TextMarkupDescriptor.hpp + - com/sun/star/text/XTextRange.hpp diff --git a/sw/source/core/undo/SwUndoField.cxx b/sw/source/core/undo/SwUndoField.cxx index be56087bd4e4..1eac1fa41068 100644 --- a/sw/source/core/undo/SwUndoField.cxx +++ b/sw/source/core/undo/SwUndoField.cxx @@ -25,9 +25,7 @@ #include <DocumentFieldsManager.hxx> #include <txtfld.hxx> #include <fldbas.hxx> -#include <ndtxt.hxx> #include <fmtfld.hxx> -#include <dbfld.hxx> #include <docsh.hxx> #include <pam.hxx> #include <osl/diagnose.h> diff --git a/sw/source/core/undo/SwUndoFmt.cxx b/sw/source/core/undo/SwUndoFmt.cxx index 26e2f4ae0092..ec2bc32658e2 100644 --- a/sw/source/core/undo/SwUndoFmt.cxx +++ b/sw/source/core/undo/SwUndoFmt.cxx @@ -26,7 +26,6 @@ #include <undobj.hxx> #include <fmtcol.hxx> #include <doc.hxx> -#include <IDocumentUndoRedo.hxx> #include <strings.hrc> SwUndoFormatCreate::SwUndoFormatCreate diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx index 015cec4cebd7..5a38afee94b7 100644 --- a/sw/source/core/undo/docundo.cxx +++ b/sw/source/core/undo/docundo.cxx @@ -19,21 +19,16 @@ #include <UndoManager.hxx> -#include <svx/svdmodel.hxx> -#include <swmodule.hxx> #include <doc.hxx> #include <docsh.hxx> #include <view.hxx> #include <drawdoc.hxx> #include <ndarr.hxx> #include <pam.hxx> -#include <ndtxt.hxx> #include <swundo.hxx> #include <UndoCore.hxx> -#include <rolbck.hxx> #include <editsh.hxx> #include <unobaseclass.hxx> -#include <limits> #include <IDocumentDrawModelAccess.hxx> #include <IDocumentRedlineAccess.hxx> #include <IDocumentState.hxx> diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx index ef4815a1cff4..9270d5cc28de 100644 --- a/sw/source/core/undo/rolbck.cxx +++ b/sw/source/core/undo/rolbck.cxx @@ -48,7 +48,6 @@ #include <fldbas.hxx> #include <pam.hxx> #include <swtable.hxx> -#include <ndgrf.hxx> #include <UndoCore.hxx> #include <IMark.hxx> #include <charfmt.hxx> diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx index 038302aa187c..d09a2c642862 100644 --- a/sw/source/core/undo/unattr.cxx +++ b/sw/source/core/undo/unattr.cxx @@ -24,21 +24,16 @@ #include <UndoAttribute.hxx> #include <svl/itemiter.hxx> #include <editeng/tstpitem.hxx> -#include <svx/svdmodel.hxx> -#include <svx/svdpage.hxx> -#include <drawdoc.hxx> +#include <svx/svdobj.hxx> #include <hintids.hxx> #include <fmtflcnt.hxx> #include <txtftn.hxx> -#include <fmtornt.hxx> #include <fmtanchr.hxx> #include <fmtfsize.hxx> #include <frmfmt.hxx> #include <fmtcntnt.hxx> #include <ftnidx.hxx> #include <doc.hxx> -#include <IDocumentUndoRedo.hxx> -#include <IDocumentDrawModelAccess.hxx> #include <IDocumentLayoutAccess.hxx> #include <IDocumentRedlineAccess.hxx> #include <IShellCursorSupplier.hxx> @@ -52,7 +47,6 @@ #include <hints.hxx> #include <rolbck.hxx> #include <ndnotxt.hxx> -#include <dcontact.hxx> #include <ftninfo.hxx> #include <redline.hxx> #include <section.hxx> diff --git a/sw/source/core/undo/unbkmk.cxx b/sw/source/core/undo/unbkmk.cxx index 6cc805d1518d..16d45a7b705c 100644 --- a/sw/source/core/undo/unbkmk.cxx +++ b/sw/source/core/undo/unbkmk.cxx @@ -21,7 +21,6 @@ #include <strings.hrc> #include <doc.hxx> -#include <docary.hxx> #include <swundo.hxx> #include <pam.hxx> diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx index cf822f55a4d8..f299aed85456 100644 --- a/sw/source/core/undo/undel.cxx +++ b/sw/source/core/undo/undel.cxx @@ -20,8 +20,6 @@ #include <UndoDelete.hxx> #include <hintids.hxx> #include <unotools/charclass.hxx> -#include <editeng/formatbreakitem.hxx> -#include <fmtpdsc.hxx> #include <frmfmt.hxx> #include <fmtanchr.hxx> #include <doc.hxx> @@ -36,11 +34,7 @@ #include <rolbck.hxx> #include <poolfmt.hxx> #include <mvsave.hxx> -#include <redline.hxx> #include <docary.hxx> -#include <sfx2/app.hxx> -#include <fldbas.hxx> -#include <fmtfld.hxx> #include <frmtool.hxx> #include <txtfrm.hxx> #include <rootfrm.hxx> diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx index bc6a4c5160e6..ef6dc1ae90c6 100644 --- a/sw/source/core/undo/undobj.cxx +++ b/sw/source/core/undo/undobj.cxx @@ -28,7 +28,6 @@ #include <docary.hxx> #include <swundo.hxx> #include <pam.hxx> -#include <pamtyp.hxx> #include <ndtxt.hxx> #include <UndoCore.hxx> #include <rolbck.hxx> diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx index 49eab82628c0..83dcaf4a09f2 100644 --- a/sw/source/core/undo/undobj1.cxx +++ b/sw/source/core/undo/undobj1.cxx @@ -26,9 +26,7 @@ #include <fmtcntnt.hxx> #include <txtflcnt.hxx> #include <frmfmt.hxx> -#include <flyfrm.hxx> #include <UndoCore.hxx> -#include <UndoDraw.hxx> #include <rolbck.hxx> #include <doc.hxx> #include <IDocumentLayoutAccess.hxx> @@ -37,7 +35,6 @@ #include <swundo.hxx> #include <pam.hxx> #include <ndtxt.hxx> -#include <dcontact.hxx> #include <ndole.hxx> SwUndoFlyBase::SwUndoFlyBase( SwFrameFormat* pFormat, SwUndoId nUndoId ) diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx index b86890723a31..05e71ed20a6b 100644 --- a/sw/source/core/undo/undraw.cxx +++ b/sw/source/core/undo/undraw.cxx @@ -19,12 +19,11 @@ #include <UndoDraw.hxx> -#include <rtl/string.h> - #include <svx/svdogrp.hxx> #include <svx/svdundo.hxx> #include <svx/svdpage.hxx> #include <svx/svdmark.hxx> +#include <svx/svdview.hxx> #include <hintids.hxx> #include <hints.hxx> @@ -36,14 +35,11 @@ #include <IDocumentUndoRedo.hxx> #include <IDocumentLayoutAccess.hxx> #include <docary.hxx> -#include <frame.hxx> #include <swundo.hxx> #include <pam.hxx> #include <ndtxt.hxx> #include <UndoCore.hxx> #include <dcontact.hxx> -#include <dview.hxx> -#include <rootfrm.hxx> #include <viewsh.hxx> struct SwUndoGroupObjImpl diff --git a/sw/source/core/undo/unfmco.cxx b/sw/source/core/undo/unfmco.cxx index 722e61c7d440..2760be56812a 100644 --- a/sw/source/core/undo/unfmco.cxx +++ b/sw/source/core/undo/unfmco.cxx @@ -20,10 +20,8 @@ #include <doc.hxx> #include <swundo.hxx> #include <pam.hxx> -#include <ndtxt.hxx> #include <UndoCore.hxx> #include <rolbck.hxx> -#include <docary.hxx> SwUndoFormatColl::SwUndoFormatColl( const SwPaM& rRange, const SwFormatColl* pColl, diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx index d6b39e3b768f..4de6deab4071 100644 --- a/sw/source/core/undo/unins.cxx +++ b/sw/source/core/undo/unins.cxx @@ -25,15 +25,14 @@ #include <editeng/keepitem.hxx> #include <svx/svdobj.hxx> -#include <docsh.hxx> #include <fmtcntnt.hxx> -#include <fmtanchr.hxx> #include <frmfmt.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> #include <IDocumentDrawModelAccess.hxx> #include <IDocumentRedlineAccess.hxx> #include <IDocumentLayoutAccess.hxx> +#include <IShellCursorSupplier.hxx> #include <swundo.hxx> #include <pam.hxx> #include <ndtxt.hxx> @@ -46,12 +45,10 @@ #include <grfatr.hxx> #include <cntfrm.hxx> #include <flyfrm.hxx> -#include <fesh.hxx> #include <swtable.hxx> #include <redline.hxx> #include <docary.hxx> #include <acorrect.hxx> -#include <dcontact.hxx> #include <fmtautofmt.hxx> #include <fchrfmt.hxx> diff --git a/sw/source/core/undo/unmove.cxx b/sw/source/core/undo/unmove.cxx index 1e819d965953..6888d477f67a 100644 --- a/sw/source/core/undo/unmove.cxx +++ b/sw/source/core/undo/unmove.cxx @@ -19,7 +19,6 @@ #include <UndoSplitMove.hxx> #include <doc.hxx> -#include <IDocumentUndoRedo.hxx> #include <pam.hxx> #include <swundo.hxx> #include <ndtxt.hxx> diff --git a/sw/source/core/undo/unnum.cxx b/sw/source/core/undo/unnum.cxx index a9595f643327..c46f1689b96c 100644 --- a/sw/source/core/undo/unnum.cxx +++ b/sw/source/core/undo/unnum.cxx @@ -18,10 +18,7 @@ */ #include <UndoNumbering.hxx> -#include <hintids.hxx> -#include <editeng/lrspitem.hxx> #include <doc.hxx> -#include <IDocumentUndoRedo.hxx> #include <swundo.hxx> #include <pam.hxx> #include <ndtxt.hxx> diff --git a/sw/source/core/undo/unoutl.cxx b/sw/source/core/undo/unoutl.cxx index eecb7b85e5ae..cac6dc937076 100644 --- a/sw/source/core/undo/unoutl.cxx +++ b/sw/source/core/undo/unoutl.cxx @@ -20,7 +20,6 @@ #include <doc.hxx> #include <swundo.hxx> #include <pam.hxx> -#include <ndtxt.hxx> #include <UndoCore.hxx> diff --git a/sw/source/core/undo/unredln.cxx b/sw/source/core/undo/unredln.cxx index 8aae3c055b63..51d8fe25617e 100644 --- a/sw/source/core/undo/unredln.cxx +++ b/sw/source/core/undo/unredln.cxx @@ -29,7 +29,6 @@ #include <UndoCore.hxx> #include <UndoDelete.hxx> #include <strings.hrc> -#include <rolbck.hxx> #include <redline.hxx> #include <docary.hxx> #include <sortopt.hxx> diff --git a/sw/source/core/undo/unsort.cxx b/sw/source/core/undo/unsort.cxx index a34a5975b317..8f0820fb6b13 100644 --- a/sw/source/core/undo/unsort.cxx +++ b/sw/source/core/undo/unsort.cxx @@ -28,7 +28,6 @@ #include <UndoTable.hxx> #include <sortopt.hxx> #include <docsort.hxx> -#include <redline.hxx> #include <node2lay.hxx> // Undo for Sorting diff --git a/sw/source/core/undo/unspnd.cxx b/sw/source/core/undo/unspnd.cxx index 81997ed164d8..112db668dbc2 100644 --- a/sw/source/core/undo/unspnd.cxx +++ b/sw/source/core/undo/unspnd.cxx @@ -24,8 +24,6 @@ #include <swtable.hxx> #include <ndtxt.hxx> #include <swundo.hxx> -#include <editeng/formatbreakitem.hxx> -#include <fmtpdsc.hxx> #include <frmfmt.hxx> #include <UndoCore.hxx> #include <rolbck.hxx> diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index 37f629c92c97..e6a0126036d2 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -25,9 +25,6 @@ #include <fesh.hxx> #include <hintids.hxx> #include <hints.hxx> -#include <editeng/formatbreakitem.hxx> -#include <fmtornt.hxx> -#include <fmtpdsc.hxx> #include <doc.hxx> #include <docredln.hxx> #include <IDocumentUndoRedo.hxx> @@ -40,12 +37,10 @@ #include <ndtxt.hxx> #include <swtable.hxx> #include <pam.hxx> -#include <cntfrm.hxx> #include <tblsel.hxx> #include <swundo.hxx> #include <rolbck.hxx> #include <ddefld.hxx> -#include <tabcol.hxx> #include <tabfrm.hxx> #include <rowfrm.hxx> #include <cellfrm.hxx> @@ -184,7 +179,6 @@ public: } #if OSL_DEBUG_LEVEL > 0 -#include <shellio.hxx> static void CheckTable( const SwTable& ); #define CHECKTABLE(t) CheckTable( t ); #else diff --git a/sw/source/core/undo/untblk.cxx b/sw/source/core/undo/untblk.cxx index 0ca015873f88..46f7b7a769c5 100644 --- a/sw/source/core/undo/untblk.cxx +++ b/sw/source/core/undo/untblk.cxx @@ -17,11 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <hintids.hxx> #include <fmtanchr.hxx> #include <frmfmt.hxx> #include <doc.hxx> -#include <IDocumentUndoRedo.hxx> #include <IDocumentRedlineAccess.hxx> #include <IShellCursorSupplier.hxx> #include <docary.hxx> diff --git a/sw/source/core/unocore/SwXTextDefaults.cxx b/sw/source/core/unocore/SwXTextDefaults.cxx index e7277a9f2347..19ceff59db05 100644 --- a/sw/source/core/unocore/SwXTextDefaults.cxx +++ b/sw/source/core/unocore/SwXTextDefaults.cxx @@ -34,7 +34,6 @@ #include <unomap.hxx> #include <unomid.h> #include <paratr.hxx> -#include <unoprnms.hxx> #include <unocrsrhelper.hxx> #include <hintids.hxx> #include <fmtpdsc.hxx> diff --git a/sw/source/core/unocore/TextCursorHelper.cxx b/sw/source/core/unocore/TextCursorHelper.cxx index f8bf5dd9a026..d2c45acf49b9 100644 --- a/sw/source/core/unocore/TextCursorHelper.cxx +++ b/sw/source/core/unocore/TextCursorHelper.cxx @@ -18,7 +18,6 @@ */ #include <TextCursorHelper.hxx> -#include <unobaseclass.hxx> #include <comphelper/servicehelper.hxx> using namespace ::com::sun::star; diff --git a/sw/source/core/unocore/XMLRangeHelper.cxx b/sw/source/core/unocore/XMLRangeHelper.cxx index dfc48e80a145..4542469f5f94 100644 --- a/sw/source/core/unocore/XMLRangeHelper.cxx +++ b/sw/source/core/unocore/XMLRangeHelper.cxx @@ -18,10 +18,8 @@ */ #include "XMLRangeHelper.hxx" -#include <unotools/charclass.hxx> #include <rtl/character.hxx> #include <rtl/ustrbuf.hxx> -#include <osl/diagnose.h> #include <algorithm> diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx index d415f81cf0c4..9bfa185afb63 100644 --- a/sw/source/core/unocore/swunohelper.cxx +++ b/sw/source/core/unocore/swunohelper.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/ucb/NameClash.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdbc/XRow.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/processfactory.hxx> #include <comphelper/extract.hxx> #include <o3tl/any.hxx> diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx index f27bdeaec023..c8fa27faa896 100644 --- a/sw/source/core/unocore/unobkm.cxx +++ b/sw/source/core/unocore/unobkm.cxx @@ -36,9 +36,6 @@ #include <IMark.hxx> #include <crossrefbookmark.hxx> #include <doc.hxx> -#include <IDocumentState.hxx> -#include <docary.hxx> -#include <swundo.hxx> #include <docsh.hxx> using namespace ::sw::mark; diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index 38241c451a67..58e4e019b21a 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -23,28 +23,23 @@ #include <com/sun/star/chart2/data/LabelOrigin.hpp> #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/frame/XModel.hpp> -#include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/supportsservice.hxx> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> -#include <svl/zforlist.hxx> #include "XMLRangeHelper.hxx" #include <unochart.hxx> #include <swtable.hxx> #include <unoprnms.hxx> #include <unomap.hxx> -#include <unomid.h> #include <unocrsr.hxx> #include <unotbl.hxx> #include <doc.hxx> #include <IDocumentChartDataProviderAccess.hxx> #include <frmfmt.hxx> -#include <docsh.hxx> #include <ndole.hxx> #include <swtypes.hxx> #include <strings.hrc> -#include <docary.hxx> #include <comphelper/servicehelper.hxx> #include <comphelper/string.hxx> #include <svl/itemprop.hxx> diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index ffd3316faf7f..213e040b2d95 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -19,32 +19,19 @@ #include <config_features.h> -#include <swtypes.hxx> -#include <cmdid.h> #include <hintids.hxx> -#include <svx/svxids.hrc> #include <doc.hxx> #include <IDocumentChartDataProviderAccess.hxx> #include <IDocumentFieldsAccess.hxx> #include <docary.hxx> -#include <fmtcol.hxx> -#include <poolfmt.hxx> #include <unocoll.hxx> #include <unosett.hxx> -#include <fmtanchr.hxx> -#include <ndtxt.hxx> #include <section.hxx> #include <IMark.hxx> #include <ftnidx.hxx> #include <fmtftn.hxx> #include <txtftn.hxx> -#include <fmtpdsc.hxx> -#include <pagedesc.hxx> -#include <com/sun/star/text/XTextTableCursor.hpp> -#include <com/sun/star/text/XTextTablesSupplier.hpp> -#include <com/sun/star/text/TableColumnSeparator.hpp> #include <com/sun/star/text/XTextTable.hpp> -#include <svl/PasswordHelper.hxx> #include <svtools/unoimap.hxx> #include <svtools/unoevent.hxx> #include <unotbl.hxx> @@ -61,7 +48,6 @@ #include <unochart.hxx> #include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> -#include <iterator> #include <unosection.hxx> #include <unoparagraph.hxx> #include <unobookmark.hxx> diff --git a/sw/source/core/unocore/unocrsr.cxx b/sw/source/core/unocore/unocrsr.cxx index 5ecc08ad7bef..76bdb939b7a8 100644 --- a/sw/source/core/unocore/unocrsr.cxx +++ b/sw/source/core/unocore/unocrsr.cxx @@ -21,7 +21,6 @@ #include <doc.hxx> #include <IDocumentLayoutAccess.hxx> #include <swtable.hxx> -#include <docary.hxx> #include <rootfrm.hxx> sw::UnoCursorHint::~UnoCursorHint() {} diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index 291f3a8f0d34..0ca6dc57b242 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -31,7 +31,6 @@ #include <com/sun/star/text/XTextSection.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <svx/svxids.hrc> #include <svx/unoshape.hxx> #include <cmdid.h> @@ -41,7 +40,6 @@ #include <unobookmark.hxx> #include <unomap.hxx> #include <unorefmark.hxx> -#include <unostyle.hxx> #include <unoidx.hxx> #include <unofield.hxx> #include <unotbl.hxx> @@ -53,13 +51,10 @@ #include <IDocumentRedlineAccess.hxx> #include <IDocumentLayoutAccess.hxx> #include <fmtftn.hxx> -#include <fmtpdsc.hxx> #include <charfmt.hxx> #include <pagedesc.hxx> #include <docstyle.hxx> #include <ndtxt.hxx> -#include <txtrfmrk.hxx> -#include <fmtfld.hxx> #include <docsh.hxx> #include <section.hxx> #include <shellio.hxx> @@ -74,6 +69,7 @@ #include <tox.hxx> #include <doctxm.hxx> #include <fchrfmt.hxx> +#include <editeng/editids.hrc> #include <editeng/flstitem.hxx> #include <vcl/metric.hxx> #include <svtools/ctrltool.hxx> diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 9dd329920602..e6a7cfa6c3ea 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -21,7 +21,6 @@ #include <initializer_list> #include <memory> -#include <sal/config.h> #include <sal/log.hxx> #include <cmdid.h> @@ -29,7 +28,6 @@ #include <drawdoc.hxx> #include <unodraw.hxx> -#include <unocoll.hxx> #include <unoframe.hxx> #include <unoparagraph.hxx> #include <unotextrange.hxx> @@ -37,13 +35,12 @@ #include <swunohelper.hxx> #include <textboxhelper.hxx> #include <doc.hxx> -#include <docary.hxx> #include <IDocumentUndoRedo.hxx> #include <IDocumentDrawModelAccess.hxx> #include <IDocumentLayoutAccess.hxx> #include <fmtcntnt.hxx> #include <fmtflcnt.hxx> -#include <txtatr.hxx> +#include <txatbase.hxx> #include <docsh.hxx> #include <unomap.hxx> #include <unoport.hxx> @@ -53,7 +50,6 @@ #include <svx/svdview.hxx> #include <svx/unoshape.hxx> #include <dcontact.hxx> -#include <svx/fmglob.hxx> #include <fmtornt.hxx> #include <fmtsrnd.hxx> #include <fmtfollowtextflow.hxx> diff --git a/sw/source/core/unocore/unoevent.cxx b/sw/source/core/unocore/unoevent.cxx index c1b50004d150..7ca58df40551 100644 --- a/sw/source/core/unocore/unoevent.cxx +++ b/sw/source/core/unocore/unoevent.cxx @@ -22,12 +22,8 @@ #include <unoevent.hxx> #include <unoframe.hxx> #include <unostyle.hxx> -#include <swevent.hxx> -#include <docstyle.hxx> -#include <svx/svxids.hrc> #include <fmtinfmt.hxx> #include <svl/macitem.hxx> -#include <rtl/ustrbuf.hxx> #include <sfx2/event.hxx> using namespace ::com::sun::star; diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 90b014202640..3b97450bb5ef 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -17,10 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <config_features.h> - #include <sal/config.h> -#include <editeng/outlobj.hxx> #include <algorithm> #include <memory> @@ -44,28 +41,20 @@ #include <unotextcursor.hxx> #include <unocoll.hxx> #include <sfx2/linkmgr.hxx> -#include <docstat.hxx> #include <editsh.hxx> #include <viewsh.hxx> #include <comphelper/servicehelper.hxx> #include <comphelper/string.hxx> -#include <comphelper/types.hxx> #include <cppuhelper/supportsservice.hxx> -#include <com/sun/star/util/Time.hpp> #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/util/Date.hpp> -#include <com/sun/star/beans/XFastPropertySet.hpp> -#include <com/sun/star/beans/XPropertyStateChangeListener.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> -#include <com/sun/star/beans/XPropertyContainer.hpp> //undef to prevent error (from sfx2/docfile.cxx) #undef SEQUENCE #include <com/sun/star/text/SetVariableType.hpp> #include <com/sun/star/text/WrapTextMode.hpp> #include <com/sun/star/text/TextContentAnchorType.hpp> -#include <com/sun/star/text/PageNumberType.hpp> -#include <unocrsr.hxx> #include <authfld.hxx> #include <flddat.hxx> #include <dbfld.hxx> @@ -93,11 +82,7 @@ #include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <textapi.hxx> -#include <editeng/outliner.hxx> -#include <docsh.hxx> #include <fmtmeta.hxx> -#include <rtl/strbuf.hxx> -#include <editeng/outlobj.hxx> #include <vector> using namespace ::com::sun::star; diff --git a/sw/source/core/unocore/unoflatpara.cxx b/sw/source/core/unocore/unoflatpara.cxx index 909e6fc069e2..6a1546372361 100644 --- a/sw/source/core/unocore/unoflatpara.cxx +++ b/sw/source/core/unocore/unoflatpara.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <editeng/unolingu.hxx> - #include <unobaseclass.hxx> #include <unocrsrhelper.hxx> #include <unoflatpara.hxx> @@ -29,7 +27,6 @@ #include <unotextmarkup.hxx> #include <ndtxt.hxx> #include <doc.hxx> -#include <docsh.hxx> #include <IDocumentLayoutAccess.hxx> #include <IDocumentStylePoolAccess.hxx> #include <viewsh.hxx> diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 7dbd91d656d4..0a180e2905db 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -22,16 +22,10 @@ #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/drawing/BitmapMode.hpp> #include <com/sun/star/drawing/FillStyle.hpp> -#include <com/sun/star/awt/Gradient.hpp> -#include <com/sun/star/embed/XClassifiedObject.hpp> -#include <com/sun/star/embed/XVisualObject.hpp> -#include <com/sun/star/embed/XComponentSupplier.hpp> #include <com/sun/star/embed/EmbedStates.hpp> #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/frame/XTitle.hpp> #include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/graphic/XGraphicProvider.hpp> -#include <com/sun/star/drawing/TextVerticalAdjust.hpp> #include <o3tl/any.hxx> #include <svx/svxids.hrc> #include <svx/xfillit0.hxx> @@ -45,7 +39,6 @@ #include <unomid.h> #include <memory> #include <utility> -#include <hints.hxx> #include <cntfrm.hxx> #include <doc.hxx> #include <drawdoc.hxx> @@ -55,7 +48,6 @@ #include <IDocumentStylePoolAccess.hxx> #include <docsh.hxx> #include <editsh.hxx> -#include <swcli.hxx> #include <ndindex.hxx> #include <pam.hxx> #include <ndnotxt.hxx> @@ -76,20 +68,13 @@ #include <unoprnms.hxx> #include <unoevent.hxx> #include <com/sun/star/util/XModifyBroadcaster.hpp> -#include <com/sun/star/table/ShadowFormat.hpp> -#include <com/sun/star/style/GraphicLocation.hpp> -#include <com/sun/star/text/GraphicCrop.hpp> #include <com/sun/star/text/TextContentAnchorType.hpp> -#include <com/sun/star/text/XTextColumns.hpp> #include <com/sun/star/text/WrapTextMode.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/drawing/PointSequenceSequence.hpp> #include <com/sun/star/drawing/PointSequence.hpp> -#include <com/sun/star/drawing/ColorMode.hpp> #include <tools/poly.hxx> #include <swundo.hxx> -#include <unostyle.hxx> -#include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> #include <editeng/brushitem.hxx> #include <editeng/protitem.hxx> @@ -115,7 +100,6 @@ #include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/GraphicLoader.hxx> -#include <sfx2/printer.hxx> #include <SwStyleNameMapper.hxx> #include <editeng/xmlcnitm.hxx> #include <poolfmt.hxx> diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx index 35d8ffafdc36..f9efe7742012 100644 --- a/sw/source/core/unocore/unoftn.cxx +++ b/sw/source/core/unocore/unoftn.cxx @@ -19,8 +19,6 @@ #include <sal/config.h> -#include <utility> - #include <comphelper/interfacecontainer2.hxx> #include <comphelper/sequence.hxx> #include <comphelper/servicehelper.hxx> @@ -28,7 +26,6 @@ #include <svl/listener.hxx> #include <osl/mutex.hxx> -#include <unomid.h> #include <unofootnote.hxx> #include <unotextrange.hxx> #include <unotextcursor.hxx> @@ -41,7 +38,6 @@ #include <txtftn.hxx> #include <ndtxt.hxx> #include <unocrsr.hxx> -#include <hints.hxx> #include <svl/itemprop.hxx> using namespace ::com::sun::star; diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index 87e06e218d7d..26cc13a113b9 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -36,18 +36,14 @@ #include <cppuhelper/supportsservice.hxx> #include <vcl/svapp.hxx> #include <i18nlangtag/languagetag.hxx> -#include <editeng/unolingu.hxx> #include <editeng/memberids.h> #include <hints.hxx> -#include <cmdid.h> #include <swtypes.hxx> #include <shellres.hxx> #include <viewsh.hxx> #include <doc.hxx> #include <IDocumentLayoutAccess.hxx> #include <docary.hxx> -#include <poolfmt.hxx> -#include <pagedesc.hxx> #include <fmtcntnt.hxx> #include <unomap.hxx> #include <unotextrange.hxx> @@ -55,8 +51,6 @@ #include <unosection.hxx> #include <doctxm.hxx> #include <txttxmrk.hxx> -#include <unocrsr.hxx> -#include <unostyle.hxx> #include <ndtxt.hxx> #include <docsh.hxx> #include <chpfld.hxx> diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx index 4bba72a38fee..2df2f1a7e6b8 100644 --- a/sw/source/core/unocore/unomap.cxx +++ b/sw/source/core/unocore/unomap.cxx @@ -19,67 +19,37 @@ #include <hintids.hxx> -#include <svx/svxids.hrc> #include <com/sun/star/awt/FontSlant.hpp> -#include <com/sun/star/awt/Gradient.hpp> -#include <com/sun/star/awt/Size.hpp> +#include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/PropertyValues.hpp> -#include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/container/XIndexReplace.hpp> -#include <com/sun/star/drawing/BitmapMode.hpp> -#include <com/sun/star/drawing/ColorMode.hpp> -#include <com/sun/star/drawing/FillStyle.hpp> -#include <com/sun/star/drawing/Hatch.hpp> -#include <com/sun/star/drawing/LineStyle.hpp> -#include <com/sun/star/drawing/PointSequenceSequence.hpp> -#include <com/sun/star/drawing/RectanglePoint.hpp> -#include <com/sun/star/drawing/TextVerticalAdjust.hpp> -#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/i18n/XForbiddenCharacters.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> -#include <com/sun/star/style/BreakType.hpp> -#include <com/sun/star/style/DropCapFormat.hpp> #include <com/sun/star/style/GraphicLocation.hpp> -#include <com/sun/star/style/LineSpacing.hpp> -#include <com/sun/star/style/PageStyleLayout.hpp> -#include <com/sun/star/style/TabStop.hpp> #include <com/sun/star/style/VerticalAlignment.hpp> #include <com/sun/star/table/BorderLine.hpp> -#include <com/sun/star/table/ShadowFormat.hpp> -#include <com/sun/star/table/TableBorder.hpp> -#include <com/sun/star/table/TableBorder2.hpp> -#include <com/sun/star/table/TableBorderDistances.hpp> -#include <com/sun/star/table/XCell.hpp> -#include <com/sun/star/text/GraphicCrop.hpp> #include <com/sun/star/text/PageNumberType.hpp> -#include <com/sun/star/text/SectionFileLink.hpp> #include <com/sun/star/text/TableColumnSeparator.hpp> #include <com/sun/star/text/TextContentAnchorType.hpp> #include <com/sun/star/text/WrapTextMode.hpp> #include <com/sun/star/text/XDependentTextField.hpp> -#include <com/sun/star/text/XDocumentIndex.hpp> #include <com/sun/star/text/XDocumentIndexMark.hpp> -#include <com/sun/star/text/XFootnote.hpp> #include <com/sun/star/text/XTextColumns.hpp> -#include <com/sun/star/text/XTextContent.hpp> -#include <com/sun/star/text/XTextField.hpp> #include <com/sun/star/text/XTextFrame.hpp> #include <com/sun/star/text/XTextSection.hpp> -#include <com/sun/star/text/XTextTable.hpp> #include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/script/XLibraryContainer.hpp> #include <com/sun/star/drawing/HomogenMatrix3.hpp> #include <osl/diagnose.h> -#include <swtypes.hxx> -#include <cellatr.hxx> +#include <fmtanchr.hxx> #include <unomap.hxx> #include <unoprnms.hxx> #include <unomid.h> @@ -87,21 +57,9 @@ #include <unofldmid.h> #include <fmtruby.hxx> #include <editeng/colritem.hxx> -#include <editeng/contouritem.hxx> -#include <editeng/crossedoutitem.hxx> -#include <editeng/fhgtitem.hxx> -#include <editeng/fontitem.hxx> -#include <editeng/langitem.hxx> #include <editeng/memberids.h> -#include <editeng/postitem.hxx> -#include <editeng/unoipset.hxx> #include <editeng/unoprnms.hxx> -#include <editeng/shdditem.hxx> -#include <editeng/twolinesitem.hxx> -#include <editeng/udlnitem.hxx> -#include <editeng/wghtitem.hxx> -#include <editeng/adjustitem.hxx> -#include <svx/xdef.hxx> +#include <svl/itemprop.hxx> #include "unomapproperties.hxx" using namespace ::com::sun::star; diff --git a/sw/source/core/unocore/unomap1.cxx b/sw/source/core/unocore/unomap1.cxx index 0c0e3e054bcc..aeea274dedd6 100644 --- a/sw/source/core/unocore/unomap1.cxx +++ b/sw/source/core/unocore/unomap1.cxx @@ -28,7 +28,6 @@ #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/beans/PropertyValues.hpp> #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/container/XIndexReplace.hpp> #include <com/sun/star/container/XNameContainer.hpp> @@ -43,16 +42,13 @@ #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/graphic/XGraphic.hpp> -#include <com/sun/star/i18n/XForbiddenCharacters.hpp> -#include <com/sun/star/sdbc/XConnection.hpp> -#include <com/sun/star/sdbc/XResultSet.hpp> +#include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/style/BreakType.hpp> #include <com/sun/star/style/DropCapFormat.hpp> #include <com/sun/star/style/GraphicLocation.hpp> #include <com/sun/star/style/LineSpacing.hpp> #include <com/sun/star/style/PageStyleLayout.hpp> #include <com/sun/star/style/TabStop.hpp> -#include <com/sun/star/style/VerticalAlignment.hpp> #include <com/sun/star/table/BorderLine.hpp> #include <com/sun/star/table/ShadowFormat.hpp> #include <com/sun/star/table/TableBorder.hpp> @@ -60,12 +56,10 @@ #include <com/sun/star/table/TableBorderDistances.hpp> #include <com/sun/star/table/XCell.hpp> #include <com/sun/star/text/GraphicCrop.hpp> -#include <com/sun/star/text/PageNumberType.hpp> #include <com/sun/star/text/SectionFileLink.hpp> #include <com/sun/star/text/TableColumnSeparator.hpp> #include <com/sun/star/text/TextContentAnchorType.hpp> #include <com/sun/star/text/WrapTextMode.hpp> -#include <com/sun/star/text/XDependentTextField.hpp> #include <com/sun/star/text/XDocumentIndex.hpp> #include <com/sun/star/text/XDocumentIndexMark.hpp> #include <com/sun/star/text/XFootnote.hpp> @@ -75,52 +69,21 @@ #include <com/sun/star/text/XTextFrame.hpp> #include <com/sun/star/text/XTextSection.hpp> #include <com/sun/star/text/XTextTable.hpp> -#include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/DateTime.hpp> -#include <com/sun/star/drawing/HomogenMatrix3.hpp> -#include <swtypes.hxx> #include <unomap.hxx> #include <unoprnms.hxx> #include <unomid.h> #include <cmdid.h> -#include <unofldmid.h> #include <fchrfmt.hxx> #include <fmtruby.hxx> #include <fmtinfmt.hxx> #include <fmtautofmt.hxx> -#include <editeng/autokernitem.hxx> -#include <editeng/blinkitem.hxx> -#include <editeng/boxitem.hxx> -#include <editeng/brushitem.hxx> -#include <editeng/charhiddenitem.hxx> -#include <editeng/charreliefitem.hxx> -#include <editeng/charrotateitem.hxx> -#include <editeng/charscaleitem.hxx> #include <editeng/colritem.hxx> -#include <editeng/cmapitem.hxx> -#include <editeng/contouritem.hxx> -#include <editeng/crossedoutitem.hxx> -#include <editeng/emphasismarkitem.hxx> -#include <editeng/escapementitem.hxx> -#include <editeng/fhgtitem.hxx> -#include <editeng/fontitem.hxx> -#include <editeng/hyphenzoneitem.hxx> -#include <editeng/kernitem.hxx> -#include <editeng/langitem.hxx> #include <editeng/memberids.h> -#include <editeng/nhypitem.hxx> -#include <editeng/postitem.hxx> #include <editeng/rsiditem.hxx> -#include <editeng/shdditem.hxx> -#include <editeng/twolinesitem.hxx> -#include <editeng/udlnitem.hxx> -#include <editeng/unoipset.hxx> #include <editeng/unoprnms.hxx> -#include <editeng/wghtitem.hxx> -#include <editeng/wrlmitem.hxx> -#include <svl/grabbagitem.hxx> +#include <svl/itemprop.hxx> #include <svx/xdef.hxx> -#include <paratr.hxx> #include "unomapproperties.hxx" using namespace ::com::sun::star; diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 74b70cdf42e7..96ab2254b5bc 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -20,85 +20,44 @@ #include <com/sun/star/table/TableSortField.hpp> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/supportsservice.hxx> +#include <svl/itemprop.hxx> #include <o3tl/any.hxx> #include <osl/endian.h> -#include <rtl/ustrbuf.hxx> #include <unotools/collatorwrapper.hxx> #include <swtypes.hxx> #include <hintids.hxx> #include <cmdid.h> #include <unomid.h> #include <hints.hxx> -#include <IMark.hxx> -#include <frmfmt.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> #include <istyleaccess.hxx> #include <ndtxt.hxx> -#include <ndnotxt.hxx> #include <unocrsr.hxx> #include <unocrsrhelper.hxx> #include <swundo.hxx> #include <rootfrm.hxx> -#include <flyfrm.hxx> -#include <ftnidx.hxx> -#include <sfx2/linkmgr.hxx> -#include <docary.hxx> #include <paratr.hxx> #include <pam.hxx> #include <shellio.hxx> -#include <swerror.h> -#include <swtblfmt.hxx> #include <fmtruby.hxx> #include <docsh.hxx> #include <docstyle.hxx> -#include <charfmt.hxx> -#include <txtfld.hxx> -#include <fmtfld.hxx> #include <fmtpdsc.hxx> #include <pagedesc.hxx> #include <edimp.hxx> #include <fchrfmt.hxx> #include <fmtautofmt.hxx> -#include <cntfrm.hxx> -#include <pagefrm.hxx> -#include <doctxm.hxx> -#include <sfx2/docfilt.hxx> -#include <sfx2/docfile.hxx> -#include <sfx2/fcontnr.hxx> -#include <fmtrfmrk.hxx> -#include <txtrfmrk.hxx> #include <unotextrange.hxx> #include <unotextcursor.hxx> #include <unomap.hxx> -#include <unosett.hxx> #include <unoprnms.hxx> -#include <unodraw.hxx> -#include <unocoll.hxx> -#include <unostyle.hxx> #include <unometa.hxx> -#include <fmtanchr.hxx> -#include <editeng/flstitem.hxx> -#include <svtools/ctrltool.hxx> -#include <flypos.hxx> -#include <txtftn.hxx> -#include <com/sun/star/text/WrapTextMode.hpp> -#include <com/sun/star/text/TextContentAnchorType.hpp> +#include <unotext.hxx> #include <com/sun/star/text/TextMarkupType.hpp> -#include <com/sun/star/style/PageStyleLayout.hpp> -#include <com/sun/star/text/XTextDocument.hpp> -#include <com/sun/star/style/XStyleFamiliesSupplier.hpp> -#include <com/sun/star/drawing/XDrawPageSupplier.hpp> -#include <unoframe.hxx> -#include <fmthdft.hxx> #include <vcl/svapp.hxx> #include <unotools/syslocale.hxx> #include <i18nlangtag/languagetag.hxx> -#include <fmtflcnt.hxx> -#include <editeng/brushitem.hxx> -#include <editeng/unolingu.hxx> -#include <fmtclds.hxx> -#include <dcontact.hxx> #include <SwStyleNameMapper.hxx> #include <sortopt.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index e4a282212751..0fa485c1a552 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -19,28 +19,17 @@ #include <sal/config.h> -#include <utility> - #include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> -#include <editeng/brushitem.hxx> -#include <editeng/flstitem.hxx> -#include <editeng/unolingu.hxx> -#include <rtl/ustrbuf.hxx> +#include <svl/intitem.hxx> #include <svl/listener.hxx> -#include <sfx2/docfile.hxx> -#include <sfx2/docfilt.hxx> -#include <sfx2/fcontnr.hxx> -#include <sfx2/linkmgr.hxx> -#include <svtools/ctrltool.hxx> +#include <svx/svdobj.hxx> #include <vcl/svapp.hxx> +#include <anchoredobject.hxx> #include <swtypes.hxx> #include <hintids.hxx> -#include <cmdid.h> -#include <hints.hxx> #include <IMark.hxx> -#include <bookmrk.hxx> #include <frmfmt.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> @@ -48,33 +37,16 @@ #include <IDocumentMarkAccess.hxx> #include <textboxhelper.hxx> #include <ndtxt.hxx> -#include <ndnotxt.hxx> #include <unocrsr.hxx> #include <swundo.hxx> #include <rootfrm.hxx> -#include <flyfrm.hxx> #include <ftnidx.hxx> #include <docary.hxx> -#include <paratr.hxx> #include <pam.hxx> -#include <shellio.hxx> -#include <swerror.h> #include <swtblfmt.hxx> #include <docsh.hxx> -#include <docstyle.hxx> -#include <charfmt.hxx> -#include <txtfld.hxx> -#include <fmtfld.hxx> -#include <fmtpdsc.hxx> #include <pagedesc.hxx> -#include <poolfmt.hxx> -#include <edimp.hxx> -#include <fchrfmt.hxx> #include <cntfrm.hxx> -#include <pagefrm.hxx> -#include <doctxm.hxx> -#include <fmtrfmrk.hxx> -#include <txtrfmrk.hxx> #include <unoparaframeenum.hxx> #include <unofootnote.hxx> #include <unotextbodyhf.hxx> @@ -83,33 +55,19 @@ #include <unomap.hxx> #include <unoport.hxx> #include <unocrsrhelper.hxx> -#include <unosett.hxx> -#include <unoprnms.hxx> #include <unotbl.hxx> -#include <unodraw.hxx> -#include <unocoll.hxx> -#include <unostyle.hxx> #include <fmtanchr.hxx> #include <flypos.hxx> #include <txtftn.hxx> #include <fmtftn.hxx> #include <fmtcntnt.hxx> -#include <com/sun/star/text/WrapTextMode.hpp> -#include <com/sun/star/text/TextContentAnchorType.hpp> -#include <com/sun/star/style/PageStyleLayout.hpp> #include <com/sun/star/text/XTextDocument.hpp> -#include <com/sun/star/style/XStyleFamiliesSupplier.hpp> -#include <com/sun/star/drawing/XDrawPageSupplier.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <unoframe.hxx> #include <fmthdft.hxx> #include <fmtflcnt.hxx> -#include <fmtclds.hxx> -#include <dcontact.hxx> -#include <dflyobj.hxx> #include <vector> #include <sortedobjs.hxx> -#include <sortopt.hxx> #include <algorithm> #include <iterator> diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx index d85eaaa420b8..07af7a238484 100644 --- a/sw/source/core/unocore/unoport.cxx +++ b/sw/source/core/unocore/unoport.cxx @@ -21,7 +21,6 @@ #include <cmdid.h> #include <cppuhelper/exc_hlp.hxx> -#include <cppuhelper/interfacecontainer.h> #include <vcl/svapp.hxx> #include <svl/itemprop.hxx> @@ -32,11 +31,8 @@ #include <unoprnms.hxx> #include <unomid.h> #include <txtatr.hxx> -#include <txtfld.hxx> #include <ndtxt.hxx> #include <doc.hxx> -#include <fmtflcnt.hxx> -#include <fmtfld.hxx> #include <frmfmt.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx index 9cba2c7d9dd4..835a592d00af 100644 --- a/sw/source/core/unocore/unoportenum.cxx +++ b/sw/source/core/unocore/unoportenum.cxx @@ -36,12 +36,10 @@ #include <docary.hxx> #include <textboxhelper.hxx> #include <tox.hxx> -#include <unomid.h> #include <unoparaframeenum.hxx> #include <unocrsrhelper.hxx> #include <unorefmark.hxx> #include <unobookmark.hxx> -#include <unoredline.hxx> #include <unofield.hxx> #include <unometa.hxx> #include <fmtfld.hxx> @@ -54,8 +52,6 @@ #include <unoidx.hxx> #include <unocoll.hxx> #include <redline.hxx> -#include <docufld.hxx> -#include <txtfld.hxx> #include <txtannotationfld.hxx> #include <vcl/svapp.hxx> #include <comphelper/string.hxx> diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx index 517548579d26..79ae6444a146 100644 --- a/sw/source/core/unocore/unoredline.cxx +++ b/sw/source/core/unocore/unoredline.cxx @@ -20,11 +20,6 @@ #include <sal/config.h> #include <sal/log.hxx> -#include <utility> - -#include <com/sun/star/util/DateTime.hpp> -#include <com/sun/star/text/XTextTable.hpp> - #include <cppuhelper/typeprovider.hxx> #include <vcl/svapp.hxx> @@ -33,7 +28,6 @@ #include <redline.hxx> #include <section.hxx> #include <unoprnms.hxx> -#include <unomid.h> #include <unotextrange.hxx> #include <unotextcursor.hxx> #include <unoparagraph.hxx> diff --git a/sw/source/core/unocore/unoredlines.cxx b/sw/source/core/unocore/unoredlines.cxx index 1f44b26c02dd..9e1db2b8e637 100644 --- a/sw/source/core/unocore/unoredlines.cxx +++ b/sw/source/core/unocore/unoredlines.cxx @@ -26,7 +26,6 @@ #include <unoredlines.hxx> #include <unoredline.hxx> -#include <unomid.h> #include <pagedesc.hxx> #include <poolfmt.hxx> #include <doc.hxx> diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx index ee5756c761cd..4de74f149ca5 100644 --- a/sw/source/core/unocore/unorefmk.cxx +++ b/sw/source/core/unocore/unorefmk.cxx @@ -32,18 +32,15 @@ #include <vcl/svapp.hxx> #include <sal/log.hxx> -#include <unomid.h> #include <unotextrange.hxx> #include <unorefmark.hxx> #include <unotextcursor.hxx> #include <unomap.hxx> -#include <unocrsr.hxx> #include <unocrsrhelper.hxx> #include <doc.hxx> #include <ndtxt.hxx> #include <fmtrfmrk.hxx> #include <txtrfmrk.hxx> -#include <hints.hxx> #include <unometa.hxx> #include <unotext.hxx> #include <unoport.hxx> diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx index ff12dc325695..f39a038a0dd7 100644 --- a/sw/source/core/unocore/unosect.cxx +++ b/sw/source/core/unocore/unosect.cxx @@ -45,7 +45,6 @@ #include <unoport.hxx> #include <redline.hxx> #include <unomap.hxx> -#include <unocrsr.hxx> #include <section.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> @@ -53,7 +52,6 @@ #include <sfx2/docfile.hxx> #include <docary.hxx> #include <swundo.hxx> -#include <hints.hxx> #include <tox.hxx> #include <unoidx.hxx> #include <doctxm.hxx> diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index c41d13dea3a8..49d567d1ed07 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -17,17 +17,15 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/svxids.hrc> -#include <editeng/memberids.h> +#include <editeng/editids.hrc> #include <swtypes.hxx> -#include <cmdid.h> #include <unomid.h> #include <hintids.hxx> #include <strings.hrc> #include <poolfmt.hxx> #include <fmtcol.hxx> #include <unomap.hxx> -#include <unostyle.hxx> +//#include <unostyle.hxx> #include <unosett.hxx> #include <unoprnms.hxx> #include <ftninfo.hxx> @@ -42,11 +40,6 @@ #include <fmtclds.hxx> #include <editeng/brushitem.hxx> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <com/sun/star/text/XFootnotesSettingsSupplier.hpp> -#include <com/sun/star/text/XFootnote.hpp> -#include <com/sun/star/text/XFootnotesSupplier.hpp> -#include <com/sun/star/text/XEndnotesSupplier.hpp> -#include <com/sun/star/text/XEndnotesSettingsSupplier.hpp> #include <com/sun/star/text/FootnoteNumbering.hpp> #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/style/LineNumberPosition.hpp> diff --git a/sw/source/core/unocore/unosrch.cxx b/sw/source/core/unocore/unosrch.cxx index 4af7377f4c73..314b55d4ac85 100644 --- a/sw/source/core/unocore/unosrch.cxx +++ b/sw/source/core/unocore/unosrch.cxx @@ -17,26 +17,25 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <hintids.hxx> +#include <fmtinfmt.hxx> #include <unosrch.hxx> -#include <doc.hxx> -#include <hints.hxx> #include <unomap.hxx> -#include <unobaseclass.hxx> -#include <unomid.h> #include <fchrfmt.hxx> +#include <swtypes.hxx> #include <osl/diagnose.h> #include <i18nlangtag/languagetag.hxx> #include <i18nutil/searchopt.hxx> #include <o3tl/any.hxx> #include <vcl/svapp.hxx> -#include <editeng/unolingu.hxx> #include <com/sun/star/util/SearchAlgorithms2.hpp> #include <com/sun/star/util/SearchFlags.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <svl/itemprop.hxx> +#include <svl/itempool.hxx> #include <memory> using namespace ::com::sun::star; diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index acf2ae04d9f7..a516eb30b958 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -38,7 +38,6 @@ #include <editeng/lrspitem.hxx> #include <editeng/boxitem.hxx> #include <editeng/postitem.hxx> -#include <editeng/shaditem.hxx> #include <editeng/shdditem.hxx> #include <editeng/brushitem.hxx> #include <editeng/flstitem.hxx> @@ -74,7 +73,6 @@ #include <com/sun/star/io/IOException.hpp> #include <com/sun/star/style/ParagraphStyleCategory.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> -#include <com/sun/star/text/XTextTablesSupplier.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/drawing/BitmapMode.hpp> diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 914717e83519..4618136409f2 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -18,7 +18,6 @@ */ #include <tuple> -#include <array> #include <utility> #include <memory> #include <vector> @@ -30,13 +29,12 @@ #include <float.h> #include <swtypes.hxx> #include <cmdid.h> +#include <unocoll.hxx> #include <unomid.h> #include <unomap.hxx> #include <unotbl.hxx> -#include <unostyle.hxx> #include <section.hxx> #include <unocrsr.hxx> -#include <svx/unomid.hxx> #include <hints.hxx> #include <swtblfmt.hxx> #include <doc.hxx> @@ -62,7 +60,6 @@ #include <tabfrm.hxx> #include <redline.hxx> #include <unoport.hxx> -#include <unoprnms.hxx> #include <unocrsrhelper.hxx> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/text/WrapTextMode.hpp> @@ -70,20 +67,13 @@ #include <com/sun/star/text/TableColumnSeparator.hpp> #include <com/sun/star/text/VertOrientation.hpp> #include <com/sun/star/text/XTextSection.hpp> -#include <com/sun/star/table/ShadowFormat.hpp> #include <com/sun/star/table/TableBorder.hpp> #include <com/sun/star/table/TableBorder2.hpp> #include <com/sun/star/table/BorderLine2.hpp> -#include <com/sun/star/table/BorderLineStyle.hpp> #include <com/sun/star/table/TableBorderDistances.hpp> -#include <com/sun/star/style/PageStyleLayout.hpp> -#include <com/sun/star/style/BreakType.hpp> -#include <com/sun/star/style/GraphicLocation.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/chart/XChartDataChangeEventListener.hpp> #include <com/sun/star/chart/ChartDataChangeEvent.hpp> -#include <com/sun/star/chart2/data/XDataSequence.hpp> -#include <com/sun/star/chart2/data/XLabeledDataSequence.hpp> #include <com/sun/star/table/CellContentType.hpp> #include <unotextrange.hxx> #include <unotextcursor.hxx> @@ -100,7 +90,6 @@ #include <osl/mutex.hxx> #include <SwStyleNameMapper.hxx> #include <frmatr.hxx> -#include <unochart.hxx> #include <sortopt.hxx> #include <rtl/math.hxx> #include <sal/log.hxx> @@ -115,7 +104,6 @@ #include <docsh.hxx> #include <fesh.hxx> #include <itabenum.hxx> -#include <poolfmt.hxx> using namespace ::com::sun::star; using ::editeng::SvxBorderLine; diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 7b528399a035..64d6dc3ef6a2 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -20,9 +20,7 @@ #include <stdlib.h> #include <memory> -#include <iostream> #include <set> -#include <utility> #include <com/sun/star/drawing/XDrawPageSupplier.hpp> #include <com/sun/star/text/ControlCharacter.hpp> @@ -54,20 +52,16 @@ #include <unoframe.hxx> #include <unofield.hxx> #include <unometa.hxx> -#include <unodraw.hxx> -#include <unoredline.hxx> #include <unomap.hxx> #include <unoprnms.hxx> #include <unoparagraph.hxx> #include <unocrsrhelper.hxx> -#include <docsh.hxx> #include <docary.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> #include <redline.hxx> #include <swundo.hxx> #include <section.hxx> -#include <IMark.hxx> #include <fmtanchr.hxx> #include <fmtcntnt.hxx> #include <ndtxt.hxx> diff --git a/sw/source/core/unocore/unotextmarkup.cxx b/sw/source/core/unocore/unotextmarkup.cxx index 09259ed571e1..1d4074d4462a 100644 --- a/sw/source/core/unocore/unotextmarkup.cxx +++ b/sw/source/core/unocore/unotextmarkup.cxx @@ -19,6 +19,7 @@ #include <unotextmarkup.hxx> +#include <osl/diagnose.h> #include <svl/listener.hxx> #include <vcl/svapp.hxx> #include <SwSmartTagMgr.hxx> @@ -29,6 +30,7 @@ #include <com/sun/star/container/XStringKeyMap.hpp> #include <ndtxt.hxx> #include <SwGrammarMarkUp.hxx> +#include <TextCursorHelper.hxx> #include <IGrammarContact.hxx> @@ -38,7 +40,6 @@ #include <pam.hxx> #include <unotextrange.hxx> -#include <unotextcursor.hxx> #include <modeltoviewhelper.hxx> using namespace ::com::sun::star; diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx index a47c59d71209..46979a985bcd 100644 --- a/sw/source/core/view/pagepreviewlayout.cxx +++ b/sw/source/core/view/pagepreviewlayout.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <vcl/svapp.hxx> - #include <pagepreviewlayout.hxx> #include <prevwpage.hxx> diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx index a2da5005cc38..d7e23bf5251a 100644 --- a/sw/source/core/view/printdata.cxx +++ b/sw/source/core/view/printdata.cxx @@ -19,7 +19,6 @@ #include <printdata.hxx> -#include <globals.hrc> #include <strings.hrc> #include <doc.hxx> #include <IDocumentDeviceAccess.hxx> diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx index 695563c7b5d4..4f6853615138 100644 --- a/sw/source/core/view/vdraw.cxx +++ b/sw/source/core/view/vdraw.cxx @@ -33,7 +33,6 @@ #include <rootfrm.hxx> #include <viewimp.hxx> #include <dflyobj.hxx> -#include <viewopt.hxx> #include <printdata.hxx> #include <dcontact.hxx> #include <dview.hxx> diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx index aba0c251e3da..523d8a585172 100644 --- a/sw/source/core/view/viewimp.cxx +++ b/sw/source/core/view/viewimp.cxx @@ -17,30 +17,23 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <crsrsh.hxx> #include <rootfrm.hxx> #include <pagefrm.hxx> #include <viewimp.hxx> #include <viewopt.hxx> #include <flyfrm.hxx> -#include <frmfmt.hxx> #include <layact.hxx> #include <swregion.hxx> -#include <dflyobj.hxx> #include <dview.hxx> #include <swmodule.hxx> #include <svx/svdpage.hxx> #include <accmap.hxx> #include <pagepreviewlayout.hxx> -#include <svx/svdundo.hxx> #include <comphelper/lok.hxx> -#include <sal/log.hxx> #include <tools/diagnose_ex.h> #include <IDocumentLayoutAccess.hxx> #include <IDocumentDrawModelAccess.hxx> -#include <IDocumentDeviceAccess.hxx> -#include <IDocumentSettingAccess.hxx> #include <drawdoc.hxx> #include <prevwpage.hxx> diff --git a/sw/source/core/view/viewpg.cxx b/sw/source/core/view/viewpg.cxx index 432afc9dec58..07df8ba6bba9 100644 --- a/sw/source/core/view/viewpg.cxx +++ b/sw/source/core/view/viewpg.cxx @@ -17,27 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <hintids.hxx> #include <tools/fract.hxx> -#include <vcl/window.hxx> -#include <vcl/oldprintadaptor.hxx> -#include <sfx2/printer.hxx> -#include <sfx2/progress.hxx> -#include <pvprtdat.hxx> #include <viewsh.hxx> #include <pagefrm.hxx> -#include <rootfrm.hxx> #include <viewimp.hxx> -#include <viewopt.hxx> #include <printdata.hxx> -#include <fldbas.hxx> #include <ptqueue.hxx> -#include <swregion.hxx> -#include <hints.hxx> #include <fntcache.hxx> -#include <IDocumentFieldsAccess.hxx> -#include <IDocumentDeviceAccess.hxx> #include "vprint.hxx" using namespace ::com::sun::star; diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 6ce52e5e041c..f3b419a1cab5 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -17,20 +17,16 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <config_features.h> - #include <com/sun/star/accessibility/XAccessible.hpp> #include <sfx2/viewfrm.hxx> #include <sfx2/progress.hxx> #include <svx/srchdlg.hxx> -#include <svx/svdobj.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/ipclient.hxx> #include <sal/log.hxx> #include <drawdoc.hxx> #include <swwait.hxx> -#include <swmodule.hxx> -#include <fesh.hxx> +#include <crsrsh.hxx> #include <doc.hxx> #include <IDocumentDeviceAccess.hxx> #include <IDocumentDrawModelAccess.hxx> @@ -47,23 +43,18 @@ #include <dview.hxx> #include <swregion.hxx> #include <hints.hxx> -#include <fmtfsize.hxx> #include <docufld.hxx> #include <txtfrm.hxx> #include <layact.hxx> #include <mdiexp.hxx> #include <fntcache.hxx> #include <ptqueue.hxx> -#include <tabfrm.hxx> #include <docsh.hxx> #include <pagedesc.hxx> #include <ndole.hxx> #include <ndindex.hxx> #include <accmap.hxx> #include <vcl/bitmapex.hxx> -#include <svtools/colorcfg.hxx> -#include <vcl/bitmapaccess.hxx> -#include <vcl/alpha.hxx> #include <svtools/accessibilityoptions.hxx> #include <accessibilityoptions.hxx> #include <strings.hrc> @@ -71,21 +62,17 @@ #include <pagepreviewlayout.hxx> #include <sortedobjs.hxx> #include <anchoredobject.hxx> -#include <wrtsh.hxx> #include <DocumentSettingManager.hxx> #include <unotxdoc.hxx> #include <view.hxx> #include <PostItMgr.hxx> #include <unotools/configmgr.hxx> -#include <vcl/dibtools.hxx> #include <vcl/virdev.hxx> #include <vcl/svapp.hxx> #include <svx/sdrpaintwindow.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> -#include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <comphelper/lok.hxx> -#include <prevwpage.hxx> #include <sfx2/lokhelper.hxx> #if !HAVE_FEATURE_DESKTOP diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx index 7828ad97adf1..ef35a749273f 100644 --- a/sw/source/core/view/vprint.cxx +++ b/sw/source/core/view/vprint.cxx @@ -19,26 +19,12 @@ #include <hintids.hxx> -#include <sfx2/app.hxx> -#include <sfx2/objsh.hxx> #include <sfx2/printer.hxx> -#include <sfx2/prnmon.hxx> -#include <svl/languageoptions.hxx> -#include <editeng/paperinf.hxx> -#include <editeng/pbinitem.hxx> #include <svx/svdview.hxx> -#include <toolkit/awt/vclxdevice.hxx> -#include <unotools/localedatawrapper.hxx> -#include <unotools/moduleoptions.hxx> -#include <unotools/syslocale.hxx> -#include <vcl/oldprintadaptor.hxx> - -#include <unotxdoc.hxx> -#include <docsh.hxx> + #include <txtfld.hxx> #include <fmtfld.hxx> #include <fmtfsize.hxx> -#include <frmatr.hxx> #include <rootfrm.hxx> #include <pagefrm.hxx> #include <cntfrm.hxx> @@ -47,27 +33,17 @@ #include <IDocumentDeviceAccess.hxx> #include <IDocumentFieldsAccess.hxx> #include <IDocumentLayoutAccess.hxx> -#include <wdocsh.hxx> #include <fesh.hxx> #include <pam.hxx> #include <viewimp.hxx> #include <layact.hxx> #include <ndtxt.hxx> -#include <fldbas.hxx> -#include <docfld.hxx> -#include <docufld.hxx> -#include <shellres.hxx> #include <viewopt.hxx> #include <printdata.hxx> #include <pagedesc.hxx> -#include <poolfmt.hxx> -#include <mdiexp.hxx> #include <ptqueue.hxx> -#include <tabfrm.hxx> -#include <txtfrm.hxx> #include <viscrs.hxx> #include <fmtpdsc.hxx> -#include <globals.hrc> #include <PostItMgr.hxx> #include "vprint.hxx" _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits