diff options
62 files changed, 60 insertions, 56 deletions
diff --git a/connectivity/source/drivers/writer/WConnection.cxx b/connectivity/source/drivers/writer/WConnection.cxx index bbcd869f2271..cede7c409b0e 100644 --- a/connectivity/source/drivers/writer/WConnection.cxx +++ b/connectivity/source/drivers/writer/WConnection.cxx @@ -23,7 +23,6 @@ #include <writer/WDriver.hxx> #include <resource/sharedresources.hxx> #include <strings.hrc> -#include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/text/XTextDocument.hpp> #include <tools/urlobj.hxx> @@ -32,7 +31,6 @@ #include <unotools/pathoptions.hxx> #include <connectivity/dbexception.hxx> #include <cppuhelper/exc_hlp.hxx> -#include <comphelper/processfactory.hxx> using namespace ::com::sun::star; diff --git a/connectivity/source/drivers/writer/WTable.cxx b/connectivity/source/drivers/writer/WTable.cxx index 89e7720bdfb4..689abe5ac509 100644 --- a/connectivity/source/drivers/writer/WTable.cxx +++ b/connectivity/source/drivers/writer/WTable.cxx @@ -20,30 +20,15 @@ #include <writer/WTable.hxx> #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/DataType.hpp> -#include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/text/XTextDocument.hpp> #include <com/sun/star/text/XTextTable.hpp> #include <com/sun/star/text/XTextTablesSupplier.hpp> #include <com/sun/star/table/XCellRange.hpp> -#include <com/sun/star/util/NumberFormat.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/text/XText.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <svl/converter.hxx> #include <writer/WConnection.hxx> -#include <component/CColumns.hxx> #include <connectivity/sdbcx/VColumn.hxx> -#include <rtl/ustrbuf.hxx> -#include <osl/thread.h> -#include <cppuhelper/queryinterface.hxx> -#include <comphelper/sequence.hxx> -#include <svl/zforlist.hxx> -#include <rtl/math.hxx> -#include <comphelper/extract.hxx> -#include <connectivity/dbexception.hxx> -#include <connectivity/dbconversion.hxx> -#include <comphelper/types.hxx> -#include <connectivity/sdbcx/VCollection.hxx> using namespace ::com::sun::star; diff --git a/connectivity/source/drivers/writer/WTables.cxx b/connectivity/source/drivers/writer/WTables.cxx index b41e3ac63bd1..c3e104d23b4f 100644 --- a/connectivity/source/drivers/writer/WTables.cxx +++ b/connectivity/source/drivers/writer/WTables.cxx @@ -21,12 +21,8 @@ #include <sal/config.h> -#include <comphelper/types.hxx> - #include <writer/WConnection.hxx> #include <file/FCatalog.hxx> -#include <file/FConnection.hxx> -#include <writer/WCatalog.hxx> #include <writer/WTable.hxx> using namespace ::com::sun::star; diff --git a/connectivity/source/inc/writer/WConnection.hxx b/connectivity/source/inc/writer/WConnection.hxx index 99d28ddee45b..94d62923f3f2 100644 --- a/connectivity/source/inc/writer/WConnection.hxx +++ b/connectivity/source/inc/writer/WConnection.hxx @@ -24,7 +24,6 @@ #include <file/FConnection.hxx> #include <com/sun/star/frame/XDesktop2.hpp> #include <com/sun/star/frame/XTerminateListener.hpp> -#include <com/sun/star/uno/DeploymentException.hpp> #include <unotools/closeveto.hxx> #include <o3tl/make_unique.hxx> diff --git a/connectivity/source/inc/writer/WTable.hxx b/connectivity/source/inc/writer/WTable.hxx index b11bc1a27541..4f3b9d129d46 100644 --- a/connectivity/source/inc/writer/WTable.hxx +++ b/connectivity/source/inc/writer/WTable.hxx @@ -21,7 +21,6 @@ #define INCLUDED_CONNECTIVITY_SOURCE_INC_WRITER_WTABLE_HXX #include <component/CTable.hxx> -#include <tools/date.hxx> namespace com { diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx index 4e6725139239..762c60e1006e 100644 --- a/include/svtools/parhtml.hxx +++ b/include/svtools/parhtml.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_SVTOOLS_PARHTML_HXX #define INCLUDED_SVTOOLS_PARHTML_HXX +#include <com/sun/star/uno/Reference.h> #include <svtools/svtdllapi.h> #include <svtools/svparser.hxx> diff --git a/svtools/qa/unit/testHtmlReader.cxx b/svtools/qa/unit/testHtmlReader.cxx index 151976eabc9d..b09abaaabdd5 100644 --- a/svtools/qa/unit/testHtmlReader.cxx +++ b/svtools/qa/unit/testHtmlReader.cxx @@ -10,7 +10,6 @@ #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> -#include <com/sun/star/document/XDocumentProperties.hpp> #include <svtools/parhtml.hxx> #include <tools/ref.hxx> #include <tools/stream.hxx> diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx index 5d485d598b01..2e4fffdb3d30 100644 --- a/sw/inc/AnnotationWin.hxx +++ b/sw/inc/AnnotationWin.hxx @@ -20,15 +20,11 @@ #ifndef INCLUDED_SW_INC_ANNOTATIONWIN_HXX #define INCLUDED_SW_INC_ANNOTATIONWIN_HXX -#include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/range/b2drange.hxx> -#include <editeng/editstat.hxx> #include <tools/date.hxx> #include <vcl/builder.hxx> -#include <vcl/lineinfo.hxx> #include <vcl/window.hxx> -#include "docufld.hxx" #include "postithelper.hxx" #include "swrect.hxx" #include "SidebarWindowsTypes.hxx" diff --git a/sw/inc/EnhancedPDFExportHelper.hxx b/sw/inc/EnhancedPDFExportHelper.hxx index 2ebec2f20758..88d5f8c0a393 100644 --- a/sw/inc/EnhancedPDFExportHelper.hxx +++ b/sw/inc/EnhancedPDFExportHelper.hxx @@ -20,8 +20,8 @@ #ifndef INCLUDED_SW_INC_ENHANCEDPDFEXPORTHELPER_HXX #define INCLUDED_SW_INC_ENHANCEDPDFEXPORTHELPER_HXX -#include <vcl/pdfextoutdevdata.hxx> #include <i18nlangtag/lang.h> +#include <vcl/pdfwriter.hxx> #include "swrect.hxx" #include "swtypes.hxx" diff --git a/sw/inc/IDocumentLayoutAccess.hxx b/sw/inc/IDocumentLayoutAccess.hxx index bc1c4aa65e4f..67c1b908abd2 100644 --- a/sw/inc/IDocumentLayoutAccess.hxx +++ b/sw/inc/IDocumentLayoutAccess.hxx @@ -20,14 +20,13 @@ #ifndef INCLUDED_SW_INC_IDOCUMENTLAYOUTACCESS_HXX #define INCLUDED_SW_INC_IDOCUMENTLAYOUTACCESS_HXX -#include "swtypes.hxx" - class SwViewShell; class SwRootFrame; class SwFrameFormat; class SfxItemSet; class SwLayouter; class SwFormatAnchor; +enum class RndStdIds; /** Provides access to the layout of a document. */ diff --git a/sw/inc/IDocumentLinksAdministration.hxx b/sw/inc/IDocumentLinksAdministration.hxx index 5f511bce3532..fc894ead0200 100644 --- a/sw/inc/IDocumentLinksAdministration.hxx +++ b/sw/inc/IDocumentLinksAdministration.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SW_INC_IDOCUMENTLINKSADMINISTRATION_HXX #define INCLUDED_SW_INC_IDOCUMENTLINKSADMINISTRATION_HXX -#include <tools/solar.h> +#include <sal/types.h> namespace com { namespace sun { namespace star { namespace uno { class Any; } } } } namespace sfx2 { class SvLinkSource; class LinkManager; } diff --git a/sw/inc/IDocumentOutlineNodes.hxx b/sw/inc/IDocumentOutlineNodes.hxx index 6b69da672d30..32db18cb914d 100644 --- a/sw/inc/IDocumentOutlineNodes.hxx +++ b/sw/inc/IDocumentOutlineNodes.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SW_INC_IDOCUMENTOUTLINENODES_HXX #include <rtl/ustring.hxx> -#include <sal/types.h> #include <vector> class SwTextNode; diff --git a/sw/inc/IDocumentRedlineAccess.hxx b/sw/inc/IDocumentRedlineAccess.hxx index 7ff58d456ca4..2050ee2ec3cc 100644 --- a/sw/inc/IDocumentRedlineAccess.hxx +++ b/sw/inc/IDocumentRedlineAccess.hxx @@ -25,11 +25,8 @@ #include <cstddef> #include <sal/types.h> -#include <tools/solar.h> -#include <limits.h> - -#include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/uno/Sequence.h> #include <o3tl/typed_flags_set.hxx> #include "docary.hxx" diff --git a/sw/inc/IDocumentSettingAccess.hxx b/sw/inc/IDocumentSettingAccess.hxx index 41b2c4ff79c3..e3ac10797b89 100644 --- a/sw/inc/IDocumentSettingAccess.hxx +++ b/sw/inc/IDocumentSettingAccess.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SW_INC_IDOCUMENTSETTINGACCESS_HXX #define INCLUDED_SW_INC_IDOCUMENTSETTINGACCESS_HXX -#include <tools/solar.h> +#include <sal/types.h> #include "fldupde.hxx" #include <i18nlangtag/lang.h> #include <memory> diff --git a/sw/inc/IDocumentState.hxx b/sw/inc/IDocumentState.hxx index eeab2efa9e1d..d108a91ccb3a 100644 --- a/sw/inc/IDocumentState.hxx +++ b/sw/inc/IDocumentState.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_SW_INC_IDOCUMENTSTATE_HXX #define INCLUDED_SW_INC_IDOCUMENTSTATE_HXX -#include <tools/solar.h> - /** Get information about the current document state */ class IDocumentState diff --git a/sw/inc/PageColumnPopup.hxx b/sw/inc/PageColumnPopup.hxx index a0b217a5329e..3753596a4e6f 100644 --- a/sw/inc/PageColumnPopup.hxx +++ b/sw/inc/PageColumnPopup.hxx @@ -21,8 +21,6 @@ #include <sfx2/tbxctrl.hxx> #include "swdllapi.h" -#include <vcl/vclenum.hxx> -#include <functional> class SW_DLLPUBLIC PageColumnPopup : public SfxToolBoxControl { diff --git a/sw/inc/PageMarginPopup.hxx b/sw/inc/PageMarginPopup.hxx index d3f4424d7515..7a66ca8e3db9 100644 --- a/sw/inc/PageMarginPopup.hxx +++ b/sw/inc/PageMarginPopup.hxx @@ -21,8 +21,6 @@ #include <sfx2/tbxctrl.hxx> #include "swdllapi.h" -#include <vcl/vclenum.hxx> -#include <functional> class SW_DLLPUBLIC PageMarginPopup : public SfxToolBoxControl { diff --git a/sw/inc/PageOrientationPopup.hxx b/sw/inc/PageOrientationPopup.hxx index 1d403a9332b9..b8cdacb79dfb 100644 --- a/sw/inc/PageOrientationPopup.hxx +++ b/sw/inc/PageOrientationPopup.hxx @@ -21,8 +21,6 @@ #include <sfx2/tbxctrl.hxx> #include "swdllapi.h" -#include <vcl/vclenum.hxx> -#include <functional> class SW_DLLPUBLIC PageOrientationPopup : public SfxToolBoxControl { diff --git a/sw/inc/PageSizePopup.hxx b/sw/inc/PageSizePopup.hxx index 4355ec23cb70..a604accde35e 100644 --- a/sw/inc/PageSizePopup.hxx +++ b/sw/inc/PageSizePopup.hxx @@ -21,8 +21,6 @@ #include <sfx2/tbxctrl.hxx> #include "swdllapi.h" -#include <vcl/vclenum.hxx> -#include <functional> class SW_DLLPUBLIC PageSizePopup : public SfxToolBoxControl { diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index a243aa11125c..726471e1dea6 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -20,19 +20,13 @@ #define INCLUDED_SW_INC_DOC_HXX // SwDoc interfaces -#include "IDocumentMarkAccess.hxx" -#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/embed/XStorage.hpp> -#include <vcl/timer.hxx> #include <vcl/idle.hxx> -#include <sal/macros.h> #include "swdllapi.h" #include "swtypes.hxx" -#include "swatrset.hxx" #include "toxe.hxx" #include "flyenum.hxx" #include "flypos.hxx" -#include "itabenum.hxx" #include "swdbdata.hxx" #include <com/sun/star/linguistic2/XSpellChecker1.hpp> #include <com/sun/star/linguistic2/XHyphenatedWord.hpp> @@ -48,8 +42,6 @@ #include "pagedesc.hxx" #include "tblenum.hxx" -#include <svtools/embedhlp.hxx> - #include <memory> #include <set> #include <unordered_map> @@ -175,7 +167,9 @@ class IDocumentState; class IDocumentLayoutAccess; class IDocumentStylePoolAccess; class IDocumentExternalData; +class IDocumentMarkAccess; class SetGetExpFields; +struct SwInsertTableOptions; namespace sw { namespace mark { class MarkManager; diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx index d7a75571b05c..2524b61be6c0 100644 --- a/sw/qa/core/macros-test.cxx +++ b/sw/qa/core/macros-test.cxx @@ -53,6 +53,7 @@ #include <ndtxt.hxx> #include <doc.hxx> #include <IDocumentLayoutAccess.hxx> +#include <IDocumentMarkAccess.hxx> #include <IDocumentUndoRedo.hxx> #include <IDocumentContentOperations.hxx> #include <docsh.hxx> diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx index e73636139224..6bc47bdc3df1 100644 --- a/sw/qa/core/uwriter.cxx +++ b/sw/qa/core/uwriter.cxx @@ -66,6 +66,8 @@ #include <tblafmt.hxx> #include <unotbl.hxx> +#include <IDocumentMarkAccess.hxx> +#include <itabenum.hxx> typedef tools::SvRef<SwDocShell> SwDocShellRef; diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx b/sw/qa/extras/globalfilter/globalfilter.cxx index 8450c2f82f79..296517528a91 100644 --- a/sw/qa/extras/globalfilter/globalfilter.cxx +++ b/sw/qa/extras/globalfilter/globalfilter.cxx @@ -21,6 +21,8 @@ #include <doc.hxx> #include <ndgrf.hxx> #include <drawdoc.hxx> +#include <ndindex.hxx> +#include <pam.hxx> #include <unotools/fltrcfg.hxx> class Test : public SwModelTestBase diff --git a/sw/source/core/crsr/findfmt.cxx b/sw/source/core/crsr/findfmt.cxx index e6ae94286f9b..2b16d0481ddd 100644 --- a/sw/source/core/crsr/findfmt.cxx +++ b/sw/source/core/crsr/findfmt.cxx @@ -19,6 +19,7 @@ #include <doc.hxx> #include <pamtyp.hxx> +#include <pam.hxx> #include <memory> bool SwPaM::Find( const SwFormat& rFormat, SwMoveFnCollection const & fnMove, diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx index 4705f5c625ac..0433bc655273 100644 --- a/sw/source/core/crsr/swcrsr.cxx +++ b/sw/source/core/crsr/swcrsr.cxx @@ -49,6 +49,7 @@ #include <strings.hrc> #include <redline.hxx> #include <txatbase.hxx> +#include <IDocumentMarkAccess.hxx> #include <memory> #include <comphelper/lok.hxx> diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx index 414433ababd7..f6a8bc90a39f 100644 --- a/sw/source/core/doc/DocumentFieldsManager.cxx +++ b/sw/source/core/doc/DocumentFieldsManager.cxx @@ -48,6 +48,8 @@ #include <ddefld.hxx> #include <authfld.hxx> #include <usrfld.hxx> +#include <ndindex.hxx> +#include <pam.hxx> #include <unotools/transliterationwrapper.hxx> #include <com/sun/star/uno/Any.hxx> diff --git a/sw/source/core/doc/DocumentLayoutManager.cxx b/sw/source/core/doc/DocumentLayoutManager.cxx index 1c220bea373a..dc1cb1637e92 100644 --- a/sw/source/core/doc/DocumentLayoutManager.cxx +++ b/sw/source/core/doc/DocumentLayoutManager.cxx @@ -39,6 +39,8 @@ #include <unoframe.hxx> #include <docary.hxx> #include <textboxhelper.hxx> +#include <ndindex.hxx> +#include <pam.hxx> using namespace ::com::sun::star; diff --git a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx index 4a1fe172789a..a66b29ec3ab0 100644 --- a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx +++ b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx @@ -24,6 +24,7 @@ #include <IDocumentUndoRedo.hxx> #include <IDocumentState.hxx> #include <IDocumentLayoutAccess.hxx> +#include <IDocumentMarkAccess.hxx> #include <sfx2/objsh.hxx> #include <sfx2/linkmgr.hxx> #include <sfx2/docfile.hxx> diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx index d55a529881ce..e68183af8ef0 100644 --- a/sw/source/core/docnode/ndcopy.cxx +++ b/sw/source/core/docnode/ndcopy.cxx @@ -28,6 +28,7 @@ #include <ddefld.hxx> #include <swddetbl.hxx> #include <svtools/fmtfield.hxx> +#include <ndindex.hxx> #include <vector> diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index 8a014dffe069..c0749e131509 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -26,6 +26,7 @@ #include <doc.hxx> #include <IDocumentFieldsAccess.hxx> #include <IDocumentLayoutAccess.hxx> +#include <IDocumentMarkAccess.hxx> #include <pam.hxx> #include <cntfrm.hxx> #include <pagefrm.hxx> diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx index 7562791510f5..1d1d807a0ec0 100644 --- a/sw/source/core/layout/anchoredobject.cxx +++ b/sw/source/core/layout/anchoredobject.cxx @@ -29,6 +29,7 @@ #include <sortedobjs.hxx> #include <pagefrm.hxx> #include <layouter.hxx> +#include <pam.hxx> using namespace ::com::sun::star; diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index 78b78e61b8e9..30d92bb3fae4 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -56,6 +56,7 @@ #include <calbck.hxx> #include <IDocumentSettingAccess.hxx> #include <IDocumentDrawModelAccess.hxx> +#include <pam.hxx> #include <o3tl/make_unique.hxx> bool SwFlowFrame::m_bMoveBwdJump = false; diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index da57f1212b79..3f1d2e522b57 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -62,6 +62,8 @@ #include <IDocumentLayoutAccess.hxx> #include <textboxhelper.hxx> #include <txtfly.hxx> +#include <ndindex.hxx> +#include <pam.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx index 7924e788b621..71cdcc029235 100644 --- a/sw/source/core/layout/flycnt.cxx +++ b/sw/source/core/layout/flycnt.cxx @@ -21,6 +21,7 @@ #include <pagefrm.hxx> #include <txtfrm.hxx> #include <doc.hxx> +#include <pam.hxx> #include <IDocumentUndoRedo.hxx> #include <IDocumentSettingAccess.hxx> #include <IDocumentDrawModelAccess.hxx> diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx index fb0544defc1d..ea1dfa7de12f 100644 --- a/sw/source/core/layout/flylay.cxx +++ b/sw/source/core/layout/flylay.cxx @@ -42,6 +42,8 @@ #include <viewimp.hxx> #include <IDocumentSettingAccess.hxx> #include <IDocumentDrawModelAccess.hxx> +#include <pam.hxx> +#include <ndindex.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <svx/sdr/attribute/sdrallfillattributeshelper.hxx> diff --git a/sw/source/core/layout/flypos.cxx b/sw/source/core/layout/flypos.cxx index 0f470f26fa40..70fd4b981923 100644 --- a/sw/source/core/layout/flypos.cxx +++ b/sw/source/core/layout/flypos.cxx @@ -24,6 +24,7 @@ #include <flyfrm.hxx> #include <dflyobj.hxx> #include <calbck.hxx> +#include <pam.hxx> bool SwPosFlyFrameCmp::operator()(const SwPosFlyFramePtr& rA, const SwPosFlyFramePtr& rB) const { diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx index 004a7b65b3a9..a3fc1aebaf74 100644 --- a/sw/source/core/layout/ftnfrm.cxx +++ b/sw/source/core/layout/ftnfrm.cxx @@ -33,6 +33,8 @@ #include <objectformatter.hxx> #include <viewopt.hxx> #include <calbck.hxx> +#include <ndindex.hxx> +#include <pam.hxx> #define ENDNOTE 0x80000000 diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx index 00f284ca0610..f4ac216ab24e 100644 --- a/sw/source/core/layout/hffrm.cxx +++ b/sw/source/core/layout/hffrm.cxx @@ -31,6 +31,7 @@ #include <hfspacingitem.hxx> #include <sortedobjs.hxx> #include <objectformatter.hxx> +#include <ndindex.hxx> #include <o3tl/make_unique.hxx> static SwTwips lcl_GetFrameMinHeight(const SwLayoutFrame & rFrame) diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx index 4b7e2bb0558e..e7ee8d1f21a0 100644 --- a/sw/source/core/layout/laycache.cxx +++ b/sw/source/core/layout/laycache.cxx @@ -41,6 +41,8 @@ #include <viewopt.hxx> #include <flyfrm.hxx> #include <sortedobjs.hxx> +#include <ndindex.hxx> +#include <node.hxx> #include <limits> #include <set> diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx index 0c4af5d82def..1bab86af7333 100644 --- a/sw/source/core/layout/newfrm.cxx +++ b/sw/source/core/layout/newfrm.cxx @@ -41,6 +41,7 @@ #include <IDocumentSettingAccess.hxx> #include <IDocumentFieldsAccess.hxx> #include <DocumentLayoutManager.hxx> +#include <ndindex.hxx> SwLayVout *SwRootFrame::s_pVout = nullptr; bool SwRootFrame::s_isInPaint = false; diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx index 26cfde205d6f..f55ccbd044f1 100644 --- a/sw/source/core/layout/pagedesc.cxx +++ b/sw/source/core/layout/pagedesc.cxx @@ -30,6 +30,7 @@ #include <swtable.hxx> #include <frmtool.hxx> #include <doc.hxx> +#include <node.hxx> #include <strings.hrc> #include <IDocumentLayoutAccess.hxx> #include <IDocumentStylePoolAccess.hxx> diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx index d24bb5a0cc60..276c5f80a30d 100644 --- a/sw/source/core/text/EnhancedPDFExportHelper.cxx +++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx @@ -23,6 +23,7 @@ #include <hintids.hxx> #include <vcl/outdev.hxx> +#include <vcl/pdfextoutdevdata.hxx> #include <tools/multisel.hxx> #include <editeng/adjustitem.hxx> #include <editeng/lrspitem.hxx> diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index e8802b73eb08..898d2f56c48e 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -48,6 +48,7 @@ #include <frmtool.hxx> #include <IDocumentSettingAccess.hxx> #include <IDocumentDeviceAccess.hxx> +#include <IDocumentMarkAccess.hxx> #include <paratr.hxx> #include <rootfrm.hxx> #include "inftxt.hxx" diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index fbaa66dedc7b..e1ab681d6679 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -57,6 +57,8 @@ #include <unotools/charclass.hxx> #include <xmloff/odffields.hxx> #include <IDocumentSettingAccess.hxx> +#include <IMark.hxx> +#include <IDocumentMarkAccess.hxx> #include <vector> diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx index d6da0f0db312..865839bf6dc6 100644 --- a/sw/source/core/text/portxt.cxx +++ b/sw/source/core/text/portxt.cxx @@ -33,6 +33,7 @@ #include <wrong.hxx> #include <viewsh.hxx> #include <IDocumentSettingAccess.hxx> +#include <IDocumentMarkAccess.hxx> #include <viewopt.hxx> #include <editeng/borderline.hxx> diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx index 12ebbda94dc7..ffc6e222081c 100644 --- a/sw/source/core/tox/txmsrt.cxx +++ b/sw/source/core/tox/txmsrt.cxx @@ -23,6 +23,7 @@ #include <txtfld.hxx> #include <doc.hxx> #include <IDocumentLayoutAccess.hxx> +#include <IDocumentMarkAccess.hxx> #include <docary.hxx> #include <cntfrm.hxx> #include <node.hxx> diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx index f8d55ef5c02b..36c39618074a 100644 --- a/sw/source/core/txtnode/atrfld.cxx +++ b/sw/source/core/txtnode/atrfld.cxx @@ -38,6 +38,7 @@ #include <calc.hxx> #include <hints.hxx> #include <IDocumentFieldsAccess.hxx> +#include <IDocumentMarkAccess.hxx> #include <fieldhint.hxx> diff --git a/sw/source/core/txtnode/modeltoviewhelper.cxx b/sw/source/core/txtnode/modeltoviewhelper.cxx index c67727362e58..5018bf128474 100644 --- a/sw/source/core/txtnode/modeltoviewhelper.cxx +++ b/sw/source/core/txtnode/modeltoviewhelper.cxx @@ -30,6 +30,7 @@ #include <txtfld.hxx> #include <txtftn.hxx> #include <scriptinfo.hxx> +#include <IDocumentMarkAccess.hxx> #include <set> #include <vector> diff --git a/sw/source/core/undo/SwUndoField.cxx b/sw/source/core/undo/SwUndoField.cxx index 3b8e50d86dea..10193dd89135 100644 --- a/sw/source/core/undo/SwUndoField.cxx +++ b/sw/source/core/undo/SwUndoField.cxx @@ -29,6 +29,7 @@ #include <fmtfld.hxx> #include <dbfld.hxx> #include <docsh.hxx> +#include <pam.hxx> using namespace ::com::sun::star::uno; diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index 1e5105c1f1b4..e175fcf84d62 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -32,6 +32,7 @@ #include <doc.hxx> #include <IDocumentUndoRedo.hxx> #include <IDocumentLayoutAccess.hxx> +#include <IDocumentMarkAccess.hxx> #include <textboxhelper.hxx> #include <ndtxt.hxx> #include <ndnotxt.hxx> diff --git a/sw/source/filter/basflt/fltshell.cxx b/sw/source/filter/basflt/fltshell.cxx index 970d613ba541..2b0b3c12bd7d 100644 --- a/sw/source/filter/basflt/fltshell.cxx +++ b/sw/source/filter/basflt/fltshell.cxx @@ -54,6 +54,7 @@ #include <IDocumentStylePoolAccess.hxx> #include <IDocumentState.hxx> #include <IDocumentLayoutAccess.hxx> +#include <IDocumentMarkAccess.hxx> #include <ndtxt.hxx> #include <frmatr.hxx> #include <fldbas.hxx> diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx index 7d45e0a2a843..80d6be5338a7 100644 --- a/sw/source/filter/html/htmlfly.cxx +++ b/sw/source/filter/html/htmlfly.cxx @@ -32,6 +32,8 @@ #include <doc.hxx> #include <frmfmt.hxx> +#include <ndindex.hxx> +#include <pam.hxx> using namespace css; diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index d9466e690128..44adccdff122 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -67,6 +67,7 @@ #include "swhtml.hxx" #include <numrule.hxx> #include <fmtflcnt.hxx> +#include <IDocumentMarkAccess.hxx> #include <vcl/graphicfilter.hxx> #include <tools/urlobj.hxx> diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 8ed2ca32707e..e09f2ab91387 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -60,6 +60,7 @@ #include "swcss1.hxx" #include <numrule.hxx> #include <txtftn.hxx> +#include <itabenum.hxx> #define NETSCAPE_DFLT_BORDER 1 #define NETSCAPE_DFLT_CELLSPACING 2 diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 9bc01910c409..4fd3cd91be9d 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -74,6 +74,7 @@ #include <rtl/strbuf.hxx> #include <IDocumentSettingAccess.hxx> #include <IDocumentStylePoolAccess.hxx> +#include <IDocumentMarkAccess.hxx> #include <xmloff/odffields.hxx> #include <tools/urlobj.hxx> diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx index bcd03f2b8db0..06ff819111f0 100644 --- a/sw/source/filter/writer/writer.cxx +++ b/sw/source/filter/writer/writer.cxx @@ -32,6 +32,7 @@ #include <docary.hxx> #include <IMark.hxx> #include <IDocumentSettingAccess.hxx> +#include <IDocumentMarkAccess.hxx> #include <numrule.hxx> #include <swerror.h> diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 48a6098f5eb9..0fd463a0cd93 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -67,6 +67,7 @@ #include <pam.hxx> #include <doc.hxx> #include <IDocumentSettingAccess.hxx> +#include <IDocumentMarkAccess.hxx> #include <docary.hxx> #include <swtable.hxx> #include <swtblfmt.hxx> diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 6484a3606cff..7df189d5ea37 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -78,6 +78,7 @@ #include <docsh.hxx> #include <IDocumentFieldsAccess.hxx> #include <IDocumentLayoutAccess.hxx> +#include <IDocumentMarkAccess.hxx> #include <IDocumentStylePoolAccess.hxx> #include <IDocumentExternalData.hxx> #include <docufld.hxx> diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 99f65112fa26..c0f8f1cbb164 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -69,6 +69,7 @@ #include "ww8par2.hxx" #include <frmatr.hxx> +#include <itabenum.hxx> #include <iostream> #include <memory> diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index f5ceca90a2b2..e209103d892d 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -48,6 +48,7 @@ #include <doc.hxx> #include <docary.hxx> #include <IDocumentFieldsAccess.hxx> +#include <IDocumentMarkAccess.hxx> #include <docsh.hxx> #include <numrule.hxx> #include <paratr.hxx> diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 21cfb299c8e2..6690c6489300 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -50,6 +50,7 @@ #include <pam.hxx> #include <doc.hxx> #include <IDocumentFieldsAccess.hxx> +#include <IDocumentMarkAccess.hxx> #include <IDocumentState.hxx> #include <charatr.hxx> #include <flddat.hxx> diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 9d2ccc5cdd11..950973c58555 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -134,6 +134,7 @@ #include <cppuhelper/supportsservice.hxx> #include <unotools/saveopt.hxx> #include <swruler.hxx> +#include <docufld.hxx> #include <EnhancedPDFExportHelper.hxx> |