sw/IwyuFilter_sw.yaml | 22 ++-------------- sw/inc/BorderCacheOwner.hxx | 1 sw/inc/IDocumentFieldsAccess.hxx | 1 sw/inc/app.hrc | 2 + sw/inc/bparr.hxx | 1 sw/inc/calbck.hxx | 1 sw/inc/ddefld.hxx | 1 sw/inc/doc.hxx | 1 sw/inc/docary.hxx | 1 sw/inc/docstyle.hxx | 1 sw/inc/edglbldc.hxx | 3 +- sw/inc/edimp.hxx | 3 +- sw/inc/expfld.hxx | 2 - sw/inc/fldbas.hxx | 1 sw/inc/flddinf.hrc | 2 + sw/inc/fldref.hrc | 2 + sw/inc/list.hxx | 3 -- sw/inc/mdiexp.hxx | 3 +- sw/inc/mmaddressblockpage.hrc | 2 + sw/inc/ndindex.hxx | 2 - sw/inc/optload.hrc | 1 sw/inc/outline.hrc | 2 + sw/inc/pageformatpanel.hrc | 2 + sw/inc/postithelper.hxx | 1 sw/inc/sortopt.hxx | 1 sw/inc/swbaslnk.hxx | 3 +- sw/inc/swmodule.hxx | 1 sw/inc/swtable.hxx | 1 sw/inc/swtblfmt.hxx | 2 + sw/inc/swtypes.hxx | 1 sw/inc/tblafmt.hxx | 2 - sw/inc/tblenum.hxx | 1 sw/inc/textboxhelper.hxx | 3 -- sw/inc/undobj.hxx | 1 sw/inc/unobaseclass.hxx | 2 - sw/inc/unosett.hxx | 3 -- sw/inc/utlui.hrc | 2 + sw/source/core/crsr/callnk.hxx | 1 sw/source/core/doc/tblafmt.cxx | 1 sw/source/core/docnode/ndsect.hxx | 1 sw/source/core/draw/dflyobj.cxx | 1 sw/source/core/inc/DocumentChartDataProviderManager.hxx | 1 sw/source/core/inc/DocumentRedlineManager.hxx | 1 sw/source/core/inc/GraphicSizeCheck.hxx | 1 sw/source/core/inc/SwXMLBlockImport.hxx | 2 - sw/source/core/inc/UndoCore.hxx | 1 sw/source/core/inc/UndoRedline.hxx | 1 sw/source/core/inc/UndoSort.hxx | 1 sw/source/core/inc/UndoTable.hxx | 1 sw/source/core/inc/acorrect.hxx | 1 sw/source/core/inc/drawfont.hxx | 1 sw/source/core/inc/fntcache.hxx | 2 - sw/source/core/inc/layact.hxx | 3 ++ sw/source/core/inc/node2lay.hxx | 3 +- sw/source/core/inc/rolbck.hxx | 1 sw/source/core/inc/rootfrm.hxx | 1 sw/source/core/inc/tblrwcl.hxx | 1 sw/source/core/inc/txmsrt.hxx | 1 sw/source/core/inc/txtfly.hxx | 1 sw/source/core/inc/unoflatpara.hxx | 1 sw/source/core/inc/unolinebreak.hxx | 1 sw/source/core/inc/wrong.hxx | 1 sw/source/core/layout/atrfrm.cxx | 2 + sw/source/core/layout/dumpfilter.cxx | 1 sw/source/core/layout/flyincnt.cxx | 1 sw/source/core/layout/layhelp.hxx | 1 sw/source/core/text/atrhndl.hxx | 3 -- sw/source/core/text/porlay.hxx | 2 - sw/source/core/text/possiz.hxx | 1 sw/source/core/undo/untbl.cxx | 2 + sw/source/core/unocore/unochart.cxx | 1 sw/source/core/unocore/unodraw.cxx | 1 sw/source/core/unocore/unolinebreak.cxx | 1 sw/source/core/unocore/unotbl.cxx | 1 sw/source/core/unocore/unotextmarkup.cxx | 1 sw/source/core/view/vprint.cxx | 1 sw/source/filter/html/htmlfly.hxx | 2 + sw/source/filter/html/htmlform.hxx | 2 - sw/source/filter/html/svxcss1.hxx | 2 - sw/source/filter/inc/msfilter.hxx | 2 - sw/source/filter/ww8/docxhelper.hxx | 2 - sw/source/filter/ww8/docxsdrexport.hxx | 1 sw/source/filter/ww8/writerhelper.hxx | 2 - sw/source/filter/ww8/ww8par.hxx | 1 sw/source/filter/xml/XMLRedlineImportHelper.cxx | 1 sw/source/filter/xml/wrtxml.hxx | 1 sw/source/filter/xml/xmlexp.cxx | 1 sw/source/filter/xml/xmltbli.cxx | 1 sw/source/filter/xml/xmltexti.cxx | 1 sw/source/ui/dbui/mmlayoutpage.cxx | 1 sw/source/ui/index/cntex.cxx | 1 sw/source/ui/vba/vbatablehelper.cxx | 1 sw/source/ui/vba/wordvbahelper.cxx | 1 sw/source/uibase/inc/HeaderFooterWin.hxx | 1 sw/source/uibase/inc/autoformatpreview.hxx | 1 sw/source/uibase/inc/bookctrl.hxx | 1 sw/source/uibase/inc/optload.hxx | 1 sw/source/uibase/inc/uiobject.hxx | 1 sw/source/uibase/inc/unomailmerge.hxx | 1 sw/source/uibase/inc/workctrl.hxx | 1 sw/source/uibase/shells/basesh.cxx | 1 sw/source/uibase/uno/SwXFilterOptions.cxx | 1 sw/source/uibase/uno/unomailmerge.cxx | 1 sw/source/uibase/uno/unotxdoc.cxx | 1 sw/source/uibase/utlui/uiitems.cxx | 1 105 files changed, 79 insertions(+), 90 deletions(-)
New commits: commit 84213a426ad10e85075ef159da28b4e56dabcb77 Author: Gabor Kelemen <[email protected]> AuthorDate: Tue Mar 8 13:15:15 2022 +0100 Commit: Miklos Vajna <[email protected]> CommitDate: Thu Mar 10 12:05:59 2022 +0100 Recheck sw headers with IWYU See tdf#42949 for motivation Change-Id: I99558e6b6952b3f2c1ee32dd07354ff659ad9cd0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131183 Tested-by: Jenkins Reviewed-by: Miklos Vajna <[email protected]> diff --git a/sw/IwyuFilter_sw.yaml b/sw/IwyuFilter_sw.yaml index b0ddaded4060..5c8bd9b409bb 100644 --- a/sw/IwyuFilter_sw.yaml +++ b/sw/IwyuFilter_sw.yaml @@ -339,6 +339,9 @@ excludelist: - com/sun/star/text/XDocumentIndex.hpp # Needed for UnoImplPtr template - unobaseclass.hxx + sw/source/core/inc/unolinebreak.hxx: + # Needed for UnoImplPtr template + - unobaseclass.hxx sw/source/core/inc/unometa.hxx: # Base class needs complete type - com/sun/star/lang/XServiceInfo.hpp @@ -442,9 +445,6 @@ excludelist: sw/qa/extras/ww8import/ww8import.cxx: # Needed for for-loop range - com/sun/star/graphic/XGraphic.hpp - sw/source/filter/ww8/ww8scan.hxx: - # OSL_BIGENDIAN is being checked - - osl/endian.h sw/qa/extras/layout/layout.cxx: - comphelper/scopeguard.hxx - com/sun/star/linguistic2/LinguServiceManager.hpp @@ -501,9 +501,6 @@ excludelist: 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 @@ -546,9 +543,6 @@ excludelist: # 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/unotextmarkup.cxx: # Actually used - com/sun/star/text/TextMarkupDescriptor.hpp @@ -594,16 +588,9 @@ excludelist: # Actually used - com/sun/star/i18n/BreakIterator.hpp sw/source/filter/ww8/ww8graf.cxx: - # OSL_BIGENDIAN is being checked - - osl/endian.h # Needed for implicit dtor - ww8par2.hxx - sw/source/filter/ww8/ww8par4.cxx: - # OSL_BIGENDIAN is being checked - - osl/endian.h sw/source/filter/ww8/wrtww8.cxx: - # OSL_BIGENDIAN is being checked - - osl/endian.h - com/sun/star/frame/XModel.hpp sw/source/filter/xml/xmlbrsh.cxx: # Needed for XMLOFF_WARN_UNKNOWN_ELEMENT @@ -641,9 +628,6 @@ excludelist: sw/source/uibase/dochdl/gloshdl.cxx: # Needed for direct member access - docsh.hxx - sw/source/uibase/dochdl/swdtflvr.cxx: - # OSL_BIGENDIAN is being checked - - osl/endian.h sw/source/uibase/docvw/edtdd.cxx: # Needed for extern variable - edtdd.hxx diff --git a/sw/inc/BorderCacheOwner.hxx b/sw/inc/BorderCacheOwner.hxx index e59bc65ee773..8a70dda7460d 100644 --- a/sw/inc/BorderCacheOwner.hxx +++ b/sw/inc/BorderCacheOwner.hxx @@ -10,7 +10,6 @@ #pragma once #include <sal/types.h> -#include "swdllapi.h" class SwBorderAttrs; class SwBorderAttrAccess; diff --git a/sw/inc/IDocumentFieldsAccess.hxx b/sw/inc/IDocumentFieldsAccess.hxx index 5f866a361228..33a71b4115c2 100644 --- a/sw/inc/IDocumentFieldsAccess.hxx +++ b/sw/inc/IDocumentFieldsAccess.hxx @@ -24,7 +24,6 @@ #include <rtl/ustring.hxx> #include <sal/types.h> -#include <tools/solar.h> #include "nodeoffset.hxx" class SwFieldTypes; diff --git a/sw/inc/app.hrc b/sw/inc/app.hrc index c5b32d444b9d..0cea092464c2 100644 --- a/sw/inc/app.hrc +++ b/sw/inc/app.hrc @@ -20,6 +20,8 @@ #ifndef INCLUDED_SW_INC_APP_HRC #define INCLUDED_SW_INC_APP_HRC +#include <unotools/resmgr.hxx> + #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String)) #include <svl/style.hxx> diff --git a/sw/inc/bparr.hxx b/sw/inc/bparr.hxx index c9bc8d041ab1..01115d851d78 100644 --- a/sw/inc/bparr.hxx +++ b/sw/inc/bparr.hxx @@ -22,7 +22,6 @@ #include <assert.h> -#include <tools/solar.h> #include "swdllapi.h" #include <array> #include <memory> diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx index 7d185d053710..5359973a86d2 100644 --- a/sw/inc/calbck.hxx +++ b/sw/inc/calbck.hxx @@ -29,7 +29,6 @@ #include "ring.hxx" #include <type_traits> #include <vector> -#include <memory> #include <optional> class SwModify; diff --git a/sw/inc/ddefld.hxx b/sw/inc/ddefld.hxx index c96f0bdaa659..324e8635dc78 100644 --- a/sw/inc/ddefld.hxx +++ b/sw/inc/ddefld.hxx @@ -21,7 +21,6 @@ #include <sfx2/lnkbase.hxx> #include <svl/hint.hxx> -#include <tools/solar.h> #include "swdllapi.h" #include "fldbas.hxx" diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index f7749190e3ea..5771d0c8925e 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -20,7 +20,6 @@ #define INCLUDED_SW_INC_DOC_HXX // SwDoc interfaces -#include <o3tl/deleter.hxx> #include <o3tl/typed_flags_set.hxx> #include <o3tl/sorted_vector.hxx> #include <vcl/idle.hxx> diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx index 4905fc7a1e38..98c84cbbd270 100644 --- a/sw/inc/docary.hxx +++ b/sw/inc/docary.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_INC_DOCARY_HXX #define INCLUDED_SW_INC_DOCARY_HXX -#include <map> #include <vector> #include <type_traits> #include <o3tl/sorted_vector.hxx> diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx index 1bc87e71c129..91a03b8614b9 100644 --- a/sw/inc/docstyle.hxx +++ b/sw/inc/docstyle.hxx @@ -29,7 +29,6 @@ #include <unordered_map> #include <memory> #include <optional> -#include <string_view> #include <vector> class SwDoc; diff --git a/sw/inc/edglbldc.hxx b/sw/inc/edglbldc.hxx index 67dc4e805183..f7ba790043ef 100644 --- a/sw/inc/edglbldc.hxx +++ b/sw/inc/edglbldc.hxx @@ -20,7 +20,8 @@ #define INCLUDED_SW_INC_EDGLBLDC_HXX #include <o3tl/sorted_vector.hxx> -#include <tools/solar.h> + +#include "nodeoffset.hxx" class SwSection; class SwTOXBase; diff --git a/sw/inc/edimp.hxx b/sw/inc/edimp.hxx index a4292dd464be..ea2134875741 100644 --- a/sw/inc/edimp.hxx +++ b/sw/inc/edimp.hxx @@ -20,9 +20,10 @@ #ifndef INCLUDED_SW_INC_EDIMP_HXX #define INCLUDED_SW_INC_EDIMP_HXX -#include <tools/solar.h> #include <o3tl/sorted_vector.hxx> +#include "nodeoffset.hxx" + class SwPaM; class SwNodeIndex; diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx index 982a2bca3f9d..d241c9adb665 100644 --- a/sw/inc/expfld.hxx +++ b/sw/inc/expfld.hxx @@ -27,6 +27,7 @@ #include <tools/solar.h> #include <o3tl/sorted_vector.hxx> #include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/beans/PropertyValue.hpp> class SfxPoolItem; class SwTextNode; @@ -38,7 +39,6 @@ class SwDoc; class SwFormatField; class SetGetExpFields; class SwEditShell; -namespace com::sun::star::beans { struct PropertyValue; } /// Forward declaration: get "BodyTextNode" for exp.fld in Fly's headers/footers/footnotes. const SwTextNode* GetBodyTextNode( const SwDoc& pDoc, SwPosition& rPos, diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx index 42beefb1b5e8..ccef32fa7921 100644 --- a/sw/inc/fldbas.hxx +++ b/sw/inc/fldbas.hxx @@ -27,7 +27,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <cppuhelper/weakref.hxx> #include <editeng/svxenum.hxx> -#include <tools/solar.h> #include <vector> #include <climits> diff --git a/sw/inc/flddinf.hrc b/sw/inc/flddinf.hrc index bc9dfcc69f57..a36ee785d91b 100644 --- a/sw/inc/flddinf.hrc +++ b/sw/inc/flddinf.hrc @@ -20,6 +20,8 @@ #ifndef INCLUDED_SW_INC_FLDDINF_HRC #define INCLUDED_SW_INC_FLDDINF_HRC +#include <unotools/resmgr.hxx> + #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String)) const TranslateId FLD_SELECT[] = diff --git a/sw/inc/fldref.hrc b/sw/inc/fldref.hrc index ad519bcbbf2d..20eae2d31e14 100644 --- a/sw/inc/fldref.hrc +++ b/sw/inc/fldref.hrc @@ -20,6 +20,8 @@ #ifndef INCLUDED_SW_INC_FLDREF_HRC #define INCLUDED_SW_INC_FLDREF_HRC +#include <unotools/resmgr.hxx> + #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String)) const TranslateId FLD_REF_PAGE_TYPES[] = diff --git a/sw/inc/list.hxx b/sw/inc/list.hxx index a329165c1da2..14acb303ae07 100644 --- a/sw/inc/list.hxx +++ b/sw/inc/list.hxx @@ -20,14 +20,11 @@ #ifndef INCLUDED_SW_INC_LIST_HXX #define INCLUDED_SW_INC_LIST_HXX -#include <o3tl/deleter.hxx> #include <rtl/ustring.hxx> #include "SwNodeNum.hxx" #include "pam.hxx" #include <memory> -#include "swdllapi.h" - class SwDoc; class SwNumRule; class SwNodes; diff --git a/sw/inc/mdiexp.hxx b/sw/inc/mdiexp.hxx index 4706810617fe..80c7397b470c 100644 --- a/sw/inc/mdiexp.hxx +++ b/sw/inc/mdiexp.hxx @@ -19,12 +19,13 @@ #ifndef INCLUDED_SW_INC_MDIEXP_HXX #define INCLUDED_SW_INC_MDIEXP_HXX -#include <rtl/ustring.hxx> #include <tools/long.hxx> #include "tblenum.hxx" #include "swdllapi.h" #include <unotools/resmgr.hxx> +#include <string_view> + class SwRect; class Size; class SwViewShell; diff --git a/sw/inc/mmaddressblockpage.hrc b/sw/inc/mmaddressblockpage.hrc index a1b914c6eea4..653b47a7bfaa 100644 --- a/sw/inc/mmaddressblockpage.hrc +++ b/sw/inc/mmaddressblockpage.hrc @@ -20,6 +20,8 @@ #ifndef INCLUDED_SW_INC_MMADDRESSBLOCK_HRC #define INCLUDED_SW_INC_MMADDRESSBLOCK_HRC +#include <unotools/resmgr.hxx> + #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String)) const TranslateId RA_SALUTATION[] = diff --git a/sw/inc/ndindex.hxx b/sw/inc/ndindex.hxx index 7d03b0bcadaf..474bc82f452d 100644 --- a/sw/inc/ndindex.hxx +++ b/sw/inc/ndindex.hxx @@ -21,8 +21,6 @@ #include <iostream> -#include <tools/solar.h> - #include "node.hxx" #include "ring.hxx" #include "ndarr.hxx" diff --git a/sw/inc/optload.hrc b/sw/inc/optload.hrc index a86d7ac57246..c4a376cf6680 100644 --- a/sw/inc/optload.hrc +++ b/sw/inc/optload.hrc @@ -21,6 +21,7 @@ #define INCLUDED_SW_INC_OPTLOAD_HRC #include <tools/fldunit.hxx> +#include <unotools/resmgr.hxx> #include <utility> #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String)) diff --git a/sw/inc/outline.hrc b/sw/inc/outline.hrc index 65c180cac3e0..1c41ac084e14 100644 --- a/sw/inc/outline.hrc +++ b/sw/inc/outline.hrc @@ -20,6 +20,8 @@ #ifndef INCLUDED_SW_INC_OUTLINE_HRC #define INCLUDED_SW_INC_OUTLINE_HRC +#include <unotools/resmgr.hxx> + #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String)) const TranslateId OUTLINE_STYLE[] = diff --git a/sw/inc/pageformatpanel.hrc b/sw/inc/pageformatpanel.hrc index 34296c7615e6..aff4e208a60d 100644 --- a/sw/inc/pageformatpanel.hrc +++ b/sw/inc/pageformatpanel.hrc @@ -10,6 +10,8 @@ #ifndef INCLUDED_SW_INC_PAGEFORMATPANEL_HRC #define INCLUDED_SW_INC_PAGEFORMATPANEL_HRC +#include <unotools/resmgr.hxx> + #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String)) #include <utility> diff --git a/sw/inc/postithelper.hxx b/sw/inc/postithelper.hxx index 6bc06b60507c..3377fc752450 100644 --- a/sw/inc/postithelper.hxx +++ b/sw/inc/postithelper.hxx @@ -23,7 +23,6 @@ #include "fmtfld.hxx" #include <cstddef> #include <vcl/vclptr.hxx> -#include <tools/solar.h> #include "SidebarWindowsTypes.hxx" #include "nodeoffset.hxx" diff --git a/sw/inc/sortopt.hxx b/sw/inc/sortopt.hxx index 41667ce91f77..2fee87189d01 100644 --- a/sw/inc/sortopt.hxx +++ b/sw/inc/sortopt.hxx @@ -22,7 +22,6 @@ #include <rtl/ustring.hxx> #include <i18nlangtag/lang.h> #include "swdllapi.h" -#include <memory> #include <vector> enum class SwSortOrder { Ascending, Descending }; diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx index 092994fbfc63..32aa866b731f 100644 --- a/sw/inc/swbaslnk.hxx +++ b/sw/inc/swbaslnk.hxx @@ -20,7 +20,8 @@ #define INCLUDED_SW_INC_SWBASLNK_HXX #include <sfx2/lnkbase.hxx> -#include <tools/solar.h> + +#include "nodeoffset.hxx" class SwNode; class SwContentNode; diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx index c5ea28017b41..06cafc912baf 100644 --- a/sw/inc/swmodule.hxx +++ b/sw/inc/swmodule.hxx @@ -26,7 +26,6 @@ #include <o3tl/deleter.hxx> #include <tools/fldunit.hxx> #include <svl/lstner.hxx> -#include <svl/itempool.hxx> #include <unotools/options.hxx> #include <sfx2/module.hxx> #include <sfx2/app.hxx> diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index 33a85f2c62a6..483753d56767 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_INC_SWTABLE_HXX #define INCLUDED_SW_INC_SWTABLE_HXX -#include <tools/solar.h> #include <tools/ref.hxx> #include "tblenum.hxx" #include "swtypes.hxx" diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx index a8ba7d31f630..de72adcfee6e 100644 --- a/sw/inc/swtblfmt.hxx +++ b/sw/inc/swtblfmt.hxx @@ -21,6 +21,8 @@ #include "frmfmt.hxx" +#include <tools/solar.h> + class SAL_DLLPUBLIC_RTTI SwTableFormat final : public SwFrameFormat { friend class SwDoc; diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx index 64ac704d6ff6..857165217237 100644 --- a/sw/inc/swtypes.hxx +++ b/sw/inc/swtypes.hxx @@ -28,7 +28,6 @@ #include <o3tl/unit_conversion.hxx> #include <i18nlangtag/lang.h> #include <vcl/outdev.hxx> -#include <svx/flagsdef.hxx> #include <unotools/resmgr.hxx> namespace com::sun::star { diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx index ff6abca8baa7..4049c28f5714 100644 --- a/sw/inc/tblafmt.hxx +++ b/sw/inc/tblafmt.hxx @@ -30,12 +30,10 @@ #include <memory> -#include <editeng/formatbreakitem.hxx> #include <editeng/keepitem.hxx> #include <editeng/frmdiritem.hxx> #include <editeng/shaditem.hxx> #include <svx/autoformathelper.hxx> -#include "fmtpdsc.hxx" #include "fmtornt.hxx" #include "swdllapi.h" diff --git a/sw/inc/tblenum.hxx b/sw/inc/tblenum.hxx index fd9ea7237fa7..972e514ee90c 100644 --- a/sw/inc/tblenum.hxx +++ b/sw/inc/tblenum.hxx @@ -19,6 +19,7 @@ #ifndef INCLUDED_SW_INC_TBLENUM_HXX #define INCLUDED_SW_INC_TBLENUM_HXX +#include <sal/types.h> #include <o3tl/typed_flags_set.hxx> // For changing table columns/rows widths/heights. diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx index fd194a639bcc..34843255309f 100644 --- a/sw/inc/textboxhelper.hxx +++ b/sw/inc/textboxhelper.hxx @@ -11,11 +11,10 @@ #define INCLUDED_SW_INC_TEXTBOXHELPER_HXX #include <map> -#include <optional> #include <set> #include <vector> -#include <com/sun/star/uno/Any.h> +#include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Type.h> #include <com/sun/star/text/TextContentAnchorType.hpp> #include <svx/swframetypes.hxx> diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx index 6cf772f7734d..624b1ca4f2a6 100644 --- a/sw/inc/undobj.hxx +++ b/sw/inc/undobj.hxx @@ -23,7 +23,6 @@ #include <memory> #include <svl/undo.hxx> -#include <tools/solar.h> #include "SwRewriter.hxx" #include "swundo.hxx" #include "nodeoffset.hxx" diff --git a/sw/inc/unobaseclass.hxx b/sw/inc/unobaseclass.hxx index 0dc56aad2886..5982a5d699ec 100644 --- a/sw/inc/unobaseclass.hxx +++ b/sw/inc/unobaseclass.hxx @@ -20,11 +20,9 @@ #define INCLUDED_SW_INC_UNOBASECLASS_HXX #include <memory> -#include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/container/XEnumeration.hpp> -#include <comphelper/servicehelper.hxx> #include <cppuhelper/implbase.hxx> #include <vcl/svapp.hxx> diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx index f08a473f10b2..fcaed54b1bfe 100644 --- a/sw/inc/unosett.hxx +++ b/sw/inc/unosett.hxx @@ -30,11 +30,8 @@ #include <com/sun/star/container/XIndexReplace.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNamed.hpp> -#include <com/sun/star/style/VerticalAlignment.hpp> #include <cppuhelper/implbase2.hxx> -#include <cppuhelper/implbase4.hxx> #include <cppuhelper/implbase5.hxx> -#include <tools/color.hxx> #include "unobaseclass.hxx" class SwDoc; diff --git a/sw/inc/utlui.hrc b/sw/inc/utlui.hrc index a14e1452bc38..2d71c113757d 100644 --- a/sw/inc/utlui.hrc +++ b/sw/inc/utlui.hrc @@ -20,6 +20,8 @@ #ifndef INCLUDED_SW_INC_UTLUI_HRC #define INCLUDED_SW_INC_UTLUI_HRC +#include <unotools/resmgr.hxx> + #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String)) const TranslateId RID_SHELLRES_AUTOFMTSTRS[] = diff --git a/sw/source/core/crsr/callnk.hxx b/sw/source/core/crsr/callnk.hxx index ccac918e51ca..ca7db0c8f746 100644 --- a/sw/source/core/crsr/callnk.hxx +++ b/sw/source/core/crsr/callnk.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SW_SOURCE_CORE_CRSR_CALLNK_HXX #include <tools/long.hxx> -#include <tools/solar.h> #include <ndtyp.hxx> #include <nodeoffset.hxx> diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index 4504af19bdb7..8c47e9859bf2 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -50,6 +50,7 @@ #include <editeng/contouritem.hxx> #include <editeng/crossedoutitem.hxx> #include <editeng/fontitem.hxx> +#include <editeng/formatbreakitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/justifyitem.hxx> #include <editeng/legacyitem.hxx> diff --git a/sw/source/core/docnode/ndsect.hxx b/sw/source/core/docnode/ndsect.hxx index fe663a89e4e6..57a9f7080c6f 100644 --- a/sw/source/core/docnode/ndsect.hxx +++ b/sw/source/core/docnode/ndsect.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SW_SOURCE_CORE_DOCNODE_NDSECT_HXX #define INCLUDED_SW_SOURCE_CORE_DOCNODE_NDSECT_HXX -#include <tools/solar.h> #include <nodeoffset.hxx> class SwSectionNode; diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index dd8ee2dab586..3203bbc8d56c 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -21,6 +21,7 @@ #include <comphelper/lok.hxx> #include <osl/diagnose.h> #include <tools/mapunit.hxx> +#include <tools/UnitConversion.hxx> #include <svx/svdhdl.hxx> #include <svx/svdtrans.hxx> #include <editeng/protitem.hxx> diff --git a/sw/source/core/inc/DocumentChartDataProviderManager.hxx b/sw/source/core/inc/DocumentChartDataProviderManager.hxx index f5ed19a143ec..f887702bb59f 100644 --- a/sw/source/core/inc/DocumentChartDataProviderManager.hxx +++ b/sw/source/core/inc/DocumentChartDataProviderManager.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SW_SOURCE_CORE_INC_DOCUMENTCHARTDATAPROVIDEMANAGER_HXX #include <IDocumentChartDataProviderAccess.hxx> -#include <o3tl/deleter.hxx> #include <rtl/ref.hxx> #include <memory> diff --git a/sw/source/core/inc/DocumentRedlineManager.hxx b/sw/source/core/inc/DocumentRedlineManager.hxx index 62a57ac65e2a..478332bbd8ef 100644 --- a/sw/source/core/inc/DocumentRedlineManager.hxx +++ b/sw/source/core/inc/DocumentRedlineManager.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SW_SOURCE_CORE_INC_DOCUMENTREDLINEMANAGER_HXX #include <IDocumentRedlineAccess.hxx> -#include <memory> class SwDoc; diff --git a/sw/source/core/inc/GraphicSizeCheck.hxx b/sw/source/core/inc/GraphicSizeCheck.hxx index a0aea8a9e524..983d549734fe 100644 --- a/sw/source/core/inc/GraphicSizeCheck.hxx +++ b/sw/source/core/inc/GraphicSizeCheck.hxx @@ -11,7 +11,6 @@ #pragma once #include <doc.hxx> -#include "ModelTraverser.hxx" #include <svx/GenericCheckDialog.hxx> namespace sw diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx b/sw/source/core/inc/SwXMLBlockImport.hxx index 40c9699712df..821033c1e1e5 100644 --- a/sw/source/core/inc/SwXMLBlockImport.hxx +++ b/sw/source/core/inc/SwXMLBlockImport.hxx @@ -21,7 +21,7 @@ #include <xmloff/xmlimp.hxx> #include <xmloff/xmlnamespace.hxx> -#include <xmloff/xmltkmap.hxx> +#include <xmloff/xmltoken.hxx> #include <com/sun/star/xml/sax/FastToken.hpp> #include <sax/fastattribs.hxx> diff --git a/sw/source/core/inc/UndoCore.hxx b/sw/source/core/inc/UndoCore.hxx index 6efaf23c0b61..c1c66b702a78 100644 --- a/sw/source/core/inc/UndoCore.hxx +++ b/sw/source/core/inc/UndoCore.hxx @@ -22,7 +22,6 @@ #include <undobj.hxx> #include <calbck.hxx> -#include <o3tl/deleter.hxx> #include <rtl/ustring.hxx> #include <redline.hxx> #include <numrule.hxx> diff --git a/sw/source/core/inc/UndoRedline.hxx b/sw/source/core/inc/UndoRedline.hxx index 68ce25a27d0c..b695b56c49ef 100644 --- a/sw/source/core/inc/UndoRedline.hxx +++ b/sw/source/core/inc/UndoRedline.hxx @@ -22,7 +22,6 @@ #include <memory> #include <undobj.hxx> -#include <tools/long.hxx> struct SwSortOptions; class SwRangeRedline; diff --git a/sw/source/core/inc/UndoSort.hxx b/sw/source/core/inc/UndoSort.hxx index be474e01432c..81cb33c60787 100644 --- a/sw/source/core/inc/UndoSort.hxx +++ b/sw/source/core/inc/UndoSort.hxx @@ -23,6 +23,7 @@ #include <undobj.hxx> #include <rtl/ustring.hxx> +#include <tools/solar.h> #include <memory> #include <vector> diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx index 6591b7e5e6cc..63ad4532f30c 100644 --- a/sw/source/core/inc/UndoTable.hxx +++ b/sw/source/core/inc/UndoTable.hxx @@ -22,6 +22,7 @@ #include <o3tl/deleter.hxx> #include <tools/long.hxx> +#include <tools/solar.h> #include <ndarr.hxx> #include <undobj.hxx> #include <set> diff --git a/sw/source/core/inc/acorrect.hxx b/sw/source/core/inc/acorrect.hxx index 2f0042650f87..884e749e0d32 100644 --- a/sw/source/core/inc/acorrect.hxx +++ b/sw/source/core/inc/acorrect.hxx @@ -23,7 +23,6 @@ #include <memory> #include <svl/itemset.hxx> -#include <tools/solar.h> #include <editeng/svxacorr.hxx> #include <nodeoffset.hxx> diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx index e777784c7d1e..c40ff1044d70 100644 --- a/sw/source/core/inc/drawfont.hxx +++ b/sw/source/core/inc/drawfont.hxx @@ -23,6 +23,7 @@ #include <osl/diagnose.h> #include <vcl/vclptr.hxx> #include <vcl/outdev.hxx> +#include <swtypes.hxx> #include "TextFrameIndex.hxx" #include <swdllapi.h> diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx index 4285165a3336..a377a483cdde 100644 --- a/sw/source/core/inc/fntcache.hxx +++ b/sw/source/core/inc/fntcache.hxx @@ -26,8 +26,8 @@ #include <unordered_map> #include <vcl/font.hxx> +#include <vcl/glyphitem.hxx> #include <vcl/vclptr.hxx> -#include <vcl/vcllayout.hxx> #include <vcl/outdev.hxx> #include "swcache.hxx" #include "TextFrameIndex.hxx" diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx index a0f955aa4099..6e8a109fbded 100644 --- a/sw/source/core/inc/layact.hxx +++ b/sw/source/core/inc/layact.hxx @@ -26,10 +26,13 @@ #include <ctime> #include <memory> +#include <vector> #include <swrect.hxx> class OutputDevice; +class SwFrame; +class SwFrameDeleteGuard; class SwRootFrame; class SwLayoutFrame; class SwPageFrame; diff --git a/sw/source/core/inc/node2lay.hxx b/sw/source/core/inc/node2lay.hxx index 2af3359a911c..e0334c156435 100644 --- a/sw/source/core/inc/node2lay.hxx +++ b/sw/source/core/inc/node2lay.hxx @@ -19,7 +19,8 @@ #ifndef INCLUDED_SW_SOURCE_CORE_INC_NODE2LAY_HXX #define INCLUDED_SW_SOURCE_CORE_INC_NODE2LAY_HXX -#include <tools/solar.h> +#include <nodeoffset.hxx> + #include <memory> /** diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx index 75554884341e..d92328344d3b 100644 --- a/sw/source/core/inc/rolbck.hxx +++ b/sw/source/core/inc/rolbck.hxx @@ -22,7 +22,6 @@ #include <o3tl/deleter.hxx> #include <o3tl/sorted_vector.hxx> #include <svl/itemset.hxx> -#include <tools/solar.h> #include <vcl/keycod.hxx> #include <tox.hxx> diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx index 244d935bceb1..3d00fe1cc226 100644 --- a/sw/source/core/inc/rootfrm.hxx +++ b/sw/source/core/inc/rootfrm.hxx @@ -24,7 +24,6 @@ #include <doc.hxx> #include <IDocumentTimerAccess.hxx> #include <o3tl/typed_flags_set.hxx> -#include <tools/UnitConversion.hxx> #include <set> #include <vector> diff --git a/sw/source/core/inc/tblrwcl.hxx b/sw/source/core/inc/tblrwcl.hxx index 9280a67edf6f..9cd6fa3eb2e0 100644 --- a/sw/source/core/inc/tblrwcl.hxx +++ b/sw/source/core/inc/tblrwcl.hxx @@ -20,7 +20,6 @@ #define INCLUDED_SW_SOURCE_CORE_INC_TBLRWCL_HXX #include <cstddef> -#include <memory> #include <vector> #include <swtypes.hxx> diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx index e8fcfd4c01c2..bd968f87f7d8 100644 --- a/sw/source/core/inc/txmsrt.hxx +++ b/sw/source/core/inc/txmsrt.hxx @@ -20,6 +20,7 @@ #define INCLUDED_SW_SOURCE_CORE_INC_TXMSRT_HXX #include <i18nlangtag/lang.h> +#include <nodeoffset.hxx> #include <tox.hxx> #include <com/sun/star/lang/Locale.hpp> diff --git a/sw/source/core/inc/txtfly.hxx b/sw/source/core/inc/txtfly.hxx index 82ee5f085d6a..39f11a835421 100644 --- a/sw/source/core/inc/txtfly.hxx +++ b/sw/source/core/inc/txtfly.hxx @@ -20,7 +20,6 @@ #pragma once #include <editeng/txtrange.hxx> -#include <tools/solar.h> #include <swtypes.hxx> #include <swrect.hxx> #include <com/sun/star/text/WrapTextMode.hpp> diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx index a0638d13f425..4c53f7fd63aa 100644 --- a/sw/source/core/inc/unoflatpara.hxx +++ b/sw/source/core/inc/unoflatpara.hxx @@ -27,7 +27,6 @@ #include <com/sun/star/text/XFlatParagraph.hpp> #include <com/sun/star/text/XFlatParagraphIterator.hpp> #include <svl/listener.hxx> -#include <tools/solar.h> #include "unotextmarkup.hxx" #include <nodeoffset.hxx> diff --git a/sw/source/core/inc/unolinebreak.hxx b/sw/source/core/inc/unolinebreak.hxx index 0a87753c5e34..46968556633c 100644 --- a/sw/source/core/inc/unolinebreak.hxx +++ b/sw/source/core/inc/unolinebreak.hxx @@ -23,6 +23,7 @@ #include <cppuhelper/implbase.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/text/XTextContent.hpp> #include <unobaseclass.hxx> diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx index 163c19adb3ef..b05fe074ce71 100644 --- a/sw/source/core/inc/wrong.hxx +++ b/sw/source/core/inc/wrong.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/container/NoSuchElementException.hpp> #include <com/sun/star/container/XStringKeyMap.hpp> -#include <com/sun/star/util/Color.hpp> #include <com/sun/star/awt/FontUnderline.hpp> #include <com/sun/star/uno/Any.hxx> diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 871cb21b0a6b..a541f3681af7 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -19,6 +19,7 @@ #include <sal/config.h> +#include <com/sun/star/style/VerticalAlignment.hpp> #include <com/sun/star/text/ColumnSeparatorStyle.hpp> #include <com/sun/star/text/WrapTextMode.hpp> #include <com/sun/star/text/TextContentAnchorType.hpp> @@ -29,6 +30,7 @@ #include <o3tl/safeint.hxx> #include <osl/diagnose.h> #include <svtools/unoimap.hxx> +#include <tools/UnitConversion.hxx> #include <vcl/imap.hxx> #include <vcl/imapobj.hxx> #include <unotools/intlwrapper.hxx> diff --git a/sw/source/core/layout/dumpfilter.cxx b/sw/source/core/layout/dumpfilter.cxx index f52d9188bb8a..21d1ec3542fb 100644 --- a/sw/source/core/layout/dumpfilter.cxx +++ b/sw/source/core/layout/dumpfilter.cxx @@ -15,6 +15,7 @@ #include <rootfrm.hxx> #include <unotxdoc.hxx> +#include <comphelper/servicehelper.hxx> #include <unotools/mediadescriptor.hxx> #include <libxml/xmlwriter.h> diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx index 06ef88e74169..2455f7a6d130 100644 --- a/sw/source/core/layout/flyincnt.cxx +++ b/sw/source/core/layout/flyincnt.cxx @@ -27,6 +27,7 @@ #include <IDocumentSettingAccess.hxx> #include <IDocumentDrawModelAccess.hxx> #include <osl/diagnose.h> +#include <o3tl/deleter.hxx> SwFlyInContentFrame::SwFlyInContentFrame( SwFlyFrameFormat *pFormat, SwFrame* pSib, SwFrame *pAnch ) : SwFlyFrame( pFormat, pSib, pAnch ) diff --git a/sw/source/core/layout/layhelp.hxx b/sw/source/core/layout/layhelp.hxx index 5df151ae7e61..17c5cc32491e 100644 --- a/sw/source/core/layout/layhelp.hxx +++ b/sw/source/core/layout/layhelp.hxx @@ -21,6 +21,7 @@ #define INCLUDED_SW_SOURCE_CORE_LAYOUT_LAYHELP_HXX #include <swrect.hxx> +#include <nodeoffset.hxx> #include <tools/solar.h> diff --git a/sw/source/core/text/atrhndl.hxx b/sw/source/core/text/atrhndl.hxx index 6c719bf2cbaf..8bb7845f2760 100644 --- a/sw/source/core/text/atrhndl.hxx +++ b/sw/source/core/text/atrhndl.hxx @@ -20,7 +20,6 @@ #pragma once #define NUM_ATTRIBUTE_STACKS 44 -#include <memory> #include <vector> #include <swfntcch.hxx> @@ -115,4 +114,4 @@ inline const SwFont* SwAttrHandler::GetFont() const }; -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ \ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx index 68fc8c72c206..c5b838e0bc5b 100644 --- a/sw/source/core/text/porlay.hxx +++ b/sw/source/core/text/porlay.hxx @@ -18,8 +18,6 @@ */ #pragma once -#include <libxml/xmlwriter.h> - #include <scriptinfo.hxx> #include <swrect.hxx> diff --git a/sw/source/core/text/possiz.hxx b/sw/source/core/text/possiz.hxx index 772237360e1f..f66bd1988ca4 100644 --- a/sw/source/core/text/possiz.hxx +++ b/sw/source/core/text/possiz.hxx @@ -19,7 +19,6 @@ #pragma once #include <tools/gen.hxx> -#include <sal/types.h> #include <swtypes.hxx> // Compared to the SV sizes SwPosSize is always positive diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index 7c0ebbbe77c1..5be409d15078 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -25,6 +25,7 @@ #include <UndoSplitMove.hxx> #include <UndoCore.hxx> #include <fesh.hxx> +#include <fmtpdsc.hxx> #include <hintids.hxx> #include <hints.hxx> #include <doc.hxx> @@ -61,6 +62,7 @@ #include <unochart.hxx> #include <calbck.hxx> #include <frameformats.hxx> +#include <editeng/formatbreakitem.hxx> #include <osl/diagnose.h> #include <docsh.hxx> diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index fed1706cad5e..6fe9ab1e27b8 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/frame/XModel.hpp> #include <cppuhelper/supportsservice.hxx> +#include <o3tl/deleter.hxx> #include <mutex> #include <vcl/svapp.hxx> diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index dedc10bce213..d7032d2da66e 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -67,6 +67,7 @@ #include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> #include <svx/scene3d.hxx> +#include <tools/UnitConversion.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/drawing/XDrawPageSupplier.hpp> #include <com/sun/star/frame/XModel.hpp> diff --git a/sw/source/core/unocore/unolinebreak.cxx b/sw/source/core/unocore/unolinebreak.cxx index 2e8ee454eccb..a2b9124b201e 100644 --- a/sw/source/core/unocore/unolinebreak.cxx +++ b/sw/source/core/unocore/unolinebreak.cxx @@ -21,6 +21,7 @@ #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/weakref.hxx> +#include <comphelper/servicehelper.hxx> #include <sal/log.hxx> #include <svl/listener.hxx> #include <svl/itemprop.hxx> diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 0357d048dfdf..7033107bf720 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -27,6 +27,7 @@ #include <comphelper/interfacecontainer4.hxx> #include <o3tl/any.hxx> #include <o3tl/safeint.hxx> +#include <tools/UnitConversion.hxx> #include <editeng/memberids.h> #include <float.h> #include <swtypes.hxx> diff --git a/sw/source/core/unocore/unotextmarkup.cxx b/sw/source/core/unocore/unotextmarkup.cxx index ae5e05181224..1bc8e7387f65 100644 --- a/sw/source/core/unocore/unotextmarkup.cxx +++ b/sw/source/core/unocore/unotextmarkup.cxx @@ -19,6 +19,7 @@ #include <unotextmarkup.hxx> +#include <comphelper/servicehelper.hxx> #include <o3tl/safeint.hxx> #include <osl/diagnose.h> #include <svl/listener.hxx> diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx index 066c05123f81..a1d6415cda68 100644 --- a/sw/source/core/view/vprint.cxx +++ b/sw/source/core/view/vprint.cxx @@ -22,6 +22,7 @@ #include <sfx2/printer.hxx> #include <svx/svdview.hxx> #include <osl/diagnose.h> +#include <tools/UnitConversion.hxx> #include <txtfld.hxx> #include <fmtfld.hxx> diff --git a/sw/source/filter/html/htmlfly.hxx b/sw/source/filter/html/htmlfly.hxx index 47047f1aed57..e19f786ac0a6 100644 --- a/sw/source/filter/html/htmlfly.hxx +++ b/sw/source/filter/html/htmlfly.hxx @@ -20,6 +20,8 @@ #ifndef INCLUDED_SW_SOURCE_FILTER_HTML_HTMLFLY_HXX #define INCLUDED_SW_SOURCE_FILTER_HTML_HTMLFLY_HXX +#include <ndindex.hxx> + #include <o3tl/sorted_vector.hxx> #include <o3tl/typed_flags_set.hxx> #include <sal/types.h> diff --git a/sw/source/filter/html/htmlform.hxx b/sw/source/filter/html/htmlform.hxx index 0a3f02db47d1..d1acce1faf57 100644 --- a/sw/source/filter/html/htmlform.hxx +++ b/sw/source/filter/html/htmlform.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_SW_SOURCE_FILTER_HTML_HTMLFORM_HXX #define INCLUDED_SW_SOURCE_FILTER_HTML_HTMLFORM_HXX -#include <sal/types.h> - extern const char* aEventListenerTable[]; extern const char* aEventMethodTable[]; extern const char* aEventSDOptionTable[]; diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx index 9a559d043e35..f4b7c38fffe1 100644 --- a/sw/source/filter/html/svxcss1.hxx +++ b/sw/source/filter/html/svxcss1.hxx @@ -20,11 +20,11 @@ #define INCLUDED_SW_SOURCE_FILTER_HTML_SVXCSS1_HXX #include <svl/itemset.hxx> -#include <svx/flagsdef.hxx> #include <editeng/svxenum.hxx> #include <rtl/textenc.h> #include "parcss1.hxx" #include <o3tl/typed_flags_set.hxx> +#include <o3tl/unit_conversion.hxx> #include <array> #include <map> diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx index ce6f82a7dd82..39d6e4d5bf99 100644 --- a/sw/source/filter/inc/msfilter.hxx +++ b/sw/source/filter/inc/msfilter.hxx @@ -22,7 +22,6 @@ #include <sal/config.h> -#include <cstddef> #include <map> #include <vector> #include <memory> @@ -31,7 +30,6 @@ #include <rtl/textenc.h> #include "fltshell.hxx" #include <shellio.hxx> -#include <svl/zforlist.hxx> #include <svl/listener.hxx> class SwDoc; diff --git a/sw/source/filter/ww8/docxhelper.hxx b/sw/source/filter/ww8/docxhelper.hxx index e3f3609c615b..7807ec7aa5a8 100644 --- a/sw/source/filter/ww8/docxhelper.hxx +++ b/sw/source/filter/ww8/docxhelper.hxx @@ -14,7 +14,7 @@ #include <string_view> -#include <rtl/ustring.hxx> +#include <sal/types.h> struct DocxStringTokenMap { diff --git a/sw/source/filter/ww8/docxsdrexport.hxx b/sw/source/filter/ww8/docxsdrexport.hxx index e6404f8eb423..5b29cd58db34 100644 --- a/sw/source/filter/ww8/docxsdrexport.hxx +++ b/sw/source/filter/ww8/docxsdrexport.hxx @@ -14,7 +14,6 @@ #include <rtl/strbuf.hxx> #include <sax/fshelper.hxx> -#include <tools/solar.h> #include <nodeoffset.hxx> namespace rtl diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx index a9bb8ce04a66..93d170dc381a 100644 --- a/sw/source/filter/ww8/writerhelper.hxx +++ b/sw/source/filter/ww8/writerhelper.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SW_SOURCE_FILTER_WW8_WRITERHELPER_HXX #define INCLUDED_SW_SOURCE_FILTER_WW8_WRITERHELPER_HXX -#include <typeinfo> #include <vector> #include <map> #include <com/sun/star/embed/XEmbeddedObject.hpp> @@ -29,7 +28,6 @@ #include <svl/itempool.hxx> #include <svl/itemset.hxx> #include <svx/svdtypes.hxx> -#include <format.hxx> #include <node.hxx> #include <pam.hxx> #include <tools/poly.hxx> diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 8d05ea2f3260..204a4de3efac 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -24,6 +24,7 @@ #include <filter/msfilter/msdffimp.hxx> #include <filter/msfilter/util.hxx> #include <editeng/frmdir.hxx> +#include <svl/zforlist.hxx> #include <fltshell.hxx> #include <svx/svdobj.hxx> diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx index 2edaf23cf847..18c72567c30e 100644 --- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx +++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx @@ -36,6 +36,7 @@ #include <unoredline.hxx> #include <DocumentRedlineManager.hxx> #include "xmlimp.hxx" +#include <comphelper/servicehelper.hxx> #include <o3tl/any.hxx> #include <xmloff/xmltoken.hxx> #include <vcl/svapp.hxx> diff --git a/sw/source/filter/xml/wrtxml.hxx b/sw/source/filter/xml/wrtxml.hxx index 7b9c6fe08302..d08dbb12afaa 100644 --- a/sw/source/filter/xml/wrtxml.hxx +++ b/sw/source/filter/xml/wrtxml.hxx @@ -20,7 +20,6 @@ #define INCLUDED_SW_SOURCE_FILTER_XML_WRTXML_HXX #include <com/sun/star/io/XOutputStream.hpp> -#include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index fd2003966e85..a86eb59e0bef 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -33,6 +33,7 @@ #include <svx/xmlgrhlp.hxx> #include <editeng/eeitem.hxx> #include <svx/svddef.hxx> +#include <tools/UnitConversion.hxx> #include <xmloff/namespacemap.hxx> #include <xmloff/xmlnamespace.hxx> #include <editeng/xmlcnitm.hxx> diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 006e747dc264..413332ddc498 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/text/XTextTable.hpp> #include <com/sun/star/table/XCellRange.hpp> +#include <comphelper/servicehelper.hxx> #include <o3tl/numeric.hxx> #include <o3tl/safeint.hxx> #include <sal/log.hxx> diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index 779a63015b7e..4200421b5c62 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -21,6 +21,7 @@ #include <comphelper/processfactory.hxx> #include <comphelper/propertysequence.hxx> #include <comphelper/propertyvalue.hxx> +#include <comphelper/servicehelper.hxx> #include <com/sun/star/embed/EmbeddedObjectCreator.hpp> #include <com/sun/star/embed/OOoEmbeddedObjectFactory.hpp> #include <com/sun/star/embed/XEmbeddedObject.hpp> diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index f8ca8b957e22..763ae5808138 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -25,6 +25,7 @@ #include <unotools.hxx> #include <comphelper/string.hxx> #include <comphelper/propertyvalue.hxx> +#include <comphelper/servicehelper.hxx> #include <i18nutil/unicode.hxx> #include <unotools/tempfile.hxx> #include <uitool.hxx> diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx index 13b84fd58e60..75907a422662 100644 --- a/sw/source/ui/index/cntex.cxx +++ b/sw/source/ui/index/cntex.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/beans/PropertyValues.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <comphelper/string.hxx> +#include <comphelper/servicehelper.hxx> #include <tools/UnitConversion.hxx> #include <tools/diagnose_ex.h> #include <wrtsh.hxx> diff --git a/sw/source/ui/vba/vbatablehelper.cxx b/sw/source/ui/vba/vbatablehelper.cxx index c6b031d1b4be..2e0321a9d36c 100644 --- a/sw/source/ui/vba/vbatablehelper.cxx +++ b/sw/source/ui/vba/vbatablehelper.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <comphelper/servicehelper.hxx> #include <vbahelper/vbahelper.hxx> #include "vbatablehelper.hxx" #include <swtable.hxx> diff --git a/sw/source/ui/vba/wordvbahelper.cxx b/sw/source/ui/vba/wordvbahelper.cxx index 1468fd160e2f..7b916ccfde90 100644 --- a/sw/source/ui/vba/wordvbahelper.cxx +++ b/sw/source/ui/vba/wordvbahelper.cxx @@ -31,6 +31,7 @@ #include <IDocumentLayoutAccess.hxx> #include <view.hxx> #include <viewsh.hxx> +#include <comphelper/servicehelper.hxx> using namespace ::com::sun::star; using namespace ::ooo::vba; diff --git a/sw/source/uibase/inc/HeaderFooterWin.hxx b/sw/source/uibase/inc/HeaderFooterWin.hxx index 95dcbd243d55..d91f35edcc74 100644 --- a/sw/source/uibase/inc/HeaderFooterWin.hxx +++ b/sw/source/uibase/inc/HeaderFooterWin.hxx @@ -12,7 +12,6 @@ #include "edtwin.hxx" #include "FrameControl.hxx" #include <vcl/timer.hxx> -#include <vcl/virdev.hxx> #include <drawinglayer/primitive2d/Primitive2DContainer.hxx> /** diff --git a/sw/source/uibase/inc/autoformatpreview.hxx b/sw/source/uibase/inc/autoformatpreview.hxx index 04b5846b5c33..e1cb91ca6850 100644 --- a/sw/source/uibase/inc/autoformatpreview.hxx +++ b/sw/source/uibase/inc/autoformatpreview.hxx @@ -23,7 +23,6 @@ #include <sal/types.h> #include <svx/framelinkarray.hxx> #include <svl/numformat.hxx> -#include <svl/zforlist.hxx> #include <tools/gen.hxx> #include <rtl/ustring.hxx> #include <vcl/customweld.hxx> diff --git a/sw/source/uibase/inc/bookctrl.hxx b/sw/source/uibase/inc/bookctrl.hxx index 3b064a1daa22..7d6b8d4bafc3 100644 --- a/sw/source/uibase/inc/bookctrl.hxx +++ b/sw/source/uibase/inc/bookctrl.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_BOOKCTRL_HXX #define INCLUDED_SW_SOURCE_UIBASE_INC_BOOKCTRL_HXX -#include <rtl/ustring.hxx> #include <sfx2/stbitem.hxx> class SwBookmarkControl final : public SfxStatusBarControl diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index 6dee914d89c8..9b8c7c475995 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -20,6 +20,7 @@ #pragma once #include <tools/globname.hxx> +#include <tools/solar.h> #include <sfx2/tabdlg.hxx> #include <vcl/customweld.hxx> diff --git a/sw/source/uibase/inc/uiobject.hxx b/sw/source/uibase/inc/uiobject.hxx index 248654023e32..23a141412e45 100644 --- a/sw/source/uibase/inc/uiobject.hxx +++ b/sw/source/uibase/inc/uiobject.hxx @@ -15,7 +15,6 @@ #include "edtwin.hxx" #include "PageBreakWin.hxx" -#include "navipi.hxx" #include <AnnotationWin.hxx> diff --git a/sw/source/uibase/inc/unomailmerge.hxx b/sw/source/uibase/inc/unomailmerge.hxx index 304beb18f597..722d80448352 100644 --- a/sw/source/uibase/inc/unomailmerge.hxx +++ b/sw/source/uibase/inc/unomailmerge.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SW_SOURCE_UIBASE_INC_UNOMAILMERGE_HXX #include <cppuhelper/implbase.hxx> -#include <cppuhelper/interfacecontainer.hxx> #include <comphelper/interfacecontainer2.hxx> #include <comphelper/interfacecontainer3.hxx> #include <comphelper/multiinterfacecontainer3.hxx> diff --git a/sw/source/uibase/inc/workctrl.hxx b/sw/source/uibase/inc/workctrl.hxx index d478f6ba997a..dac5dab1daf1 100644 --- a/sw/source/uibase/inc/workctrl.hxx +++ b/sw/source/uibase/inc/workctrl.hxx @@ -20,6 +20,7 @@ #define INCLUDED_SW_SOURCE_UIBASE_INC_WORKCTRL_HXX #include <sfx2/tbxctrl.hxx> +#include <vcl/menu.hxx> #include <vcl/toolbox.hxx> class PopupMenu; diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index cca3bf5cc432..a4d1bc7e336b 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -24,6 +24,7 @@ #include <sal/config.h> #include <hintids.hxx> +#include <comphelper/servicehelper.hxx> #include <svl/languageoptions.hxx> #include <sfx2/linkmgr.hxx> #include <sfx2/htmlmode.hxx> diff --git a/sw/source/uibase/uno/SwXFilterOptions.cxx b/sw/source/uibase/uno/SwXFilterOptions.cxx index 4e3cd86585f4..124b8abf8497 100644 --- a/sw/source/uibase/uno/SwXFilterOptions.cxx +++ b/sw/source/uibase/uno/SwXFilterOptions.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/propertysequence.hxx> +#include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <unotools/ucbstreamhelper.hxx> #include <unotxdoc.hxx> diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx index 6229177bed2c..a6bc6104f43e 100644 --- a/sw/source/uibase/uno/unomailmerge.cxx +++ b/sw/source/uibase/uno/unomailmerge.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <comphelper/servicehelper.hxx> #include <vcl/svapp.hxx> #include <osl/mutex.hxx> #include <svl/itemprop.hxx> diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 0950722a0f59..333862f18887 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -161,6 +161,7 @@ #include <DocumentRedlineManager.hxx> #include <xmloff/odffields.hxx> #include <tools/json_writer.hxx> +#include <tools/UnitConversion.hxx> #include <svx/svdpage.hxx> diff --git a/sw/source/uibase/utlui/uiitems.cxx b/sw/source/uibase/utlui/uiitems.cxx index fc4039d2cbb8..492e8eb6ce23 100644 --- a/sw/source/uibase/utlui/uiitems.cxx +++ b/sw/source/uibase/utlui/uiitems.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <comphelper/servicehelper.hxx> #include <editeng/itemtype.hxx> #include <tools/UnitConversion.hxx> #include <unosett.hxx>
