basic/qa/cppunit/test_vba.cxx | 1 + connectivity/source/drivers/hsqldb/HDriver.cxx | 1 + desktop/source/app/dispatchwatcher.cxx | 1 + desktop/source/migration/services/wordbookmigration.cxx | 1 + editeng/source/editeng/impedit5.cxx | 3 +++ editeng/source/items/frmitems.cxx | 1 + emfio/qa/cppunit/wmf/wmfimporttest.cxx | 1 + extensions/source/bibliography/bibconfig.hxx | 1 + filter/source/svg/svgexport.cxx | 1 + filter/source/svg/svgfilter.cxx | 1 + filter/source/textfilterdetect/filterdetect.cxx | 1 + filter/source/xmlfilterdetect/filterdetect.cxx | 1 + forms/source/component/imgprod.cxx | 1 + forms/source/richtext/richtextvclcontrol.cxx | 1 + framework/source/services/autorecovery.cxx | 1 + framework/source/uiconfiguration/imagemanagerimpl.cxx | 1 + framework/source/uielement/imagebuttontoolbarcontroller.cxx | 1 + hwpfilter/source/htags.cxx | 3 +++ hwpfilter/source/hwpreader.hxx | 1 + include/IwyuFilter_include.yaml | 1 + include/sfx2/objsh.hxx | 1 + include/svtools/imagemgr.hxx | 2 ++ include/test/unoapi_test.hxx | 1 + include/unotools/calendarwrapper.hxx | 5 +++-- include/unotools/charclass.hxx | 6 +++--- include/unotools/closeveto.hxx | 2 +- include/unotools/collatorwrapper.hxx | 2 +- include/unotools/configitem.hxx | 2 +- include/unotools/configmgr.hxx | 3 ++- include/unotools/confignode.hxx | 2 ++ include/unotools/configvaluecontainer.hxx | 3 ++- include/unotools/eventcfg.hxx | 3 ++- include/unotools/eventlisteneradapter.hxx | 2 +- include/unotools/lingucfg.hxx | 2 +- include/unotools/localedatawrapper.hxx | 4 ++-- include/unotools/localfilehelper.hxx | 3 ++- include/unotools/mediadescriptor.hxx | 4 +++- include/unotools/moduleoptions.hxx | 3 ++- include/unotools/nativenumberwrapper.hxx | 3 ++- include/unotools/syslocaleoptions.hxx | 2 +- include/unotools/tempfile.hxx | 5 ++++- include/unotools/ucbhelper.hxx | 2 +- include/unotools/ucbstreamhelper.hxx | 4 +++- include/unotools/viewoptions.hxx | 3 ++- oox/source/core/filterdetect.cxx | 1 + package/source/xstor/owriteablestream.cxx | 1 + package/source/xstor/selfterminatefilestream.cxx | 1 + sax/qa/cppunit/xmlimport.cxx | 1 + sc/inc/optutil.hxx | 1 + sc/source/core/data/table3.cxx | 1 + sc/source/filter/orcus/utils.cxx | 1 + sc/source/ui/cctrl/checklistmenu.cxx | 2 ++ sc/source/ui/docshell/impex.cxx | 1 + sd/source/core/CustomAnimationPreset.cxx | 1 + sd/source/core/TransitionPreset.cxx | 1 + sd/source/ui/dlg/PhotoAlbumDialog.cxx | 1 + sfx2/source/appl/sfxhelp.cxx | 1 + sfx2/source/control/thumbnailview.cxx | 1 + sfx2/source/doc/DocumentMetadataAccess.cxx | 1 + starmath/source/parse5.cxx | 1 + svgio/qa/cppunit/SvgImportTest.cxx | 1 + svgio/source/svgreader/svgswitchnode.cxx | 1 + svl/source/fsstor/fsstorage.cxx | 1 + svl/source/numbers/zformat.cxx | 1 + svtools/source/misc/embedhlp.cxx | 1 + svtools/source/misc/embedtransfer.cxx | 1 + svtools/source/misc/templatefoldercache.cxx | 1 + svx/source/core/extedit.cxx | 1 + svx/source/svdraw/svdotxln.cxx | 1 + sw/source/core/bastyp/calc.cxx | 1 + sw/source/core/text/itrform2.cxx | 1 + sw/source/uibase/docvw/edtwin.cxx | 2 ++ sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx | 1 + sw/source/writerfilter/filter/RtfFilter.cxx | 1 + sw/source/writerfilter/rtftok/rtfdocumentimpl.cxx | 1 + test/source/htmltesttools.cxx | 1 + test/source/xmltesttools.cxx | 1 + unotest/source/cpp/macros_test.cxx | 1 + unotools/source/i18n/charclass.cxx | 3 +++ unotools/source/ucbhelper/tempfile.cxx | 1 + unotools/source/ucbhelper/xtempfile.cxx | 1 + vcl/qa/cppunit/svm/svmtest.cxx | 1 + vcl/source/app/svapp.cxx | 1 + vcl/source/control/field2.cxx | 1 + vcl/source/edit/texteng.cxx | 1 + vcl/source/filter/ieps/ieps.cxx | 1 + vcl/source/fontsubset/sft.cxx | 1 + vcl/source/graphic/BinaryDataContainer.cxx | 1 + vcl/source/graphic/GraphicLoader.cxx | 1 + vcl/source/graphic/UnoGraphicDescriptor.cxx | 1 + vcl/source/graphic/UnoGraphicProvider.cxx | 1 + writerperfect/source/writer/EPUBPackage.cxx | 1 + xmloff/source/style/xmlnumfi.cxx | 3 +++ 93 files changed, 124 insertions(+), 24 deletions(-)
New commits: commit 0bdcfc290066b31dc1cb3ccdced0236d71375c39 Author: Gabor Kelemen <[email protected]> AuthorDate: Sun Jan 25 15:22:05 2026 +0100 Commit: Gabor Kelemen <[email protected]> CommitDate: Thu Feb 5 17:35:46 2026 +0100 tdf#146619 Use more forward declarations in include/unotools/ This shaves off some 40M of input Change-Id: I12e10deb87ceea1f7a23f3de4ea624befe187c3f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198238 Reviewed-by: Gabor Kelemen <[email protected]> Tested-by: Jenkins diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx index 187fda0249de..a1140999cad3 100644 --- a/basic/qa/cppunit/test_vba.cxx +++ b/basic/qa/cppunit/test_vba.cxx @@ -7,6 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "basictest.hxx" +#include <i18nlangtag/languagetag.hxx> #include <unotools/syslocaleoptions.hxx> #include <test/bootstrapfixture.hxx> diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index bb9bda20492e..93884155048c 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -37,6 +37,7 @@ #include "HTerminateListener.hxx" #include <hsqldb/HCatalog.hxx> #include <rtl/ustrbuf.hxx> +#include <tools/stream.hxx> #include <osl/file.h> #include <osl/process.h> #include <comphelper/namedvaluecollection.hxx> diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx index be3ed2d92c27..089c87ea0755 100644 --- a/desktop/source/app/dispatchwatcher.cxx +++ b/desktop/source/app/dispatchwatcher.cxx @@ -55,6 +55,7 @@ #include <comphelper/sequence.hxx> #include <comphelper/sequenceashashmap.hxx> #include <comphelper/diagnose_ex.hxx> +#include <tools/stream.hxx> #include <tools/urlobj.hxx> #include <unotools/mediadescriptor.hxx> #include <unotools/tempfile.hxx> diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx index debab6982c6b..6d3f7a3a2a69 100644 --- a/desktop/source/migration/services/wordbookmigration.cxx +++ b/desktop/source/migration/services/wordbookmigration.cxx @@ -19,6 +19,7 @@ #include "wordbookmigration.hxx" #include <cppuhelper/supportsservice.hxx> +#include <tools/stream.hxx> #include <tools/urlobj.hxx> #include <unotools/bootstrap.hxx> #include <unotools/ucbstreamhelper.hxx> diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx index 04c2007c2460..4fe70dcd902f 100644 --- a/editeng/source/editeng/impedit5.cxx +++ b/editeng/source/editeng/impedit5.cxx @@ -30,6 +30,9 @@ #include <vcl/svapp.hxx> #include <vcl/transfer.hxx> #include <vcl/window.hxx> + +#include <com/sun/star/i18n/Calendar2.hpp> + #include <utility> void ImpEditEngine::SetStyleSheetPool( SfxStyleSheetPool* pSPool ) diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 5589d1e4c458..ea924f74ffe2 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -41,6 +41,7 @@ #include <comphelper/processfactory.hxx> #include <utility> #include <vcl/GraphicObject.hxx> +#include <tools/stream.hxx> #include <tools/urlobj.hxx> #include <tools/bigint.hxx> #include <svl/memberid.h> diff --git a/emfio/qa/cppunit/wmf/wmfimporttest.cxx b/emfio/qa/cppunit/wmf/wmfimporttest.cxx index 06cfbfd58ff6..86e9967f5b7d 100644 --- a/emfio/qa/cppunit/wmf/wmfimporttest.cxx +++ b/emfio/qa/cppunit/wmf/wmfimporttest.cxx @@ -23,6 +23,7 @@ #include <test/xmltesttools.hxx> #include <test/bootstrapfixture.hxx> +#include <tools/stream.hxx> #include <vcl/gdimtf.hxx> #include <vcl/wmf.hxx> #include <mtftools.hxx> diff --git a/extensions/source/bibliography/bibconfig.hxx b/extensions/source/bibliography/bibconfig.hxx index 0d81491ff0ad..0b42997ec93d 100644 --- a/extensions/source/bibliography/bibconfig.hxx +++ b/extensions/source/bibliography/bibconfig.hxx @@ -21,6 +21,7 @@ #include <unotools/configitem.hxx> #include <tools/long.hxx> +#include <com/sun/star/uno/Sequence.hxx> #include <vector> #include <memory> diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 14f3d59057cb..53af1a182622 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -50,6 +50,7 @@ #include <i18nlangtag/lang.h> #include <svl/numformat.hxx> #include <tools/debug.hxx> +#include <tools/stream.hxx> #include <tools/urlobj.hxx> #include <unotools/streamwrap.hxx> #include <unotools/tempfile.hxx> diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx index dd395209610d..8521c58b5593 100644 --- a/filter/source/svg/svgfilter.cxx +++ b/filter/source/svg/svgfilter.cxx @@ -36,6 +36,7 @@ #include <unotools/mediadescriptor.hxx> #include <unotools/ucbstreamhelper.hxx> #include <tools/debug.hxx> +#include <tools/stream.hxx> #include <comphelper/diagnose_ex.hxx> #include <comphelper/sequenceashashmap.hxx> #include <tools/zcodec.hxx> diff --git a/filter/source/textfilterdetect/filterdetect.cxx b/filter/source/textfilterdetect/filterdetect.cxx index da606db92ffe..125a53fbc8f3 100644 --- a/filter/source/textfilterdetect/filterdetect.cxx +++ b/filter/source/textfilterdetect/filterdetect.cxx @@ -11,6 +11,7 @@ #include <comphelper/sequenceashashmap.hxx> #include <svtools/htmltokn.h> +#include <tools/stream.hxx> #include <tools/urlobj.hxx> #include <tools/zcodec.hxx> #include <ucbhelper/content.hxx> diff --git a/filter/source/xmlfilterdetect/filterdetect.cxx b/filter/source/xmlfilterdetect/filterdetect.cxx index 3c23f6e9097f..99338321fe7b 100644 --- a/filter/source/xmlfilterdetect/filterdetect.cxx +++ b/filter/source/xmlfilterdetect/filterdetect.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/beans/PropertyState.hpp> #include <cppuhelper/supportsservice.hxx> #include <comphelper/diagnose_ex.hxx> +#include <tools/stream.hxx> #include <ucbhelper/content.hxx> #include <unotools/ucbstreamhelper.hxx> #include <svl/inettype.hxx> diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx index f623dfff987e..21e5cb326141 100644 --- a/forms/source/component/imgprod.cxx +++ b/forms/source/component/imgprod.cxx @@ -21,6 +21,7 @@ #include <osl/diagnose.h> #include <tools/debug.hxx> +#include <tools/stream.hxx> #include <utility> #include <vcl/BitmapReadAccess.hxx> #include <vcl/cvtgrf.hxx> diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx index f82c5b2969e5..8f8a9cd28010 100644 --- a/forms/source/richtext/richtextvclcontrol.cxx +++ b/forms/source/richtext/richtextvclcontrol.cxx @@ -30,6 +30,7 @@ #include <editeng/editview.hxx> #include <editeng/editids.hrc> #include <svx/svxids.hrc> +#include <tools/stream.hxx> #include <osl/diagnose.h> #include <vcl/event.hxx> diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 5c17c4bde102..b35cfe226019 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -99,6 +99,7 @@ #include <unotools/bootstrap.hxx> #include <unotools/configmgr.hxx> #include <svl/documentlockfile.hxx> +#include <tools/stream.hxx> #include <tools/urlobj.hxx> #include <officecfg/Office/Common.hxx> #include <officecfg/Office/Recovery.hxx> diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index d6a61bc3e59c..ec164e416a77 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -37,6 +37,7 @@ #include <com/sun/star/io/IOException.hpp> #include <com/sun/star/io/XStream.hpp> #include <com/sun/star/ui/ImageType.hpp> +#include <tools/stream.hxx> #include <vcl/bitmap.hxx> #include <vcl/graph.hxx> #include <vcl/svapp.hxx> diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx index 40e3d230604e..653038d35825 100644 --- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx @@ -25,6 +25,7 @@ #include <comphelper/getexpandeduri.hxx> #include <comphelper/processfactory.hxx> +#include <tools/stream.hxx> #include <unotools/ucbstreamhelper.hxx> #include <vcl/svapp.hxx> #include <vcl/graph.hxx> diff --git a/hwpfilter/source/htags.cxx b/hwpfilter/source/htags.cxx index 69d0398ca952..08502a54f5be 100644 --- a/hwpfilter/source/htags.cxx +++ b/hwpfilter/source/htags.cxx @@ -19,8 +19,11 @@ #include "precompile.h" +#ifdef _WIN32 #include <o3tl/char16_t2wchar_t.hxx> +#include <tools/stream.hxx> #include <unotools/tempfile.hxx> +#endif #include <string.h> diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx index 4638ffb5aa57..1d24f0f8be85 100644 --- a/hwpfilter/source/hwpreader.hxx +++ b/hwpfilter/source/hwpreader.hxx @@ -25,6 +25,7 @@ #include <stdio.h> #include <string.h> +#include <rtl/ref.hxx> #include <rtl/ustring.hxx> #include <sal/alloca.h> diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml index 43d45de66879..3627bd2b997e 100644 --- a/include/IwyuFilter_include.yaml +++ b/include/IwyuFilter_include.yaml @@ -324,6 +324,7 @@ excludelist: - com/sun/star/ucb/XProgressHandler.hpp include/unotools/streamwrap.hxx: # base class has to be a complete type + - com/sun/star/io/XInputStream.hpp - com/sun/star/io/XOutputStream.hpp - com/sun/star/io/XStream.hpp - com/sun/star/io/XTruncate.hpp diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 4ac904592333..be583e556194 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -34,6 +34,7 @@ #include <sot/object.hxx> #include <tools/gen.hxx> #include <tools/link.hxx> +#include <tools/stream.hxx> #include <sfx2/shell.hxx> #include <comphelper/embeddedobjectcontainer.hxx> diff --git a/include/svtools/imagemgr.hxx b/include/svtools/imagemgr.hxx index 332998ed6c59..0b2425c24b8d 100644 --- a/include/svtools/imagemgr.hxx +++ b/include/svtools/imagemgr.hxx @@ -24,6 +24,8 @@ #include <unotools/ucbhelper.hxx> #include <vcl/vclenum.hxx> +#include <com/sun/star/uno/Reference.hxx> + enum class SvImageId { NONE = 0, START = 3076, // must match to old Id's in SFX! diff --git a/include/test/unoapi_test.hxx b/include/test/unoapi_test.hxx index f366555db3f6..ab93c3043980 100644 --- a/include/test/unoapi_test.hxx +++ b/include/test/unoapi_test.hxx @@ -17,6 +17,7 @@ #include <rtl/ref.hxx> #include <test/bootstrapfixture.hxx> #include <test/testinteractionhandler.hxx> +#include <tools/stream.hxx> #include <unotest/macros_test.hxx> #include <com/sun/star/lang/XComponent.hpp> #include <unotools/tempfile.hxx> diff --git a/include/unotools/calendarwrapper.hxx b/include/unotools/calendarwrapper.hxx index ac1125d2fc66..d6dbc4dd6ab1 100644 --- a/include/unotools/calendarwrapper.hxx +++ b/include/unotools/calendarwrapper.hxx @@ -22,13 +22,14 @@ #include <tools/datetime.hxx> #include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/i18n/Calendar2.hpp> #include <unotools/unotoolsdllapi.h> namespace com::sun::star::uno { class XComponentContext; } namespace com::sun::star::i18n { class XCalendar4; } +namespace com::sun::star::i18n { struct Calendar2; } +namespace com::sun::star::i18n { struct CalendarItem2; } namespace com::sun::star::lang { struct Locale; } +namespace com::sun::star::uno { template <class E> class Sequence; } class UNOTOOLS_DLLPUBLIC CalendarWrapper { diff --git a/include/unotools/charclass.hxx b/include/unotools/charclass.hxx index 561cdc09c22a..00fb7b80e028 100644 --- a/include/unotools/charclass.hxx +++ b/include/unotools/charclass.hxx @@ -22,14 +22,14 @@ #include <unotools/unotoolsdllapi.h> #include <i18nlangtag/languagetag.hxx> -#include <com/sun/star/i18n/DirectionProperty.hpp> #include <com/sun/star/i18n/KCharacterType.hpp> -#include <com/sun/star/i18n/ParseResult.hpp> -#include <com/sun/star/i18n/UnicodeScript.hpp> #include <com/sun/star/uno/Reference.hxx> namespace com::sun::star::uno { class XComponentContext; } namespace com::sun::star::i18n { class XCharacterClassification; } +namespace com::sun::star::i18n { enum class DirectionProperty; } +namespace com::sun::star::i18n { enum class UnicodeScript; } +namespace com::sun::star::i18n { struct ParseResult; } inline constexpr sal_Int32 nCharClassAlphaType = css::i18n::KCharacterType::UPPER | diff --git a/include/unotools/closeveto.hxx b/include/unotools/closeveto.hxx index bcc56766fb1d..58cd654ec711 100644 --- a/include/unotools/closeveto.hxx +++ b/include/unotools/closeveto.hxx @@ -21,9 +21,9 @@ #define INCLUDED_UNOTOOLS_CLOSEVETO_HXX #include <unotools/unotoolsdllapi.h> -#include <com/sun/star/uno/Reference.hxx> #include <memory> +namespace com::sun::star::uno { template <class interface_type> class Reference; } namespace com::sun::star::uno { class XInterface; } namespace utl diff --git a/include/unotools/collatorwrapper.hxx b/include/unotools/collatorwrapper.hxx index 595d9ccf4f41..87081b675807 100644 --- a/include/unotools/collatorwrapper.hxx +++ b/include/unotools/collatorwrapper.hxx @@ -22,12 +22,12 @@ #include <unotools/unotoolsdllapi.h> #include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/uno/Sequence.hxx> namespace com::sun::star::uno { class XComponentContext; } +namespace com::sun::star::uno { template <class E> class Sequence; } namespace com::sun::star::i18n { class XCollator; } namespace com::sun::star::lang { struct Locale; } diff --git a/include/unotools/configitem.hxx b/include/unotools/configitem.hxx index f2587ac97797..b16a91952f38 100644 --- a/include/unotools/configitem.hxx +++ b/include/unotools/configitem.hxx @@ -23,7 +23,6 @@ #include <sal/types.h> #include <rtl/ref.hxx> #include <rtl/ustring.hxx> -#include <com/sun/star/uno/Sequence.h> #include <com/sun/star/uno/Reference.h> #include <unotools/unotoolsdllapi.h> #include <unotools/options.hxx> @@ -32,6 +31,7 @@ namespace com::sun::star { namespace uno{ class Any; + template <class E> class Sequence; } namespace beans{ struct PropertyValue; diff --git a/include/unotools/configmgr.hxx b/include/unotools/configmgr.hxx index d439a05d0362..c889b943332b 100644 --- a/include/unotools/configmgr.hxx +++ b/include/unotools/configmgr.hxx @@ -25,7 +25,7 @@ #include <string_view> #include <vector> -#include <com/sun/star/uno/Reference.hxx> +#include <rtl/ustring.hxx> #include <sal/types.h> #include <unotools/unotoolsdllapi.h> @@ -33,6 +33,7 @@ namespace com::sun::star::container { class XHierarchicalNameAccess; } namespace utl { class ConfigItem; } +namespace com::sun::star::uno { template <class interface_type> class Reference; } namespace utl { diff --git a/include/unotools/confignode.hxx b/include/unotools/confignode.hxx index b38e3306ef74..c3ad98f626dd 100644 --- a/include/unotools/confignode.hxx +++ b/include/unotools/confignode.hxx @@ -22,6 +22,8 @@ #include <unotools/unotoolsdllapi.h> #include <unotools/eventlisteneradapter.hxx> +#include <com/sun/star/uno/Reference.hxx> + namespace com::sun::star::container { class XHierarchicalNameAccess; } namespace com::sun::star::container { class XNameAccess; } namespace com::sun::star::container { class XNameContainer; } diff --git a/include/unotools/configvaluecontainer.hxx b/include/unotools/configvaluecontainer.hxx index 3ac73f85f056..aa6b14534f4c 100644 --- a/include/unotools/configvaluecontainer.hxx +++ b/include/unotools/configvaluecontainer.hxx @@ -20,13 +20,14 @@ #define INCLUDED_UNOTOOLS_CONFIGVALUECONTAINER_HXX #include <config_options.h> +#include <rtl/ustring.hxx> #include <unotools/unotoolsdllapi.h> -#include <com/sun/star/uno/Type.hxx> #include <memory> #include <mutex> namespace com::sun::star::uno { template <typename > class Reference; } +namespace com::sun::star::uno { class Type; } namespace com::sun::star::uno { class XComponentContext; } namespace utl diff --git a/include/unotools/eventcfg.hxx b/include/unotools/eventcfg.hxx index 1acbeb7bba6f..e79741034d26 100644 --- a/include/unotools/eventcfg.hxx +++ b/include/unotools/eventcfg.hxx @@ -20,11 +20,12 @@ #define INCLUDED_UNOTOOLS_EVENTCFG_HXX #include <unotools/unotoolsdllapi.h> -#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/document/XEventsSupplier.hpp> #include <com/sun/star/container/XNameReplace.hpp> #include <cppuhelper/implbase.hxx> +namespace com::sun::star::beans { struct PropertyValue; } + enum class GlobalEventId { STARTAPP, diff --git a/include/unotools/eventlisteneradapter.hxx b/include/unotools/eventlisteneradapter.hxx index f3d9ede9cd45..7381f578d3c1 100644 --- a/include/unotools/eventlisteneradapter.hxx +++ b/include/unotools/eventlisteneradapter.hxx @@ -21,11 +21,11 @@ #define INCLUDED_UNOTOOLS_EVENTLISTENERADAPTER_HXX #include <unotools/unotoolsdllapi.h> -#include <com/sun/star/lang/EventObject.hpp> #include <memory> namespace com::sun::star::uno { template <typename > class Reference; } namespace com::sun::star::lang { class XComponent; } +namespace com::sun::star::lang { struct EventObject; } namespace utl { diff --git a/include/unotools/lingucfg.hxx b/include/unotools/lingucfg.hxx index 2256daa24964..3371040ce0bc 100644 --- a/include/unotools/lingucfg.hxx +++ b/include/unotools/lingucfg.hxx @@ -22,7 +22,6 @@ #include <unotools/unotoolsdllapi.h> #include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/uno/Any.h> #include <rtl/ustring.hxx> #include <unotools/options.hxx> #include <i18nlangtag/lang.h> @@ -30,6 +29,7 @@ namespace com::sun::star::beans { struct PropertyValue; } namespace com::sun::star::util { class XChangesBatch; } +namespace com::sun::star::uno { class Any; } class SvtLinguConfigItem; diff --git a/include/unotools/localedatawrapper.hxx b/include/unotools/localedatawrapper.hxx index 9125a7e2716b..c667691d7d56 100644 --- a/include/unotools/localedatawrapper.hxx +++ b/include/unotools/localedatawrapper.hxx @@ -24,8 +24,6 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/i18n/LocaleItem.hpp> #include <com/sun/star/i18n/LocaleDataItem2.hpp> -#include <com/sun/star/i18n/LanguageCountryInfo.hpp> -#include <com/sun/star/i18n/ForbiddenCharacters.hpp> #include <com/sun/star/i18n/reservedWords.hpp> #include <rtl/ustring.hxx> #include <rtl/math.h> @@ -38,8 +36,10 @@ namespace com::sun::star::uno { class XComponentContext; } namespace com::sun::star::i18n { class XLocaleData5; } namespace com::sun::star::i18n { struct Calendar2; } namespace com::sun::star::i18n { struct Currency2; } +namespace com::sun::star::i18n { struct ForbiddenCharacters; } namespace com::sun::star::i18n { struct FormatElement; } namespace com::sun::star::i18n { struct CalendarItem2; } +namespace com::sun::star::i18n { struct LanguageCountryInfo; } class Date; namespace tools diff --git a/include/unotools/localfilehelper.hxx b/include/unotools/localfilehelper.hxx index c23ffde15227..5ab1d39ed3b4 100644 --- a/include/unotools/localfilehelper.hxx +++ b/include/unotools/localfilehelper.hxx @@ -20,11 +20,12 @@ #define INCLUDED_UNOTOOLS_LOCALFILEHELPER_HXX #include <config_options.h> -#include <com/sun/star/uno/Sequence.hxx> #include <unotools/unotoolsdllapi.h> #include <rtl/ustring.hxx> +namespace com::sun::star::uno { template <typename> class Sequence; } + namespace utl { class UNLESS_MERGELIBS_MORE(UNOTOOLS_DLLPUBLIC) LocalFileHelper diff --git a/include/unotools/mediadescriptor.hxx b/include/unotools/mediadescriptor.hxx index e9b36a33a94a..ca19a7482107 100644 --- a/include/unotools/mediadescriptor.hxx +++ b/include/unotools/mediadescriptor.hxx @@ -24,7 +24,6 @@ #include <vector> -#include <comphelper/docpasswordrequest.hxx> #include <rtl/ustring.hxx> #include <unotools/unotoolsdllapi.h> @@ -34,7 +33,10 @@ namespace com::sun::star::io { namespace com::sun::star::beans { struct NamedValue; } +namespace com::sun::star::uno { class Any; } +namespace com::sun::star::uno { template <class E> class Sequence; } namespace comphelper { class IDocPasswordVerifier; class SequenceAsHashMap; } +namespace comphelper { enum class DocPasswordRequestType; } namespace utl::MediaDescriptor { diff --git a/include/unotools/moduleoptions.hxx b/include/unotools/moduleoptions.hxx index 1599473faa02..0756b1fe33c6 100644 --- a/include/unotools/moduleoptions.hxx +++ b/include/unotools/moduleoptions.hxx @@ -21,7 +21,6 @@ #define INCLUDED_UNOTOOLS_MODULEOPTIONS_HXX #include <unotools/unotoolsdllapi.h> -#include <com/sun/star/uno/Sequence.hxx> #include <rtl/ustring.hxx> #include <sal/types.h> #include <unotools/options.hxx> @@ -29,6 +28,8 @@ namespace com::sun::star::frame { class XModel; } namespace com::sun::star::beans { struct PropertyValue; } +namespace com::sun::star::uno { template <class interface_type> class Reference; } +namespace com::sun::star::uno { template <typename> class Sequence; } /*-************************************************************************************************************ @short forward declaration to our private date container implementation diff --git a/include/unotools/nativenumberwrapper.hxx b/include/unotools/nativenumberwrapper.hxx index 9f632f1f69fe..f3390509ec2c 100644 --- a/include/unotools/nativenumberwrapper.hxx +++ b/include/unotools/nativenumberwrapper.hxx @@ -22,11 +22,12 @@ #include <config_options.h> #include <unotools/unotoolsdllapi.h> -#include <com/sun/star/i18n/NativeNumberXmlAttributes.hpp> #include <com/sun/star/uno/Reference.hxx> namespace com::sun::star::uno { class XComponentContext; } namespace com::sun::star::i18n { class XNativeNumberSupplier2; } +namespace com::sun::star::i18n { struct NativeNumberXmlAttributes; } +namespace com::sun::star::lang { struct Locale; } class UNLESS_MERGELIBS(UNOTOOLS_DLLPUBLIC) NativeNumberWrapper { diff --git a/include/unotools/syslocaleoptions.hxx b/include/unotools/syslocaleoptions.hxx index c0fab39a76c6..935365b28ae4 100644 --- a/include/unotools/syslocaleoptions.hxx +++ b/include/unotools/syslocaleoptions.hxx @@ -24,10 +24,10 @@ #include <sal/types.h> #include <rtl/ustring.hxx> #include <i18nlangtag/lang.h> -#include <i18nlangtag/languagetag.hxx> #include <unotools/options.hxx> class SvtSysLocaleOptions_Impl; +class LanguageTag; class LinkParamNone; template <typename Arg, typename Ret> class Link; diff --git a/include/unotools/tempfile.hxx b/include/unotools/tempfile.hxx index fd257d359565..84812cb9eedd 100644 --- a/include/unotools/tempfile.hxx +++ b/include/unotools/tempfile.hxx @@ -26,11 +26,14 @@ #include <com/sun/star/io/XTruncate.hpp> #include <comphelper/bytereader.hxx> #include <cppuhelper/implbase.hxx> -#include <tools/stream.hxx> #include <memory> #include <mutex> #include <optional> +class SvFileStream; +class SvStream; +enum class StreamMode; + namespace utl { diff --git a/include/unotools/ucbhelper.hxx b/include/unotools/ucbhelper.hxx index 76168e1f77d9..afe019443133 100644 --- a/include/unotools/ucbhelper.hxx +++ b/include/unotools/ucbhelper.hxx @@ -24,11 +24,11 @@ #include <unotools/unotoolsdllapi.h> #include <rtl/ustring.hxx> -#include <com/sun/star/uno/Reference.hxx> namespace com::sun::star { namespace uno { class Any; + template <class interface_type> class Reference; class XComponentContext; } namespace ucb{ diff --git a/include/unotools/ucbstreamhelper.hxx b/include/unotools/ucbstreamhelper.hxx index 6ad96621c8e9..8965a4a5c96c 100644 --- a/include/unotools/ucbstreamhelper.hxx +++ b/include/unotools/ucbstreamhelper.hxx @@ -23,9 +23,11 @@ #include <unotools/unotoolsdllapi.h> -#include <tools/stream.hxx> #include <memory> +class SvStream; +enum class StreamMode; + namespace com::sun::star::io { class XStream; diff --git a/include/unotools/viewoptions.hxx b/include/unotools/viewoptions.hxx index 73c928efab69..68865730b118 100644 --- a/include/unotools/viewoptions.hxx +++ b/include/unotools/viewoptions.hxx @@ -20,12 +20,13 @@ #define INCLUDED_UNOTOOLS_VIEWOPTIONS_HXX #include <unotools/unotoolsdllapi.h> -#include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/uno/Reference.hxx> #include <sal/types.h> #include <rtl/ustring.hxx> namespace com::sun::star::beans { struct NamedValue; } namespace com::sun::star::container { class XNameAccess; } +namespace com::sun::star::uno { template <typename> class Sequence; } /*-************************************************************************************************************ @descr Use these enum values to specify right list in configuration in which your view data are saved. diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx index 2a597b4e2c63..45c4cb06fe88 100644 --- a/oox/source/core/filterdetect.cxx +++ b/oox/source/core/filterdetect.cxx @@ -37,6 +37,7 @@ #include <com/sun/star/uri/UriReferenceFactory.hpp> #include <com/sun/star/beans/NamedValue.hpp> +#include <comphelper/docpasswordrequest.hxx> #include <o3tl/string_view.hxx> #include <utility> diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx index b8013e96f745..b9dbba968554 100644 --- a/package/source/xstor/owriteablestream.cxx +++ b/package/source/xstor/owriteablestream.cxx @@ -41,6 +41,7 @@ #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/exc_hlp.hxx> #include <osl/diagnose.h> +#include <tools/stream.hxx> #include <comphelper/memorystream.hxx> #include <comphelper/processfactory.hxx> diff --git a/package/source/xstor/selfterminatefilestream.cxx b/package/source/xstor/selfterminatefilestream.cxx index 80d21dd3bee5..6359a6652ae4 100644 --- a/package/source/xstor/selfterminatefilestream.cxx +++ b/package/source/xstor/selfterminatefilestream.cxx @@ -21,6 +21,7 @@ #include "selfterminatefilestream.hxx" #include <comphelper/processfactory.hxx> +#include <tools/stream.hxx> #include <unotools/streamwrap.hxx> using namespace ::com::sun::star; diff --git a/sax/qa/cppunit/xmlimport.cxx b/sax/qa/cppunit/xmlimport.cxx index a23c34761018..d71cbb480984 100644 --- a/sax/qa/cppunit/xmlimport.cxx +++ b/sax/qa/cppunit/xmlimport.cxx @@ -34,6 +34,7 @@ #include <com/sun/star/xml/sax/FastToken.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <osl/file.hxx> +#include <tools/stream.hxx> #include <unotools/ucbstreamhelper.hxx> #include <unotools/streamwrap.hxx> #include <sax/fastattribs.hxx> diff --git a/sc/inc/optutil.hxx b/sc/inc/optutil.hxx index 8f31df90517b..57fbe04f2d53 100644 --- a/sc/inc/optutil.hxx +++ b/sc/inc/optutil.hxx @@ -21,6 +21,7 @@ #include <unotools/configitem.hxx> #include <tools/link.hxx> +#include <com/sun/star/uno/Sequence.hxx> #include "scdllapi.h" class ScOptionsUtil diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index 754ad9050e69..1cfeaef2ed62 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -27,6 +27,7 @@ #include <stdlib.h> #include <com/sun/star/i18n/KParseTokens.hpp> #include <com/sun/star/i18n/KParseType.hpp> +#include <com/sun/star/i18n/ParseResult.hpp> #include <sal/log.hxx> #include <osl/diagnose.h> #include <i18nlangtag/languagetag.hxx> diff --git a/sc/source/filter/orcus/utils.cxx b/sc/source/filter/orcus/utils.cxx index 89846684bc75..c64d5a6778d1 100644 --- a/sc/source/filter/orcus/utils.cxx +++ b/sc/source/filter/orcus/utils.cxx @@ -7,6 +7,7 @@ #include <orcus_utils.hxx> #include <osl/thread.hxx> +#include <tools/stream.hxx> orcus::file_content toFileContent(const OUString& rPath) { diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 9528000fa9c8..e942aa0f520b 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -36,6 +36,8 @@ #include <tools/json_writer.hxx> #include <svl/numformat.hxx> +#include <com/sun/star/i18n/Calendar2.hpp> + #include <document.hxx> #include <viewdata.hxx> diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 3ca7612ba25f..75abfc64fc8a 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -23,6 +23,7 @@ #include <sot/formats.hxx> #include <sfx2/mieclip.hxx> #include <com/sun/star/i18n/CalendarFieldIndex.hpp> +#include <com/sun/star/i18n/Calendar2.hpp> #include <sal/log.hxx> #include <unotools/charclass.hxx> #include <osl/module.hxx> diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx index cb4656a6b5f8..a1bd5177b98f 100644 --- a/sd/source/core/CustomAnimationPreset.cxx +++ b/sd/source/core/CustomAnimationPreset.cxx @@ -33,6 +33,7 @@ #include <comphelper/propertysequence.hxx> #include <comphelper/random.hxx> #include <comphelper/lok.hxx> +#include <i18nlangtag/languagetag.hxx> #include <unotools/syslocaleoptions.hxx> #include <tools/stream.hxx> #include <comphelper/diagnose_ex.hxx> diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx index 4bb2f7fffbee..696f86694baa 100644 --- a/sd/source/core/TransitionPreset.cxx +++ b/sd/source/core/TransitionPreset.cxx @@ -32,6 +32,7 @@ #include <comphelper/processfactory.hxx> #include <comphelper/propertysequence.hxx> #include <comphelper/lok.hxx> +#include <i18nlangtag/languagetag.hxx> #include <unotools/syslocaleoptions.hxx> #include <officecfg/Office/Impress.hxx> #include <officecfg/Office/UI/Effects.hxx> diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx index 4cbfe0b59823..ac4f81914619 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx @@ -16,6 +16,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <sfx2/filedlghelper.hxx> +#include <tools/stream.hxx> #include <tools/urlobj.hxx> #include <unotools/ucbstreamhelper.hxx> diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 7f9cd7c884da..55debb5a56df 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -47,6 +47,7 @@ #include <com/sun/star/frame/ModuleManager.hpp> #include <unotools/configmgr.hxx> #include <unotools/moduleoptions.hxx> +#include <tools/stream.hxx> #include <tools/urlobj.hxx> #include <ucbhelper/content.hxx> #include <unotools/pathoptions.hxx> diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index b514042cc4ad..07069a624ac0 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -30,6 +30,7 @@ #include <rtl/ustring.hxx> #include <sal/log.hxx> #include <svtools/optionsdrawinglayer.hxx> +#include <tools/stream.hxx> #include <comphelper/diagnose_ex.hxx> #include <unotools/ucbstreamhelper.hxx> #include <vcl/svapp.hxx> diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx index 5bcc00cdafc5..d84a2f26b964 100644 --- a/sfx2/source/doc/DocumentMetadataAccess.cxx +++ b/sfx2/source/doc/DocumentMetadataAccess.cxx @@ -36,6 +36,7 @@ #include <com/sun/star/rdf/URI.hpp> #include <com/sun/star/rdf/Repository.hpp> +#include <rtl/ref.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/uri.hxx> #include <rtl/bootstrap.hxx> diff --git a/starmath/source/parse5.cxx b/starmath/source/parse5.cxx index 76ae2b91d499..fda3d6e0c289 100644 --- a/starmath/source/parse5.cxx +++ b/starmath/source/parse5.cxx @@ -20,6 +20,7 @@ #include <com/sun/star/i18n/UnicodeType.hpp> #include <com/sun/star/i18n/KParseTokens.hpp> #include <com/sun/star/i18n/KParseType.hpp> +#include <com/sun/star/i18n/ParseResult.hpp> #include <i18nlangtag/lang.h> #include <tools/lineend.hxx> #include <comphelper/configuration.hxx> diff --git a/svgio/qa/cppunit/SvgImportTest.cxx b/svgio/qa/cppunit/SvgImportTest.cxx index fecad9645f5c..8c3e39afe733 100644 --- a/svgio/qa/cppunit/SvgImportTest.cxx +++ b/svgio/qa/cppunit/SvgImportTest.cxx @@ -15,6 +15,7 @@ #include <comphelper/seqstream.hxx> #include <comphelper/string.hxx> +#include <tools/stream.hxx> #include <com/sun/star/graphic/SvgTools.hpp> #include <com/sun/star/graphic/XPrimitive2D.hpp> diff --git a/svgio/source/svgreader/svgswitchnode.cxx b/svgio/source/svgreader/svgswitchnode.cxx index 94479695aeed..f89685832c0a 100644 --- a/svgio/source/svgreader/svgswitchnode.cxx +++ b/svgio/source/svgreader/svgswitchnode.cxx @@ -20,6 +20,7 @@ #include <svgswitchnode.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <drawinglayer/primitive2d/transformprimitive2d.hxx> +#include <i18nlangtag/languagetag.hxx> #include <unotools/syslocaleoptions.hxx> namespace svgio::svgreader diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx index d1de291d2efc..83ee090c6f03 100644 --- a/svl/source/fsstor/fsstorage.cxx +++ b/svl/source/fsstor/fsstorage.cxx @@ -44,6 +44,7 @@ #include <cppuhelper/exc_hlp.hxx> #include <osl/diagnose.h> +#include <tools/stream.hxx> #include <tools/urlobj.hxx> #include <unotools/ucbhelper.hxx> #include <unotools/ucbstreamhelper.hxx> diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index d8246b655963..2443bcff52cc 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -35,6 +35,7 @@ #include <com/sun/star/i18n/CalendarFieldIndex.hpp> #include <com/sun/star/i18n/CalendarDisplayIndex.hpp> #include <com/sun/star/i18n/CalendarDisplayCode.hpp> +#include <com/sun/star/i18n/Calendar2.hpp> #include <com/sun/star/i18n/AmPmValue.hpp> #include <com/sun/star/i18n/NativeNumberMode.hpp> #include <com/sun/star/i18n/NativeNumberXmlAttributes2.hpp> diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index c166224bd6d6..3054e3c38809 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -41,6 +41,7 @@ #include <com/sun/star/chart2/XChartTypeContainer.hpp> #include <com/sun/star/chart2/XChartType.hpp> #include <tools/globname.hxx> +#include <tools/stream.hxx> #include <comphelper/classids.hxx> #include <com/sun/star/util/CloseVetoException.hpp> #include <com/sun/star/util/XModifyListener.hpp> diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx index 6c462857d48c..6fd12431cbaf 100644 --- a/svtools/source/misc/embedtransfer.cxx +++ b/svtools/source/misc/embedtransfer.cxx @@ -26,6 +26,7 @@ #include <sot/exchange.hxx> #include <svtools/embedtransfer.hxx> #include <tools/mapunit.hxx> +#include <tools/stream.hxx> #include <vcl/outdev.hxx> #include <vcl/filter/SvmWriter.hxx> #include <vcl/gdimtf.hxx> diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index 9773e43b5bc8..1b5d2c661cc1 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -33,6 +33,7 @@ #include <osl/diagnose.h> #include <rtl/ref.hxx> #include <salhelper/simplereferenceobject.hxx> +#include <tools/stream.hxx> #include <tools/time.hxx> #include <tools/urlobj.hxx> #include <tools/debug.hxx> diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx index 693e81330d49..271e17974bbc 100644 --- a/svx/source/core/extedit.cxx +++ b/svx/source/core/extedit.cxx @@ -21,6 +21,7 @@ #include <svx/fmview.hxx> #include <salhelper/thread.hxx> #include <sal/log.hxx> +#include <tools/stream.hxx> #include <osl/file.hxx> #include <svtools/filechangedchecker.hxx> #include <comphelper/diagnose_ex.hxx> diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index 4706cbe96a23..6b07cf15552e 100644 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -32,6 +32,7 @@ #include <sfx2/linkmgr.hxx> #include <tools/urlobj.hxx> #include <tools/debug.hxx> +#include <tools/stream.hxx> #include <tools/tenccvt.hxx> #include <memory> diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx index 170b5aa2561d..d81880b18833 100644 --- a/sw/source/core/bastyp/calc.cxx +++ b/sw/source/core/bastyp/calc.cxx @@ -52,6 +52,7 @@ #include <viewsh.hxx> #include <com/sun/star/i18n/KParseTokens.hpp> #include <com/sun/star/i18n/KParseType.hpp> +#include <com/sun/star/i18n/ParseResult.hpp> using namespace ::com::sun::star; diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index 1178d47116aa..cca47ce36a9a 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -63,6 +63,7 @@ #include <unocrsrhelper.hxx> #include <textcontentcontrol.hxx> #include <EnhancedPDFExportHelper.hxx> +#include <com/sun/star/i18n/UnicodeScript.hpp> #include <com/sun/star/rdf/Statement.hpp> #include <com/sun/star/rdf/URI.hpp> #include <com/sun/star/rdf/URIs.hpp> diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 955f3b8b2cbf..90b8f5ebb73f 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -25,6 +25,8 @@ #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/awt/PopupMenuDirection.hpp> #include <com/sun/star/awt/XPopupMenu.hpp> +#include <com/sun/star/i18n/Calendar2.hpp> +#include <com/sun/star/i18n/XBreakIterator.hpp> #include <com/sun/star/i18n/ScriptType.hpp> #include <com/sun/star/i18n/InputSequenceCheckMode.hpp> #include <com/sun/star/i18n/UnicodeScript.hpp> diff --git a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx index 79cec92745dd..b316163e8694 100644 --- a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx +++ b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx @@ -101,6 +101,7 @@ #include <utility> #include <xmloff/odffields.hxx> #include <rtl/uri.hxx> +#include <tools/stream.hxx> #include <tools/UnitConversion.hxx> #include <unotools/ucbstreamhelper.hxx> #include <unotools/streamwrap.hxx> diff --git a/sw/source/writerfilter/filter/RtfFilter.cxx b/sw/source/writerfilter/filter/RtfFilter.cxx index 88a3342ec8b9..d94a0e7b17d7 100644 --- a/sw/source/writerfilter/filter/RtfFilter.cxx +++ b/sw/source/writerfilter/filter/RtfFilter.cxx @@ -31,6 +31,7 @@ #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/supportsservice.hxx> #include <osl/file.hxx> +#include <tools/stream.hxx> #include <comphelper/diagnose_ex.hxx> #include <unotools/mediadescriptor.hxx> #include <unotools/streamwrap.hxx> diff --git a/sw/source/writerfilter/rtftok/rtfdocumentimpl.cxx b/sw/source/writerfilter/rtftok/rtfdocumentimpl.cxx index 21bd706f531a..7cd8d0ce6629 100644 --- a/sw/source/writerfilter/rtftok/rtfdocumentimpl.cxx +++ b/sw/source/writerfilter/rtftok/rtfdocumentimpl.cxx @@ -46,6 +46,7 @@ #include <rtl/tencinfo.h> #include <sal/log.hxx> #include <tools/mapunit.hxx> +#include <tools/stream.hxx> #include <osl/diagnose.h> #include <oox/helper/graphichelper.hxx> #include <vcl/wmfexternal.hxx> diff --git a/test/source/htmltesttools.cxx b/test/source/htmltesttools.cxx index 8ea3a562a5b5..1928b6d22eec 100644 --- a/test/source/htmltesttools.cxx +++ b/test/source/htmltesttools.cxx @@ -8,6 +8,7 @@ */ #include <test/htmltesttools.hxx> +#include <tools/stream.hxx> #include <sal/log.hxx> #include <libxml/HTMLparser.h> diff --git a/test/source/xmltesttools.cxx b/test/source/xmltesttools.cxx index d9c2405724e6..4a88999d3e10 100644 --- a/test/source/xmltesttools.cxx +++ b/test/source/xmltesttools.cxx @@ -13,6 +13,7 @@ #include <vcl/mtfxmldump.hxx> #include <sal/log.hxx> +#include <tools/stream.hxx> #include <test/cppunitasserthelper.hxx> #include <libxml/xpathInternals.h> diff --git a/unotest/source/cpp/macros_test.cxx b/unotest/source/cpp/macros_test.cxx index e75433d4d83b..e11d08079f25 100644 --- a/unotest/source/cpp/macros_test.cxx +++ b/unotest/source/cpp/macros_test.cxx @@ -31,6 +31,7 @@ #include <osl/process.h> #include <osl/thread.h> #include <tools/datetime.hxx> +#include <tools/stream.hxx> #include <unotools/tempfile.hxx> #include <unotools/ucbstreamhelper.hxx> #include <vcl/scheduler.hxx> diff --git a/unotools/source/i18n/charclass.cxx b/unotools/source/i18n/charclass.cxx index da66b0fa59d2..ec761a91354d 100644 --- a/unotools/source/i18n/charclass.cxx +++ b/unotools/source/i18n/charclass.cxx @@ -23,6 +23,9 @@ #include <comphelper/diagnose_ex.hxx> #include <com/sun/star/i18n/CharacterClassification.hpp> +#include <com/sun/star/i18n/DirectionProperty.hpp> +#include <com/sun/star/i18n/ParseResult.hpp> +#include <com/sun/star/i18n/UnicodeScript.hpp> #include <utility> using namespace ::com::sun::star; diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx index 7862bc5f934d..739572ef75e2 100644 --- a/unotools/source/ucbhelper/tempfile.cxx +++ b/unotools/source/ucbhelper/tempfile.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <unotools/tempfile.hxx> #include <rtl/ustring.hxx> +#include <tools/stream.hxx> #include <o3tl/safeint.hxx> #include <o3tl/char16_t2wchar_t.hxx> #include <osl/mutex.hxx> diff --git a/unotools/source/ucbhelper/xtempfile.cxx b/unotools/source/ucbhelper/xtempfile.cxx index 7e27b7f4d24f..c8fd9d1d1e35 100644 --- a/unotools/source/ucbhelper/xtempfile.cxx +++ b/unotools/source/ucbhelper/xtempfile.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <cppuhelper/typeprovider.hxx> #include <o3tl/safeint.hxx> +#include <tools/stream.hxx> #include <unotools/tempfile.hxx> #include <cppuhelper/propshlp.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/vcl/qa/cppunit/svm/svmtest.cxx b/vcl/qa/cppunit/svm/svmtest.cxx index 918c621724ac..8d65302b9d01 100644 --- a/vcl/qa/cppunit/svm/svmtest.cxx +++ b/vcl/qa/cppunit/svm/svmtest.cxx @@ -24,6 +24,7 @@ #include <vcl/filter/PngImageWriter.hxx> #include <tools/fract.hxx> #include <tools/mapunit.hxx> +#include <tools/stream.hxx> #include <vcl/metaact.hxx> #include <vcl/filter/SvmReader.hxx> #include <vcl/filter/SvmWriter.hxx> diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index f2c5766488f7..cd7899e3515f 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -20,6 +20,7 @@ #include <config_features.h> #include <config_version.h> +#include <i18nlangtag/languagetag.hxx> #include <osl/diagnose.h> #include <osl/file.hxx> #include <osl/thread.hxx> diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 670b0ada8f65..8921771b970e 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -39,6 +39,7 @@ #include <com/sun/star/i18n/XCharacterClassification.hpp> #include <com/sun/star/i18n/CalendarFieldIndex.hdl> +#include <com/sun/star/i18n/Calendar2.hpp> #include <unotools/localedatawrapper.hxx> #include <unotools/calendarwrapper.hxx> diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index 82cc91f8c13b..805d75588bde 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -41,6 +41,7 @@ #include <com/sun/star/i18n/XBreakIterator.hpp> #include <com/sun/star/i18n/CharacterIteratorMode.hpp> +#include <com/sun/star/i18n/ForbiddenCharacters.hpp> #include <com/sun/star/i18n/WordType.hpp> diff --git a/vcl/source/filter/ieps/ieps.cxx b/vcl/source/filter/ieps/ieps.cxx index 9857ef210efa..49e445d7923a 100644 --- a/vcl/source/filter/ieps/ieps.cxx +++ b/vcl/source/filter/ieps/ieps.cxx @@ -20,6 +20,7 @@ #include <filter/EpsReader.hxx> #include <tools/mapunit.hxx> +#include <tools/stream.hxx> #include <vcl/svapp.hxx> #include <vcl/gdimtf.hxx> #include <vcl/graph.hxx> diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx index 5718e91d7718..b79b13a5d94d 100644 --- a/vcl/source/fontsubset/sft.cxx +++ b/vcl/source/fontsubset/sft.cxx @@ -42,6 +42,7 @@ #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> +#include <tools/stream.hxx> #include <o3tl/safeint.hxx> #include <o3tl/string_view.hxx> #include <osl/endian.h> diff --git a/vcl/source/graphic/BinaryDataContainer.cxx b/vcl/source/graphic/BinaryDataContainer.cxx index 8cd66d1c480b..41a11c916f14 100644 --- a/vcl/source/graphic/BinaryDataContainer.cxx +++ b/vcl/source/graphic/BinaryDataContainer.cxx @@ -10,6 +10,7 @@ #include <vcl/BinaryDataContainer.hxx> #include <o3tl/hash_combine.hxx> +#include <tools/stream.hxx> #include <unotools/tempfile.hxx> #include <comphelper/lok.hxx> #include <comphelper/seqstream.hxx> diff --git a/vcl/source/graphic/GraphicLoader.cxx b/vcl/source/graphic/GraphicLoader.cxx index 8e50010f768b..975c203ad02b 100644 --- a/vcl/source/graphic/GraphicLoader.cxx +++ b/vcl/source/graphic/GraphicLoader.cxx @@ -11,6 +11,7 @@ #include <vcl/GraphicLoader.hxx> #include <com/sun/star/awt/XWindow.hpp> +#include <tools/stream.hxx> #include <unotools/ucbstreamhelper.hxx> #include <vcl/graph.hxx> #include <vcl/graphicfilter.hxx> diff --git a/vcl/source/graphic/UnoGraphicDescriptor.cxx b/vcl/source/graphic/UnoGraphicDescriptor.cxx index 5256c8dea398..00330f53946d 100644 --- a/vcl/source/graphic/UnoGraphicDescriptor.cxx +++ b/vcl/source/graphic/UnoGraphicDescriptor.cxx @@ -21,6 +21,7 @@ #include <cppuhelper/weakagg.hxx> #include <tools/mapunit.hxx> +#include <tools/stream.hxx> #include <unotools/ucbstreamhelper.hxx> #include <vcl/gfxlink.hxx> #include <vcl/graphicfilter.hxx> diff --git a/vcl/source/graphic/UnoGraphicProvider.cxx b/vcl/source/graphic/UnoGraphicProvider.cxx index 75551101f5bd..e03a56c68f34 100644 --- a/vcl/source/graphic/UnoGraphicProvider.cxx +++ b/vcl/source/graphic/UnoGraphicProvider.cxx @@ -26,6 +26,7 @@ #include <imagerepository.hxx> #include <tools/fract.hxx> #include <tools/mapunit.hxx> +#include <tools/stream.hxx> #include <unotools/ucbstreamhelper.hxx> #include <vcl/graphic/BitmapHelper.hxx> #include <vcl/graphicfilter.hxx> diff --git a/writerperfect/source/writer/EPUBPackage.cxx b/writerperfect/source/writer/EPUBPackage.cxx index 36e9a47e45d0..c3a438fe006e 100644 --- a/writerperfect/source/writer/EPUBPackage.cxx +++ b/writerperfect/source/writer/EPUBPackage.cxx @@ -17,6 +17,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/embed/XHierarchicalStorageAccess.hpp> +#include <rtl/ref.hxx> #include <sal/log.hxx> #include <comphelper/attributelist.hxx> #include <comphelper/sequenceashashmap.hxx> diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index 2343e5d99e55..2b560814405f 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -30,6 +30,9 @@ #include <sax/tools/converter.hxx> +#include <com/sun/star/i18n/Calendar2.hpp> +#include <com/sun/star/i18n/NativeNumberXmlAttributes.hpp> + #include <utility> #include <xmloff/xmlement.hxx> #include <xmloff/xmlnumfi.hxx>
