basctl/source/basicide/basicrenderable.cxx | 1 basctl/source/basicide/baside2b.cxx | 1 chart2/source/view/main/ChartItemPool.cxx | 1 chart2/source/view/main/DrawModelWrapper.cxx | 1 cui/source/dialogs/cuigrfflt.cxx | 1 dbaccess/source/ui/misc/UITools.cxx | 1 desktop/source/lib/init.cxx | 1 editeng/source/accessibility/AccessibleHyperlink.cxx | 1 editeng/source/editeng/impedit.cxx | 1 editeng/source/editeng/impedit2.cxx | 1 editeng/source/outliner/outliner.cxx | 1 editeng/source/uno/unoipset.cxx | 2 + editeng/source/uno/unotext2.cxx | 1 extensions/source/abpilot/datasourcehandling.cxx | 1 extensions/source/bibliography/general.cxx | 1 formula/source/core/api/FormulaCompiler.cxx | 1 fpicker/source/office/iodlgimp.cxx | 1 include/IwyuFilter_include.yaml | 3 ++ include/editeng/fhgtitem.hxx | 1 include/editeng/outliner.hxx | 1 include/editeng/unoipset.hxx | 1 include/svl/PasswordHelper.hxx | 4 ++- include/svl/asiancfg.hxx | 3 +- include/svl/documentlockfile.hxx | 1 include/svl/itemprop.hxx | 8 ++++--- include/svl/lockfilecommon.hxx | 7 +++--- include/svl/nfengine.hxx | 17 +++++++++++++--- include/svl/pickerhistoryaccess.hxx | 4 +-- include/svl/poolitem.hxx | 2 - include/svl/sharecontrolfile.hxx | 2 + include/svl/srchitem.hxx | 3 +- include/svl/style.hxx | 4 +-- include/svl/stylepool.hxx | 3 +- include/svl/svlresid.hxx | 3 +- include/svl/undo.hxx | 1 include/svl/urihelper.hxx | 2 - include/svl/zforlist.hxx | 3 +- include/svl/zformat.hxx | 2 + include/svx/nbdtmg.hxx | 1 include/svx/svdetc.hxx | 1 include/svx/svdundo.hxx | 1 include/svx/unoshtxt.hxx | 1 sc/source/core/data/documen2.cxx | 1 sc/source/core/data/documen8.cxx | 1 sc/source/core/data/global.cxx | 1 sc/source/core/data/poolhelp.cxx | 1 sc/source/core/tool/editutil.cxx | 1 sc/source/core/tool/interpr1.cxx | 1 sc/source/filter/oox/workbookhelper.cxx | 1 sc/source/filter/xml/xmlimprt.cxx | 1 sc/source/ui/app/msgpool.cxx | 2 + sc/source/ui/cctrl/dpcontrol.cxx | 1 sc/source/ui/cctrl/tbzoomsliderctrl.cxx | 1 sc/source/ui/docshell/sizedev.cxx | 1 sc/source/ui/undo/undostyl.cxx | 1 sc/source/ui/unoobj/styleuno.cxx | 1 sc/source/ui/view/drawutil.cxx | 1 sc/source/ui/view/gridwin_dbgutil.cxx | 1 sc/source/ui/view/viewfun4.cxx | 1 sd/source/filter/grf/sdgrffilter.cxx | 1 sd/source/filter/pdf/sdpdffilter.cxx | 1 sd/source/ui/app/sdmod.cxx | 1 sd/source/ui/dlg/sdtreelb.cxx | 1 sd/source/ui/func/fuinsfil.cxx | 1 sd/source/ui/unoidl/sddetect.cxx | 1 sd/source/ui/view/sdview4.cxx | 1 sfx2/source/appl/appopen.cxx | 1 sfx2/source/appl/appuno.cxx | 1 sfx2/source/control/ctrlitem.cxx | 1 sfx2/source/control/unoctitm.cxx | 1 sfx2/source/dialog/mgetempl.cxx | 1 sfx2/source/dialog/versdlg.cxx | 1 sfx2/source/doc/SfxRedactionHelper.cxx | 1 sfx2/source/doc/objcont.cxx | 1 sfx2/source/doc/objembed.cxx | 1 sfx2/source/doc/objxtor.cxx | 2 + sfx2/source/doc/printhelper.cxx | 1 sfx2/source/sidebar/SidebarChildWindow.cxx | 1 sfx2/source/view/viewfrm.cxx | 1 svl/qa/unit/lockfiles/test_lockfiles.cxx | 1 svl/source/items/itempool.cxx | 1 svl/source/items/itemprop.cxx | 1 svl/source/items/poolitem.cxx | 1 svl/source/items/srchitem.cxx | 1 svl/source/misc/PasswordHelper.cxx | 2 + svl/source/misc/lockfilecommon.cxx | 1 svl/source/misc/msodocumentlockfile.cxx | 1 svx/source/core/graphichelper.cxx | 1 svx/source/dialog/_bmpmask.cxx | 1 svx/source/dialog/pagectrl.cxx | 1 svx/source/dialog/rubydialog.cxx | 1 svx/source/fmcomp/fmgridcl.cxx | 1 svx/source/form/datanavi.cxx | 1 svx/source/gallery2/galctrl.cxx | 1 svx/source/sidebar/text/TextCharacterSpacingControl.cxx | 1 svx/source/tbxctrls/fillctrl.cxx | 1 svx/source/xoutdev/_xoutbmp.cxx | 2 + sw/inc/swmodule.hxx | 1 sw/source/core/crsr/FormFieldButton.cxx | 1 sw/source/core/doc/DocumentFieldsManager.cxx | 1 sw/source/core/doc/docglbl.cxx | 1 sw/source/core/text/noteurl.cxx | 1 sw/source/core/unocore/unomap.cxx | 1 sw/source/core/unocore/unomap1.cxx | 1 sw/source/core/unocore/unosrch.cxx | 1 sw/source/filter/basflt/shellio.cxx | 1 sw/source/filter/html/swhtml.cxx | 1 sw/source/filter/md/swmd.cxx | 1 sw/source/filter/writer/writer.cxx | 1 sw/source/filter/ww8/wrtw8esh.cxx | 1 sw/source/filter/ww8/ww8attributeoutput.hxx | 1 sw/source/filter/xml/xmltexte.cxx | 1 sw/source/ui/dbui/mmaddressblockpage.cxx | 1 sw/source/ui/dbui/mmgreetingspage.cxx | 1 sw/source/ui/index/cnttab.cxx | 1 sw/source/uibase/app/docsh.cxx | 1 sw/source/uibase/config/uinums.cxx | 1 sw/source/uibase/dbui/dbmgr.cxx | 1 sw/source/uibase/dbui/mailmergehelper.cxx | 1 sw/source/uibase/dochdl/gloshdl.cxx | 1 sw/source/uibase/docvw/srcedtw.cxx | 1 sw/source/uibase/utlui/glbltree.cxx | 1 sw/source/uibase/wrtsh/wrtsh2.cxx | 1 sw/source/writerfilter/dmapper/SdtHelper.cxx | 1 sw/source/writerfilter/rtftok/rtfdocumentimpl.cxx | 1 toolkit/source/controls/filectrl.cxx | 1 vcl/qa/cppunit/gen/gen.cxx | 1 vcl/source/treelist/imap.cxx | 1 vcl/source/treelist/imap2.cxx | 1 vcl/source/treelist/transfer.cxx | 1 vcl/unx/gtk3/gtkinst.cxx | 1 131 files changed, 168 insertions(+), 22 deletions(-)
New commits: commit 76eb42c5aa7a9d213e5e5bd23c695df3de99dc3b Author: Gabor Kelemen <[email protected]> AuthorDate: Fri Jan 23 10:49:31 2026 +0100 Commit: Gabor Kelemen <[email protected]> CommitDate: Sat Jan 31 16:36:16 2026 +0100 tdf#146619 Use more forward declarations in include/svl This shaves off some 40M of input Change-Id: I89411ee8d94963ec6bc16fe155c885d2c78ee3a1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198233 Reviewed-by: Gabor Kelemen <[email protected]> Tested-by: Jenkins diff --git a/basctl/source/basicide/basicrenderable.cxx b/basctl/source/basicide/basicrenderable.cxx index c81419e3398f..75b708d26bb4 100644 --- a/basctl/source/basicide/basicrenderable.cxx +++ b/basctl/source/basicide/basicrenderable.cxx @@ -23,6 +23,7 @@ #include <strings.hrc> #include <toolkit/awt/vclxdevice.hxx> +#include <tools/mapunit.hxx> #include <tools/multisel.hxx> #include <cppuhelper/compbase.hxx> #include <comphelper/propertysequence.hxx> diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 5ffae1ff25ed..522e8748c3ba 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -48,6 +48,7 @@ #include <sfx2/progress.hxx> #include <sfx2/viewfrm.hxx> #include <tools/debug.hxx> +#include <tools/mapunit.hxx> #include <unotools/fontdefs.hxx> #include <utility> #include <vcl/image.hxx> diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx index 36f049a55c97..9b03bf429ea5 100644 --- a/chart2/source/view/main/ChartItemPool.cxx +++ b/chart2/source/view/main/ChartItemPool.cxx @@ -31,6 +31,7 @@ #include <editeng/sizeitem.hxx> #include <svl/stritem.hxx> #include <svl/ilstitem.hxx> +#include <tools/mapunit.hxx> #include <editeng/editids.hrc> #include <svx/svxids.hrc> #include <vector> diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx index 8c418ec2374d..89cb02a66f01 100644 --- a/chart2/source/view/main/DrawModelWrapper.cxx +++ b/chart2/source/view/main/DrawModelWrapper.cxx @@ -28,6 +28,7 @@ #include <svx/svx3ditems.hxx> #include <svx/xtable.hxx> #include <svx/svdoutl.hxx> +#include <tools/mapunit.hxx> #include <editeng/unolingu.hxx> #include <vcl/svapp.hxx> #include <vcl/virdev.hxx> diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index 1b422521f472..7e095d09a616 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -29,6 +29,7 @@ #include <vcl/svapp.hxx> #include <vcl/weld/Builder.hxx> #include <osl/diagnose.h> +#include <tools/mapunit.hxx> #include <tools/fldunit.hxx> #include <cuigrfflt.hxx> diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 1261ca4f9d38..bdc948324a0e 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -80,6 +80,7 @@ #include <sqlmessage.hxx> #include <dlgsize.hxx> #include <svtools/editbrowsebox.hxx> +#include <tools/mapunit.hxx> #include <tools/urlobj.hxx> #include <comphelper/diagnose_ex.hxx> #include <svl/numuno.hxx> diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 7b6019ab6ac0..091a38376ace 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -174,6 +174,7 @@ #include <tools/debug.hxx> #include <tools/fract.hxx> #include <tools/json_writer.hxx> +#include <tools/urlobj.hxx> #include <svtools/ctrltool.hxx> #include <svtools/langtab.hxx> #include <vcl/fontcharmap.hxx> diff --git a/editeng/source/accessibility/AccessibleHyperlink.cxx b/editeng/source/accessibility/AccessibleHyperlink.cxx index f4cb80a42d32..f00a43f23aac 100644 --- a/editeng/source/accessibility/AccessibleHyperlink.cxx +++ b/editeng/source/accessibility/AccessibleHyperlink.cxx @@ -25,6 +25,7 @@ #include "AccessibleHyperlink.hxx" #include <editeng/unoedprx.hxx> #include <editeng/flditem.hxx> +#include <rtl/ref.hxx> #include <vcl/keycodes.hxx> using namespace ::com::sun::star; diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index 5d408015665a..251bdaf6b198 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -23,6 +23,7 @@ #include <editeng/editview.hxx> #include <editeng/outliner.hxx> #include <editeng/urlfieldhelper.hxx> +#include <tools/mapunit.hxx> #include <tools/poly.hxx> #include <editeng/unolingu.hxx> #include <com/sun/star/linguistic2/XDictionary.hpp> diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 4e09872f23a2..e52553e4a7b5 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -62,6 +62,7 @@ #include <sot/formats.hxx> #include <svl/asiancfg.hxx> #include <svl/voiditem.hxx> +#include <tools/mapunit.hxx> #include <i18nutil/unicode.hxx> #include <i18nutil/scriptchangescanner.hxx> #include <i18nutil/guessparadirection.hxx> diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index ea5e8b6067fd..016669a23f40 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -46,6 +46,7 @@ #include <libxml/xmlwriter.h> #include <sal/log.hxx> #include <tools/debug.hxx> +#include <tools/mapunit.hxx> #include <o3tl/safeint.hxx> #include <o3tl/string_view.hxx> #include <osl/diagnose.h> diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx index 8b425cecba4a..c393424c5236 100644 --- a/editeng/source/uno/unoipset.cxx +++ b/editeng/source/uno/unoipset.cxx @@ -21,7 +21,9 @@ #include <tools/UnitConversion.hxx> #include <editeng/unoipset.hxx> #include <svl/itempool.hxx> +#include <svl/itemset.hxx> #include <svl/solar.hrc> +#include <tools/mapunit.hxx> #include <o3tl/any.hxx> #include <osl/diagnose.h> #include <sal/log.hxx> diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx index 402b4af44161..85ae63207d5a 100644 --- a/editeng/source/uno/unotext2.cxx +++ b/editeng/source/uno/unotext2.cxx @@ -21,6 +21,7 @@ #include <initializer_list> +#include <rtl/ref.hxx> #include <o3tl/safeint.hxx> #include <vcl/svapp.hxx> diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index 256ad7601554..a1124dca2172 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.cxx @@ -43,6 +43,7 @@ #include <comphelper/interaction.hxx> #include <comphelper/processfactory.hxx> #include <tools/debug.hxx> +#include <tools/urlobj.hxx> #include <comphelper/diagnose_ex.hxx> #include <unotools/sharedunocomponent.hxx> #include <vcl/stdtext.hxx> diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index 49d5d1f994e8..b003a247acec 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -30,6 +30,7 @@ #include <o3tl/string_view.hxx> #include <sal/log.hxx> #include <osl/diagnose.h> +#include <tools/mapunit.hxx> #include <cppuhelper/implbase.hxx> #include <utility> #include <vcl/event.hxx> diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index 9e9e90cd67c3..8e91a130559c 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -29,6 +29,7 @@ #include <svl/zforlist.hxx> #include <unotools/charclass.hxx> +#include <unotools/localedatawrapper.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <comphelper/lok.hxx> diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index 2d436788b73e..334066765e84 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -30,6 +30,7 @@ #include <svtools/imagemgr.hxx> #include <svl/svlresid.hxx> #include <svl/svl.hrc> +#include <unotools/resmgr.hxx> #include <utility> using namespace ::com::sun::star::uno; diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml index 5460f9b0e06f..520c1e945ad1 100644 --- a/include/IwyuFilter_include.yaml +++ b/include/IwyuFilter_include.yaml @@ -302,6 +302,9 @@ excludelist: - com/sun/star/lang/XInitialization.hpp - com/sun/star/lang/XServiceInfo.hpp - com/sun/star/xml/sax/XFastParser.hpp + include/svl/lstner.hxx: + # Full type is needed within std::map + - sal/backtrace.hxx include/svl/numuno.hxx: # base class has to be a complete type - com/sun/star/lang/XUnoTunnel.hpp diff --git a/include/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx index f44428089c01..530d310d1e40 100644 --- a/include/editeng/fhgtitem.hxx +++ b/include/editeng/fhgtitem.hxx @@ -20,6 +20,7 @@ #define INCLUDED_EDITENG_FHGTITEM_HXX #include <svl/poolitem.hxx> +#include <tools/mapunit.hxx> #include <editeng/editengdllapi.h> // class SvxFontHeightItem ----------------------------------------------- diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index e2052f215e89..0f3137916c8a 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -33,6 +33,7 @@ #include <utility> #include <vcl/outdev.hxx> #include <comphelper/errcode.hxx> +#include <comphelper/lok.hxx> #include <tools/link.hxx> #include <editeng/editengdllapi.h> #include <editeng/svxfont.hxx> diff --git a/include/editeng/unoipset.hxx b/include/editeng/unoipset.hxx index f0fb2883cbbb..895735a364c5 100644 --- a/include/editeng/unoipset.hxx +++ b/include/editeng/unoipset.hxx @@ -23,6 +23,7 @@ #include <editeng/editengdllapi.h> #include <rtl/ref.hxx> #include <svl/itemprop.hxx> +#include <svl/poolitem.hxx> #include <vector> class SfxItemSet; diff --git a/include/svl/PasswordHelper.hxx b/include/svl/PasswordHelper.hxx index 405b3962aab6..29c51470c734 100644 --- a/include/svl/PasswordHelper.hxx +++ b/include/svl/PasswordHelper.hxx @@ -25,9 +25,11 @@ #include <string_view> #include <optional> +#include <rtl/ustring.hxx> #include <svl/svldllapi.h> #include <sal/types.h> -#include <com/sun/star/uno/Sequence.hxx> + +namespace com::sun::star::uno { template <class E> class Sequence; } class SvPasswordHelper { diff --git a/include/svl/asiancfg.hxx b/include/svl/asiancfg.hxx index 1385560bd062..a5011f1a261d 100644 --- a/include/svl/asiancfg.hxx +++ b/include/svl/asiancfg.hxx @@ -23,12 +23,13 @@ #include <sal/config.h> #include <memory> -#include <com/sun/star/uno/Sequence.hxx> +#include <rtl/ustring.hxx> #include <svl/svldllapi.h> namespace com::sun::star::lang { struct Locale; } +namespace com::sun::star::uno { template <typename> class Sequence; } /// These constants define character compression in Asian text. /// Must match the values in com::sun::star::text::CharacterCompressionType. diff --git a/include/svl/documentlockfile.hxx b/include/svl/documentlockfile.hxx index d5dee52561cb..0380c226c616 100644 --- a/include/svl/documentlockfile.hxx +++ b/include/svl/documentlockfile.hxx @@ -24,6 +24,7 @@ #include <svl/lockfilecommon.hxx> +namespace com::sun::star::uno { template <class interface_type> class Reference; } namespace com::sun::star::io { class XInputStream; } namespace com::sun::star::io { class XOutputStream; } diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx index af48da4ed696..ad3cd5fcccb2 100644 --- a/include/svl/itemprop.hxx +++ b/include/svl/itemprop.hxx @@ -19,18 +19,20 @@ #ifndef INCLUDED_SVL_ITEMPROP_HXX #define INCLUDED_SVL_ITEMPROP_HXX -#include <com/sun/star/beans/XPropertySetInfo.hpp> -#include <com/sun/star/beans/PropertyState.hpp> #include <comphelper/propertysetinfo.hxx> #include <cppuhelper/implbase.hxx> #include <rtl/ref.hxx> -#include <svl/itemset.hxx> #include <svl/svldllapi.h> #include <o3tl/sorted_vector.hxx> #include <span> #include <string_view> #include <utility> +class SfxItemSet; + +namespace com::sun::star::beans { class XPropertySetInfo; } +namespace com::sun::star::beans { enum class PropertyState; } + // values from com/sun/star/beans/PropertyAttribute #define PROPERTY_NONE 0 diff --git a/include/svl/lockfilecommon.hxx b/include/svl/lockfilecommon.hxx index 6a19681b6f7a..8a261809c8c3 100644 --- a/include/svl/lockfilecommon.hxx +++ b/include/svl/lockfilecommon.hxx @@ -22,15 +22,16 @@ #include <svl/svldllapi.h> -#include <com/sun/star/uno/Sequence.hxx> - -#include <tools/urlobj.hxx> +#include <rtl/ustring.hxx> #include <o3tl/enumarray.hxx> #include <mutex> #include <string_view> #include <vector> +class INetURLObject; +namespace com::sun::star::uno { template <class E> class Sequence; } + enum class LockFileComponent { OOOUSERNAME, SYSUSERNAME, LOCALHOST, EDITTIME, USERURL, LAST=USERURL diff --git a/include/svl/nfengine.hxx b/include/svl/nfengine.hxx index 8ddb9ec83bbf..8b1309e5a2e4 100644 --- a/include/svl/nfengine.hxx +++ b/include/svl/nfengine.hxx @@ -19,21 +19,32 @@ #pragma once #include <svl/svldllapi.h> -#include <com/sun/star/i18n/XNumberFormatCode.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <i18nlangtag/lang.h> #include <svl/ondemand.hxx> #include <svl/zforlist.hxx> -#include <unotools/charclass.hxx> #include <functional> #include <map> class Color; +class CharClass; class ImpSvNumberformatScan; class ImpSvNumberInputScan; class SvNumberFormatter; +namespace com::sun::star::i18n +{ +class XNumberFormatCode; +} +namespace com::sun::star::i18n +{ +struct NumberFormatCode; +} +namespace com::sun::star::uno +{ +class XComponentContext; +} + class SVL_DLLPUBLIC SvNFLanguageData { public: diff --git a/include/svl/pickerhistoryaccess.hxx b/include/svl/pickerhistoryaccess.hxx index 7e855f17aff4..2740fc2ed547 100644 --- a/include/svl/pickerhistoryaccess.hxx +++ b/include/svl/pickerhistoryaccess.hxx @@ -22,8 +22,8 @@ #include <svl/svldllapi.h> -#include <com/sun/star/uno/Reference.hxx> - +namespace com::sun::star::uno { class XInterface; } +namespace com::sun::star::uno { template <class interface_type> class Reference; } namespace svt { diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index 7ae4724be410..69bc63eee3e1 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -28,13 +28,13 @@ #include <svl/hint.hxx> #include <svl/svldllapi.h> #include <svl/typedwhich.hxx> -#include <tools/mapunit.hxx> #include <tools/long.hxx> #include <boost/property_tree/ptree_fwd.hpp> #include <unordered_set> #include <unordered_map> class IntlWrapper; +enum class MapUnit : sal_uInt8; #define SFX_ITEMS_MAXREF 0xffffffff #define CONVERT_TWIPS 0x80 // Uno conversion for measurement (for MemberId) diff --git a/include/svl/sharecontrolfile.hxx b/include/svl/sharecontrolfile.hxx index e9aff0f2429e..6b12cdd11013 100644 --- a/include/svl/sharecontrolfile.hxx +++ b/include/svl/sharecontrolfile.hxx @@ -22,6 +22,8 @@ #include <svl/svldllapi.h> +#include <com/sun/star/uno/Reference.hxx> + #include <svl/lockfilecommon.hxx> #include <vector> diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx index f9c71d4e767b..f1cb89fb0108 100644 --- a/include/svl/srchitem.hxx +++ b/include/svl/srchitem.hxx @@ -26,9 +26,10 @@ #include <i18nutil/transliteration.hxx> #include <i18nutil/searchopt.hxx> #include <unotools/configitem.hxx> -#include <svl/style.hxx> #include <svl/poolitem.hxx> +enum class SfxStyleFamily; + // defines --------------------------------------------------------------- // commands diff --git a/include/svl/style.hxx b/include/svl/style.hxx index 8cd3a038e6e4..2555eda5306b 100644 --- a/include/svl/style.hxx +++ b/include/svl/style.hxx @@ -23,7 +23,6 @@ #include <config_options.h> #include <com/sun/star/style/XStyle.hpp> -#include <rtl/ref.hxx> #include <cppuhelper/implbase.hxx> #include <svl/svldllapi.h> #include <svl/hint.hxx> @@ -31,7 +30,6 @@ #include <svl/SfxBroadcaster.hxx> #include <svl/stylesheetuser.hxx> #include <o3tl/typed_flags_set.hxx> -#include <tools/mapunit.hxx> #include <memory> #include <optional> @@ -83,6 +81,8 @@ class SfxStyleSheetBasePool; namespace svl { class IndexedStyleSheets; } typedef struct _xmlTextWriter* xmlTextWriterPtr; +namespace rtl { template <class reference_type> class Reference; } +enum class MapUnit : sal_uInt8; /* Everyone changing instances of SfxStyleSheetBasePool or SfxStyleSheetBase diff --git a/include/svl/stylepool.hxx b/include/svl/stylepool.hxx index dd01f2d475e0..95a6dc4a6a92 100644 --- a/include/svl/stylepool.hxx +++ b/include/svl/stylepool.hxx @@ -18,12 +18,13 @@ */ #pragma once +#include <svl/svldllapi.h> #include <rtl/ustring.hxx> -#include <svl/itemset.hxx> #include <memory> #include <vector> #include <unordered_map> +class SfxItemSet; class StylePoolImpl; class SVL_DLLPUBLIC StylePool final diff --git a/include/svl/svlresid.hxx b/include/svl/svlresid.hxx index 5b57aa2c0c52..d3a133924db4 100644 --- a/include/svl/svlresid.hxx +++ b/include/svl/svlresid.hxx @@ -12,7 +12,8 @@ #include <svl/svldllapi.h> #include <rtl/ustring.hxx> -#include <unotools/resmgr.hxx> + +struct TranslateId; SVL_DLLPUBLIC OUString SvlResId(TranslateId sContextAndId); diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx index 1a37cecf1d98..2f8757da1911 100644 --- a/include/svl/undo.hxx +++ b/include/svl/undo.hxx @@ -20,7 +20,6 @@ #define INCLUDED_SVL_UNDO_HXX #include <svl/svldllapi.h> -#include <comphelper/lok.hxx> #include <rtl/ustring.hxx> #include <tools/datetime.hxx> #include <o3tl/strong_int.hxx> diff --git a/include/svl/urihelper.hxx b/include/svl/urihelper.hxx index 43cef249333e..6de0ed746c05 100644 --- a/include/svl/urihelper.hxx +++ b/include/svl/urihelper.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVL_URIHELPER_HXX #define INCLUDED_SVL_URIHELPER_HXX -#include <com/sun/star/uno/Reference.hxx> #include <rtl/textenc.h> #include <svl/svldllapi.h> #include <tools/link.hxx> @@ -29,6 +28,7 @@ namespace com::sun::star { namespace uno { class XComponentContext; } namespace uri { class XUriReference; } + namespace uno {template <typename> class Reference; } } class CharClass; diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx index f94a4aa7c99d..9d8cf4bc27e6 100644 --- a/include/svl/zforlist.hxx +++ b/include/svl/zforlist.hxx @@ -26,13 +26,14 @@ #include <o3tl/typed_flags_set.hxx> #include <i18nlangtag/lang.h> #include <com/sun/star/util/NumberFormat.hpp> -#include <unotools/localedatawrapper.hxx> #include <map> #include <unordered_map> +#include <vector> namespace com::sun::star::i18n { struct Currency; } +class LocaleDataWrapper; class SvNumberformat; #define SV_COUNTRY_LANGUAGE_OFFSET 10000 // Max count of formats per country/language diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx index 82aa5e845b09..712bb0dace5b 100644 --- a/include/svl/zformat.hxx +++ b/include/svl/zformat.hxx @@ -32,6 +32,8 @@ namespace com::sun::star::i18n { struct NativeNumberXmlAttributes2; } class Color; class CalendarWrapper; +class LocaleDataWrapper; +enum class DateOrder; class SvNFLanguageData; diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx index ca199e2477cd..422a9f51859a 100644 --- a/include/svx/nbdtmg.hxx +++ b/include/svx/nbdtmg.hxx @@ -22,6 +22,7 @@ #include <memory> #include <vector> #include <editeng/numitem.hxx> +#include <tools/mapunit.hxx> #include <vcl/font.hxx> class SfxItemSet; diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx index c4f9017a4e4c..d7ce5520ea79 100644 --- a/include/svx/svdetc.hxx +++ b/include/svx/svdetc.hxx @@ -23,6 +23,7 @@ #include <editeng/outliner.hxx> #include <svx/svxdllapi.h> #include <tools/link.hxx> +#include <tools/mapunit.hxx> #include <svx/svdobj.hxx> #include <svl/whichranges.hxx> #include <unotools/syslocale.hxx> diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx index 7bd7056960c2..bb83dc944c15 100644 --- a/include/svx/svdundo.hxx +++ b/include/svx/svdundo.hxx @@ -26,6 +26,7 @@ #include <vector> #include <editeng/outlobj.hxx> +#include <rtl/ref.hxx> #include <svl/itemset.hxx> #include <svl/undo.hxx> #include <svl/style.hxx> diff --git a/include/svx/unoshtxt.hxx b/include/svx/unoshtxt.hxx index 101df5807107..4b3e67148579 100644 --- a/include/svx/unoshtxt.hxx +++ b/include/svx/unoshtxt.hxx @@ -22,6 +22,7 @@ #include <memory> #include <editeng/unoedsrc.hxx> +#include <rtl/ref.hxx> #include <svx/svxdllapi.h> class SdrObject; diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index 71f938dcc0f2..4dbc848001b7 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -31,6 +31,7 @@ #include <svl/asiancfg.hxx> #include <vcl/virdev.hxx> #include <svl/sharedstringpool.hxx> +#include <tools/mapunit.hxx> #include <tools/urlobj.hxx> #include <rtl/crc.h> #include <basic/basmgr.hxx> diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index bfb7ae4b3657..b1cbdb1c4e69 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -21,6 +21,7 @@ #include <comphelper/fileformat.h> #include <comphelper/processfactory.hxx> #include <officecfg/Office/Common.hxx> +#include <tools/mapunit.hxx> #include <tools/urlobj.hxx> #include <editeng/frmdiritem.hxx> #include <editeng/langitem.hxx> diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 92930c7c1a4b..b5aefde17c98 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -37,6 +37,7 @@ #include <svl/stritem.hxx> #include <svl/zforlist.hxx> #include <svl/zformat.hxx> +#include <tools/mapunit.hxx> #include <vcl/keycodes.hxx> #include <vcl/virdev.hxx> #include <vcl/settings.hxx> diff --git a/sc/source/core/data/poolhelp.cxx b/sc/source/core/data/poolhelp.cxx index 21384dac1683..c58808f48de9 100644 --- a/sc/source/core/data/poolhelp.cxx +++ b/sc/source/core/data/poolhelp.cxx @@ -20,6 +20,7 @@ #include <comphelper/processfactory.hxx> #include <svl/numformat.hxx> #include <svl/zforlist.hxx> +#include <tools/mapunit.hxx> #include <editeng/editeng.hxx> #include <poolhelp.hxx> diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx index 89a4622f8f41..12cb666388da 100644 --- a/sc/source/core/tool/editutil.cxx +++ b/sc/source/core/tool/editutil.cxx @@ -28,6 +28,7 @@ #include <editeng/numitem.hxx> #include <editeng/justifyitem.hxx> #include <editeng/editobj.hxx> +#include <tools/mapunit.hxx> #include <vcl/outdev.hxx> #include <svl/numformat.hxx> #include <svl/inethist.hxx> diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 88a0899c3315..a5f3e2962f3f 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -30,6 +30,7 @@ #include <svl/numformat.hxx> #include <svl/zforlist.hxx> #include <svl/zformat.hxx> +#include <tools/mapunit.hxx> #include <tools/urlobj.hxx> #include <unotools/charclass.hxx> #include <sfx2/docfile.hxx> diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index f29c89cdf608..4260c0c0063d 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -39,6 +39,7 @@ #include <oox/helper/propertyset.hxx> #include <oox/ole/vbaproject.hxx> #include <oox/token/properties.hxx> +#include <tools/mapunit.hxx> #include <addressconverter.hxx> #include <connectionsbuffer.hxx> #include <defnamesbuffer.hxx> diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index dd4fc2e27a1d..65123c53b1f4 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -28,6 +28,7 @@ #include <xmloff/xmlictxt.hxx> #include <xmloff/xmlmetai.hxx> #include <sfx2/objsh.hxx> +#include <tools/mapunit.hxx> #include <unotools/streamwrap.hxx> #include <unotools/tempfile.hxx> #include <xmloff/xmlscripti.hxx> diff --git a/sc/source/ui/app/msgpool.cxx b/sc/source/ui/app/msgpool.cxx index 990eac60fdf3..a3ed5c6d00a2 100644 --- a/sc/source/ui/app/msgpool.cxx +++ b/sc/source/ui/app/msgpool.cxx @@ -24,6 +24,8 @@ #include <msgpool.hxx> #include <dbdata.hxx> +#include <tools/mapunit.hxx> + static ItemInfoPackage& getItemInfoPackageScMessage() { class ItemInfoPackageScMessage : public ItemInfoPackage diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx index 068ee78c44cd..ce1e19ad58d9 100644 --- a/sc/source/ui/cctrl/dpcontrol.cxx +++ b/sc/source/ui/cctrl/dpcontrol.cxx @@ -27,6 +27,7 @@ #include <docpool.hxx> #include <patattr.hxx> #include <svtools/colorcfg.hxx> +#include <tools/mapunit.hxx> ScDPFieldButton::ScDPFieldButton(OutputDevice* pOutDev, const StyleSettings& rStyle, const Fraction& rZoomY, ScDocument& rDoc): maZoomY(rZoomY), diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index da9c58b05e24..13fdf3e6a431 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -18,6 +18,7 @@ */ #include <tbzoomsliderctrl.hxx> #include <i18nutil/unicode.hxx> +#include <tools/mapunit.hxx> #include <vcl/svapp.hxx> #include <comphelper/propertyvalue.hxx> diff --git a/sc/source/ui/docshell/sizedev.cxx b/sc/source/ui/docshell/sizedev.cxx index a288931a5968..7b38f9560562 100644 --- a/sc/source/ui/docshell/sizedev.cxx +++ b/sc/source/ui/docshell/sizedev.cxx @@ -18,6 +18,7 @@ */ #include <sfx2/printer.hxx> +#include <tools/mapunit.hxx> #include <vcl/virdev.hxx> #include <sizedev.hxx> diff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxx index 9c4a0289602b..170c16c89c6a 100644 --- a/sc/source/ui/undo/undostyl.cxx +++ b/sc/source/ui/undo/undostyl.cxx @@ -18,6 +18,7 @@ */ #include <svl/itemset.hxx> +#include <tools/mapunit.hxx> #include <utility> #include <vcl/virdev.hxx> #include <osl/diagnose.h> diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index 21fe7e6525cf..5688b8218021 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -43,6 +43,7 @@ #include <svl/intitem.hxx> #include <svl/zformat.hxx> #include <tools/fract.hxx> +#include <tools/mapunit.hxx> #include <tools/UnitConversion.hxx> #include <osl/diagnose.h> diff --git a/sc/source/ui/view/drawutil.cxx b/sc/source/ui/view/drawutil.cxx index 9658fa7ff20b..d3e59f7af06f 100644 --- a/sc/source/ui/view/drawutil.cxx +++ b/sc/source/ui/view/drawutil.cxx @@ -20,6 +20,7 @@ #include <sal/config.h> #include <o3tl/unit_conversion.hxx> +#include <tools/mapunit.hxx> #include <vcl/outdev.hxx> #include <drawutil.hxx> diff --git a/sc/source/ui/view/gridwin_dbgutil.cxx b/sc/source/ui/view/gridwin_dbgutil.cxx index f798bf3e017e..419f5a8c3624 100644 --- a/sc/source/ui/view/gridwin_dbgutil.cxx +++ b/sc/source/ui/view/gridwin_dbgutil.cxx @@ -11,6 +11,7 @@ #include <gridwin.hxx> #include <svx/svdpage.hxx> +#include <tools/mapunit.hxx> #include <libxml/xmlwriter.h> #include <viewdata.hxx> #include <document.hxx> diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index deeb9d017928..bf94e5cfc24a 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -36,6 +36,7 @@ #include <sfx2/docfilt.hxx> #include <sfx2/fcontnr.hxx> #include <svtools/langtab.hxx> +#include <tools/urlobj.hxx> #include <vcl/graphicfilter.hxx> #include <svl/stritem.hxx> #include <vcl/transfer.hxx> diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index b4927373fb39..2841a4d14596 100644 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -27,6 +27,7 @@ #include <sfx2/docfilt.hxx> #include <sfx2/sfxuno.hxx> #include <svx/svdograf.hxx> +#include <tools/urlobj.hxx> #include <strings.hrc> #include <DrawViewShell.hxx> diff --git a/sd/source/filter/pdf/sdpdffilter.cxx b/sd/source/filter/pdf/sdpdffilter.cxx index 1591217843b6..7f516776824b 100644 --- a/sd/source/filter/pdf/sdpdffilter.cxx +++ b/sd/source/filter/pdf/sdpdffilter.cxx @@ -23,6 +23,7 @@ #include <sfx2/docfile.hxx> #include <svx/svdograf.hxx> #include <o3tl/safeint.hxx> +#include <tools/urlobj.hxx> #include <sdpage.hxx> #include <drawdoc.hxx> diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index 8b2ff650f6b3..f4a7c99ae744 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -20,6 +20,7 @@ #include <unotools/pathoptions.hxx> #include <unotools/ucbstreamhelper.hxx> #include <unotools/resmgr.hxx> +#include <tools/mapunit.hxx> #include <tools/urlobj.hxx> #include <vcl/virdev.hxx> #include <vcl/svapp.hxx> diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 73c8b515bade..b494ad26eda4 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -25,6 +25,7 @@ #include <svx/svditer.hxx> #include <sfx2/docfile.hxx> #include <svx/svdoole2.hxx> +#include <tools/urlobj.hxx> #include <vcl/svapp.hxx> #include <cusshow.hxx> diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index 408d631c8399..0de493405a85 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -18,6 +18,7 @@ */ #include <fuinsfil.hxx> +#include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> #include <sfx2/progress.hxx> #include <editeng/outliner.hxx> diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index 40dedb32f903..d750709c5a22 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -32,6 +32,7 @@ #include <sot/storage.hxx> #include <comphelper/sequenceashashmap.hxx> #include <unotools/mediadescriptor.hxx> +#include <tools/urlobj.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 409d4694cc27..b91fcc424215 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -67,6 +67,7 @@ #include <svtools/soerr.hxx> #include <sfx2/ipclient.hxx> #include <tools/debug.hxx> +#include <tools/urlobj.hxx> using namespace com::sun::star; diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 4eeabba5bc4a..0008f1c375b1 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -58,6 +58,7 @@ #include <preventduplicateinteraction.hxx> #include <svtools/ehdl.hxx> #include <tools/debug.hxx> +#include <tools/urlobj.hxx> #include <unotools/pathoptions.hxx> #include <unotools/securityoptions.hxx> #include <unotools/moduleoptions.hxx> diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 219f054d8770..f15af36bd71b 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -37,6 +37,7 @@ #include <svl/slstitm.hxx> #include <svl/stritem.hxx> #include <tools/debug.hxx> +#include <tools/mapunit.hxx> #include <cppuhelper/implbase.hxx> #include <com/sun/star/document/BrokenPackageRequest.hpp> diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx index 07b3f905e3c6..678bb1da884e 100644 --- a/sfx2/source/control/ctrlitem.cxx +++ b/sfx2/source/control/ctrlitem.cxx @@ -19,6 +19,7 @@ #include <sal/log.hxx> #include <svl/itempool.hxx> +#include <tools/mapunit.hxx> #include <sfx2/ctrlitem.hxx> #include <sfx2/bindings.hxx> diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 27dcf4d22f28..74973e2f8cec 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -20,6 +20,7 @@ #include <config_java.h> #include <tools/debug.hxx> +#include <tools/mapunit.hxx> #include <svl/eitem.hxx> #include <svl/intitem.hxx> #include <svl/itempool.hxx> diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 277e3fe7821d..3c2aad2ecd0d 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -28,6 +28,7 @@ #include <svl/intitem.hxx> #include <svl/style.hxx> #include <osl/diagnose.h> +#include <tools/mapunit.hxx> #include <sfx2/styfitem.hxx> #include <sfx2/styledlg.hxx> diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index e5234f1fbcb9..0419dfe36b2b 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -26,6 +26,7 @@ #include <officecfg/Office/Common.hxx> #include <unotools/localedatawrapper.hxx> +#include <rtl/ustrbuf.hxx> #include <svl/intitem.hxx> #include <svl/stritem.hxx> #include <svl/itemset.hxx> diff --git a/sfx2/source/doc/SfxRedactionHelper.cxx b/sfx2/source/doc/SfxRedactionHelper.cxx index 548455883188..682715ed7bbe 100644 --- a/sfx2/source/doc/SfxRedactionHelper.cxx +++ b/sfx2/source/doc/SfxRedactionHelper.cxx @@ -44,6 +44,7 @@ #include <svtools/DocumentToGraphicRenderer.hxx> #include <tools/gen.hxx> +#include <tools/mapunit.hxx> #include <tools/stream.hxx> #include <comphelper/diagnose_ex.hxx> diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 3e729d396414..cec4d261aefc 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -39,6 +39,7 @@ #include <tools/debug.hxx> #include <comphelper/diagnose_ex.hxx> #include <tools/helpers.hxx> +#include <tools/urlobj.hxx> #include <rtl/uri.hxx> #include <unotools/useroptions.hxx> diff --git a/sfx2/source/doc/objembed.cxx b/sfx2/source/doc/objembed.cxx index d57e9e55e9ff..f370bd68bc9c 100644 --- a/sfx2/source/doc/objembed.cxx +++ b/sfx2/source/doc/objembed.cxx @@ -25,6 +25,7 @@ #include <comphelper/fileformat.h> #include <tools/fract.hxx> +#include <tools/mapunit.hxx> #include <vcl/transfer.hxx> #include <vcl/outdev.hxx> #include <vcl/gdimtf.hxx> diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 8e0cbecee344..e8e2ecd3c66e 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -34,6 +34,8 @@ #include <com/sun/star/frame/XTitle.hpp> #include <osl/file.hxx> #include <sal/log.hxx> +#include <tools/mapunit.hxx> +#include <tools/urlobj.hxx> #include <vcl/weld/weld.hxx> #include <vcl/svapp.hxx> #include <svl/eitem.hxx> diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx index e385ba09dd59..2593b69c0477 100644 --- a/sfx2/source/doc/printhelper.cxx +++ b/sfx2/source/doc/printhelper.cxx @@ -36,6 +36,7 @@ #include <unotools/tempfile.hxx> #include <osl/file.hxx> #include <osl/thread.hxx> +#include <tools/mapunit.hxx> #include <tools/urlobj.hxx> #include <comphelper/diagnose_ex.hxx> #include <ucbhelper/content.hxx> diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx b/sfx2/source/sidebar/SidebarChildWindow.cxx index 272c280488c8..9f34d6f5183a 100644 --- a/sfx2/source/sidebar/SidebarChildWindow.cxx +++ b/sfx2/source/sidebar/SidebarChildWindow.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <tools/mapunit.hxx> #include <sfx2/sidebar/TabBar.hxx> #include <sfx2/bindings.hxx> #include <sfx2/sidebar/SidebarChildWindow.hxx> diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 03a4fd23d553..fe13a1e76ba6 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -51,6 +51,7 @@ #include <svl/eitem.hxx> #include <svl/whiter.hxx> #include <svl/undo.hxx> +#include <tools/urlobj.hxx> #include <vcl/help.hxx> #include <vcl/stdtext.hxx> #include <vcl/weld/weld.hxx> diff --git a/svl/qa/unit/lockfiles/test_lockfiles.cxx b/svl/qa/unit/lockfiles/test_lockfiles.cxx index 7a55c731b203..0efe8e202c8c 100644 --- a/svl/qa/unit/lockfiles/test_lockfiles.cxx +++ b/svl/qa/unit/lockfiles/test_lockfiles.cxx @@ -22,6 +22,7 @@ #include <svl/msodocumentlockfile.hxx> #include <unotools/useroptions.hxx> #include <tools/stream.hxx> +#include <tools/urlobj.hxx> #include <rtl/strbuf.hxx> #include <osl/security.hxx> #include <osl/socket.hxx> diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index 06c4c59a4eb7..5c7eb96415e0 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -29,6 +29,7 @@ #include <svl/hint.hxx> #include <svl/itemset.hxx> #include <tools/debug.hxx> +#include <tools/mapunit.hxx> #include <cassert> #include <vector> diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx index 3bc8e8a01228..74ce5c9f527b 100644 --- a/svl/source/items/itemprop.cxx +++ b/svl/source/items/itemprop.cxx @@ -24,6 +24,7 @@ #include <svl/itempool.hxx> #include <svl/itemset.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> +#include <com/sun/star/beans/PropertyState.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <memory> diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index 393554df1ac8..5bb091d14c51 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -18,6 +18,7 @@ */ #include <svl/poolitem.hxx> +#include <tools/mapunit.hxx> #include <unotools/intlwrapper.hxx> #include <unotools/syslocale.hxx> #include <osl/diagnose.h> diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx index 5f37d07b7674..45428fbd4529 100644 --- a/svl/source/items/srchitem.cxx +++ b/svl/source/items/srchitem.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/lang/Locale.hpp> #include <svl/memberid.h> +#include <svl/style.hxx> #include <i18nlangtag/languagetag.hxx> #include <unordered_set> diff --git a/svl/source/misc/PasswordHelper.cxx b/svl/source/misc/PasswordHelper.cxx index f2775ae90077..e7e187cee24c 100644 --- a/svl/source/misc/PasswordHelper.cxx +++ b/svl/source/misc/PasswordHelper.cxx @@ -28,6 +28,8 @@ #include <zxcvbn.h> #include <sal/log.hxx> +#include <com/sun/star/uno/Sequence.hxx> + using namespace com::sun::star; void SvPasswordHelper::GetHashPasswordSHA256(uno::Sequence<sal_Int8>& rPassHash, std::u16string_view rPassword) diff --git a/svl/source/misc/lockfilecommon.cxx b/svl/source/misc/lockfilecommon.cxx index bcf568b70aa6..a0efa458a942 100644 --- a/svl/source/misc/lockfilecommon.cxx +++ b/svl/source/misc/lockfilecommon.cxx @@ -20,6 +20,7 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/io/WrongFormatException.hpp> +#include <com/sun/star/uno/Sequence.hxx> #include <osl/time.h> #include <osl/security.hxx> diff --git a/svl/source/misc/msodocumentlockfile.cxx b/svl/source/misc/msodocumentlockfile.cxx index dab0486e439b..9c6f28f341c3 100644 --- a/svl/source/misc/msodocumentlockfile.cxx +++ b/svl/source/misc/msodocumentlockfile.cxx @@ -12,6 +12,7 @@ #include <ucbhelper/content.hxx> #include <comphelper/processfactory.hxx> #include <o3tl/string_view.hxx> +#include <tools/urlobj.hxx> #include <com/sun/star/io/IOException.hpp> #include <com/sun/star/io/XOutputStream.hpp> diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx index d961af7e8886..3abb3af90f92 100644 --- a/svx/source/core/graphichelper.cxx +++ b/svx/source/core/graphichelper.cxx @@ -25,6 +25,7 @@ #include <svx/dialmgr.hxx> #include <svx/graphichelper.hxx> #include <svx/strings.hrc> +#include <tools/urlobj.hxx> #include <comphelper/diagnose_ex.hxx> #include <vcl/svapp.hxx> #include <vcl/vclenum.hxx> diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 1cfa513245b9..83fb8f963b02 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -28,6 +28,7 @@ #include <svl/eitem.hxx> #include <svl/itemset.hxx> #include <sfx2/dispatch.hxx> +#include <tools/mapunit.hxx> #include <svx/colorbox.hxx> #include <svx/dialmgr.hxx> diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index 81ccc19bbce6..0d365f91449f 100644 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -25,6 +25,7 @@ #include <vcl/themecolors.hxx> #include <tools/color.hxx> #include <tools/fract.hxx> +#include <tools/mapunit.hxx> #include <svx/pageitem.hxx> #include <svx/pagectrl.hxx> #include <algorithm> diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 8284ee873515..efc467d5a3b7 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -43,6 +43,7 @@ #include <com/sun/star/i18n/CharacterIteratorMode.hpp> #include <cppuhelper/implbase.hxx> #include <svtools/colorcfg.hxx> +#include <tools/mapunit.hxx> #include <vcl/event.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index cf9e44c03f8c..fcf454785dd6 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -63,6 +63,7 @@ #include <vcl/commandevent.hxx> #include <vcl/svapp.hxx> #include <tools/debug.hxx> +#include <tools/mapunit.hxx> #include <tools/multisel.hxx> #include <comphelper/diagnose_ex.hxx> #include <vcl/help.hxx> diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 64f33b2e469c..3ffed84fbbb7 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -30,6 +30,7 @@ #include <o3tl/safeint.hxx> #include <o3tl/string_view.hxx> #include <svx/svxids.hrc> +#include <tools/mapunit.hxx> #include <comphelper/diagnose_ex.hxx> #include <unotools/resmgr.hxx> #include <svx/xmlexchg.hxx> diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index 7ebfc13f9109..926fcc8229c4 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -22,6 +22,7 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/sfxsids.hrc> +#include <tools/mapunit.hxx> #include <avmedia/mediaplayer.hxx> #include <galbrws1.hxx> #include <svx/galtheme.hxx> diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx index c8a227815c2f..a454803d61ff 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx @@ -29,6 +29,7 @@ #include <TextCharacterSpacingPopup.hxx> #include <svl/itempool.hxx> #include <svl/itemset.hxx> +#include <tools/mapunit.hxx> #include <helpids.h> #include <com/sun/star/beans/NamedValue.hpp> diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index e3d60b090832..b8b734185030 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -21,6 +21,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/viewsh.hxx> #include <rtl/ustring.hxx> +#include <tools/mapunit.hxx> #include <vcl/event.hxx> #include <vcl/settings.hxx> #include <vcl/toolbox.hxx> diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index 63dfd75c5eb3..49aa4649c2ae 100644 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -23,6 +23,7 @@ #include <comphelper/base64.hxx> #include <comphelper/graphicmimetype.hxx> #include <tools/debug.hxx> +#include <tools/mapunit.hxx> #include <vcl/animate/Animation.hxx> #include <vcl/animate/AnimationFrame.hxx> #include <vcl/gfxlink.hxx> @@ -31,6 +32,7 @@ #include <sfx2/docfile.hxx> #include <svx/svdpntv.hxx> #include <svx/xoutbmp.hxx> +#include <tools/urlobj.hxx> #include <vcl/graphicfilter.hxx> #include <vcl/cvtgrf.hxx> #include <vcl/gdimtf.hxx> diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx index d3a42be17ba5..ee4f0f3aba32 100644 --- a/sw/inc/swmodule.hxx +++ b/sw/inc/swmodule.hxx @@ -24,6 +24,7 @@ #include <cstddef> #include <o3tl/deleter.hxx> +#include <rtl/ref.hxx> #include <tools/fldunit.hxx> #include <svl/ctloptions.hxx> #include <svl/lstner.hxx> diff --git a/sw/source/core/crsr/FormFieldButton.cxx b/sw/source/core/crsr/FormFieldButton.cxx index 4c20b2f05791..126d646efd19 100644 --- a/sw/source/core/crsr/FormFieldButton.cxx +++ b/sw/source/core/crsr/FormFieldButton.cxx @@ -10,6 +10,7 @@ #include <DropDownFormFieldButton.hxx> #include <edtwin.hxx> #include <basegfx/color/bcolortools.hxx> +#include <tools/mapunit.hxx> #include <bookmark.hxx> #include <vcl/weld/weldutils.hxx> #include <vcl/event.hxx> diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx index abec511c1639..d93a55ad6ac7 100644 --- a/sw/source/core/doc/DocumentFieldsManager.cxx +++ b/sw/source/core/doc/DocumentFieldsManager.cxx @@ -56,6 +56,7 @@ #include <pam.hxx> #include <o3tl/deleter.hxx> #include <osl/diagnose.h> +#include <unotools/localedatawrapper.hxx> #include <unotools/transliterationwrapper.hxx> #include <comphelper/scopeguard.hxx> #include <com/sun/star/uno/Any.hxx> diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx index d71faa7c779c..1587bf315b88 100644 --- a/sw/source/core/doc/docglbl.cxx +++ b/sw/source/core/doc/docglbl.cxx @@ -18,6 +18,7 @@ */ #include <osl/diagnose.h> +#include <tools/urlobj.hxx> #include <unotools/tempfile.hxx> #include <svl/stritem.hxx> #include <svl/eitem.hxx> diff --git a/sw/source/core/text/noteurl.cxx b/sw/source/core/text/noteurl.cxx index d66736280bb5..178657f1bfaa 100644 --- a/sw/source/core/text/noteurl.cxx +++ b/sw/source/core/text/noteurl.cxx @@ -19,6 +19,7 @@ #include <noteurl.hxx> +#include <tools/mapunit.hxx> #include <vcl/imap.hxx> #include <vcl/imaprect.hxx> #include <vcl/mapmod.hxx> diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx index 1804773e6a8a..39c952b4019d 100644 --- a/sw/source/core/unocore/unomap.cxx +++ b/sw/source/core/unocore/unomap.cxx @@ -59,6 +59,7 @@ #include <editeng/memberids.h> #include <editeng/unoprnms.hxx> #include <svl/itemprop.hxx> +#include <svl/poolitem.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 db0e32baaa34..184c46aafb98 100644 --- a/sw/source/core/unocore/unomap1.cxx +++ b/sw/source/core/unocore/unomap1.cxx @@ -78,6 +78,7 @@ #include <editeng/memberids.h> #include <editeng/unoprnms.hxx> #include <svl/itemprop.hxx> +#include <svl/poolitem.hxx> #include <svx/xdef.hxx> #include "unomapproperties.hxx" diff --git a/sw/source/core/unocore/unosrch.cxx b/sw/source/core/unocore/unosrch.cxx index fb23d446afec..60cadc80a946 100644 --- a/sw/source/core/unocore/unosrch.cxx +++ b/sw/source/core/unocore/unosrch.cxx @@ -34,6 +34,7 @@ #include <cppuhelper/supportsservice.hxx> #include <svl/itemprop.hxx> #include <svl/itempool.hxx> +#include <svl/itemset.hxx> #include <memory> #include <unordered_map> diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx index fe9e4ae7887d..366f1373c855 100644 --- a/sw/source/filter/basflt/shellio.cxx +++ b/sw/source/filter/basflt/shellio.cxx @@ -21,6 +21,7 @@ #include <osl/diagnose.h> #include <tools/date.hxx> #include <tools/time.hxx> +#include <tools/urlobj.hxx> #include <svl/fstathelper.hxx> #include <unotools/moduleoptions.hxx> #include <sfx2/docfile.hxx> diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 71722bdb4324..bbad5e302d3b 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -30,6 +30,7 @@ #include <comphelper/string.hxx> #include <o3tl/safeint.hxx> #include <rtl/ustrbuf.hxx> +#include <tools/urlobj.hxx> #include <svx/svxids.hrc> #include <svx/svdotext.hxx> #if OSL_DEBUG_LEVEL > 0 diff --git a/sw/source/filter/md/swmd.cxx b/sw/source/filter/md/swmd.cxx index 8d70b76fc410..58346f778538 100644 --- a/sw/source/filter/md/swmd.cxx +++ b/sw/source/filter/md/swmd.cxx @@ -36,6 +36,7 @@ #include <hintids.hxx> #include <sfx2/docfile.hxx> #include <sfx2/sfxsids.hrc> +#include <tools/urlobj.hxx> #include <IDocumentStylePoolAccess.hxx> #include <fmtinfmt.hxx> #include <frmatr.hxx> diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx index 9175fabf6393..31bd5039ec24 100644 --- a/sw/source/filter/writer/writer.cxx +++ b/sw/source/filter/writer/writer.cxx @@ -26,6 +26,7 @@ #include <editeng/fontitem.hxx> #include <editeng/eeitem.hxx> #include <osl/diagnose.h> +#include <tools/urlobj.hxx> #include <shellio.hxx> #include <doc.hxx> #include <docary.hxx> diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 4aa10826e4a9..232751644903 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -90,6 +90,7 @@ #include <o3tl/enumarray.hxx> #include <sfx2/docfile.hxx> #include <tools/UnitConversion.hxx> +#include <tools/urlobj.hxx> #include <algorithm> diff --git a/sw/source/filter/ww8/ww8attributeoutput.hxx b/sw/source/filter/ww8/ww8attributeoutput.hxx index 113c086f7828..501959b546d7 100644 --- a/sw/source/filter/ww8/ww8attributeoutput.hxx +++ b/sw/source/filter/ww8/ww8attributeoutput.hxx @@ -24,6 +24,7 @@ #include "wrtww8.hxx" #include <editeng/boxitem.hxx> #include <sfx2/docfile.hxx> +#include <tools/urlobj.hxx> class WW8AttributeOutput : public AttributeOutputBase { diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx index 644180d429b8..618f101a6085 100644 --- a/sw/source/filter/xml/xmltexte.cxx +++ b/sw/source/filter/xml/xmltexte.cxx @@ -38,6 +38,7 @@ #include <SwAppletImpl.hxx> #include <ndindex.hxx> +#include <tools/mapunit.hxx> #include <osl/diagnose.h> #include <sot/exchange.hxx> #include <svl/urihelper.hxx> diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 2737281b850f..963bf1c87497 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -23,6 +23,7 @@ #include "addresslistdialog.hxx" #include <editeng/eeitem.hxx> #include <o3tl/safeint.hxx> +#include <tools/mapunit.hxx> #include <svl/grabbagitem.hxx> #include <svl/itemset.hxx> #include <utility> diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index 48308ea2d56a..912fa618f5a5 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <comphelper/diagnose_ex.hxx> +#include <tools/mapunit.hxx> #include <swmodule.hxx> #include <view.hxx> diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 49f133648de7..45884bff1791 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -38,6 +38,7 @@ #include <com/sun/star/ui/dialogs/XFilePicker3.hpp> #include <svtools/indexentryres.hxx> #include <toolkit/helper/vclunohelper.hxx> +#include <tools/urlobj.hxx> #include <column.hxx> #include <fmtfsize.hxx> #include <authfld.hxx> diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index fabec6e9a560..44cda711e2d7 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -32,6 +32,7 @@ #include <svl/eitem.hxx> #include <svl/stritem.hxx> #include <svl/PasswordHelper.hxx> +#include <tools/urlobj.hxx> #include <unotools/moduleoptions.hxx> #include <sfx2/bindings.hxx> #include <sfx2/docfile.hxx> diff --git a/sw/source/uibase/config/uinums.cxx b/sw/source/uibase/config/uinums.cxx index 0c701d34322e..41dcb7372ce4 100644 --- a/sw/source/uibase/config/uinums.cxx +++ b/sw/source/uibase/config/uinums.cxx @@ -24,6 +24,7 @@ #include <tools/stream.hxx> #include <sfx2/docfile.hxx> #include <svl/itemiter.hxx> +#include <tools/urlobj.hxx> #include <swtypes.hxx> #include <utility> diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 2b9b122474da..15688e313ac2 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -41,6 +41,7 @@ #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/XFilePicker3.hpp> #include <com/sun/star/beans/XPropertySet.hpp> +#include <tools/urlobj.hxx> #include <vcl/errinf.hxx> #include <vcl/print.hxx> #include <vcl/scheduler.hxx> diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx index f01c11eecd40..49b6b0312887 100644 --- a/sw/source/uibase/dbui/mailmergehelper.cxx +++ b/sw/source/uibase/dbui/mailmergehelper.cxx @@ -33,6 +33,7 @@ #include <com/sun/star/mail/XSmtpService.hpp> #include <comphelper/processfactory.hxx> #include <o3tl/safeint.hxx> +#include <rtl/ustrbuf.hxx> #include <utility> #include <vcl/event.hxx> #include <vcl/settings.hxx> diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx index 3aa49cb649b1..13e809f292a8 100644 --- a/sw/source/uibase/dochdl/gloshdl.cxx +++ b/sw/source/uibase/dochdl/gloshdl.cxx @@ -24,6 +24,7 @@ #include <sfx2/fcontnr.hxx> #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> +#include <tools/urlobj.hxx> #include <unotools/transliterationwrapper.hxx> #include <o3tl/string_view.hxx> #include <docsh.hxx> diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index 67fab7dc92cb..211e9e412812 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -29,6 +29,7 @@ #include <officecfg/Office/Common.hxx> #include <rtl/ustring.hxx> #include <sal/log.hxx> +#include <tools/mapunit.hxx> #include <vcl/commandevent.hxx> #include <vcl/event.hxx> #include <vcl/rendercontext/GetDefaultFontFlags.hxx> diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index 94ca58855700..32f883ac1925 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -25,6 +25,7 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> +#include <tools/urlobj.hxx> #include <vcl/commandevent.hxx> #include <vcl/event.hxx> #include <sot/filelist.hxx> diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx b/sw/source/uibase/wrtsh/wrtsh2.cxx index 97e9c44ad587..cb31887afbbc 100644 --- a/sw/source/uibase/wrtsh/wrtsh2.cxx +++ b/sw/source/uibase/wrtsh/wrtsh2.cxx @@ -27,6 +27,7 @@ #include <sfx2/linkmgr.hxx> #include <sfx2/viewfrm.hxx> #include <sot/exchange.hxx> +#include <tools/urlobj.hxx> #include <osl/diagnose.h> #include <o3tl/string_view.hxx> #include <fmtinfmt.hxx> diff --git a/sw/source/writerfilter/dmapper/SdtHelper.cxx b/sw/source/writerfilter/dmapper/SdtHelper.cxx index cd841ecc9e60..e4972f76a9e0 100644 --- a/sw/source/writerfilter/dmapper/SdtHelper.cxx +++ b/sw/source/writerfilter/dmapper/SdtHelper.cxx @@ -13,6 +13,7 @@ #include <com/sun/star/text/VertOrientation.hpp> #include <editeng/unoprnms.hxx> #include <sal/log.hxx> +#include <tools/mapunit.hxx> #include <utility> #include <vcl/svapp.hxx> #include <vcl/outdev.hxx> diff --git a/sw/source/writerfilter/rtftok/rtfdocumentimpl.cxx b/sw/source/writerfilter/rtftok/rtfdocumentimpl.cxx index 14c9f16a4225..21bd706f531a 100644 --- a/sw/source/writerfilter/rtftok/rtfdocumentimpl.cxx +++ b/sw/source/writerfilter/rtftok/rtfdocumentimpl.cxx @@ -45,6 +45,7 @@ #include <rtl/uri.hxx> #include <rtl/tencinfo.h> #include <sal/log.hxx> +#include <tools/mapunit.hxx> #include <osl/diagnose.h> #include <oox/helper/graphichelper.hxx> #include <vcl/wmfexternal.hxx> diff --git a/toolkit/source/controls/filectrl.cxx b/toolkit/source/controls/filectrl.cxx index 6e0e3efd4cbf..b4f0a3b058d0 100644 --- a/toolkit/source/controls/filectrl.cxx +++ b/toolkit/source/controls/filectrl.cxx @@ -25,6 +25,7 @@ #include <osl/file.h> #include <svl/svlresid.hxx> #include <svl/svl.hrc> +#include <unotools/resmgr.hxx> #include <comphelper/diagnose_ex.hxx> #include <tools/urlobj.hxx> #include <vcl/toolkit/edit.hxx> diff --git a/vcl/qa/cppunit/gen/gen.cxx b/vcl/qa/cppunit/gen/gen.cxx index 654bdb2cf1bf..48043776ff2b 100644 --- a/vcl/qa/cppunit/gen/gen.cxx +++ b/vcl/qa/cppunit/gen/gen.cxx @@ -12,6 +12,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/sfxbasemodel.hxx> +#include <tools/mapunit.hxx> #include <vcl/BitmapReadAccess.hxx> #include <vcl/gdimtf.hxx> #include <vcl/rendercontext/AntialiasingFlags.hxx> diff --git a/vcl/source/treelist/imap.cxx b/vcl/source/treelist/imap.cxx index 800b85089379..3d604110b5b1 100644 --- a/vcl/source/treelist/imap.cxx +++ b/vcl/source/treelist/imap.cxx @@ -21,6 +21,7 @@ #include <tools/urlobj.hxx> #include <tools/fract.hxx> #include <tools/GenericTypeSerializer.hxx> +#include <tools/mapunit.hxx> #include <utility> #include <vcl/outdev.hxx> #include <vcl/svapp.hxx> diff --git a/vcl/source/treelist/imap2.cxx b/vcl/source/treelist/imap2.cxx index 1ff612a7de29..bd39188d7374 100644 --- a/vcl/source/treelist/imap2.cxx +++ b/vcl/source/treelist/imap2.cxx @@ -21,6 +21,7 @@ #include <comphelper/string.hxx> #include <string.h> #include <o3tl/string_view.hxx> +#include <tools/mapunit.hxx> #include <tools/stream.hxx> #include <rtl/strbuf.hxx> #include <vcl/outdev.hxx> diff --git a/vcl/source/treelist/transfer.cxx b/vcl/source/treelist/transfer.cxx index cc6ffa960fa2..0f6c3b341843 100644 --- a/vcl/source/treelist/transfer.cxx +++ b/vcl/source/treelist/transfer.cxx @@ -27,6 +27,7 @@ #include <rtl/tencinfo.h> #include <sal/log.hxx> #include <tools/debug.hxx> +#include <tools/mapunit.hxx> #include <tools/urlobj.hxx> #include <unotools/ucbstreamhelper.hxx> #include <sot/exchange.hxx> diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index 4f2505aa2b0b..34c6c424982a 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -31,6 +31,7 @@ #include <headless/svpvd.hxx> #include <headless/svpbmp.hxx> #include <utility> +#include <unotools/localedatawrapper.hxx> #include <vcl/builder.hxx> #include <vcl/inputtypes.hxx> #include <vcl/specialchars.hxx>
