dbaccess/source/core/recovery/subcomponentrecovery.cxx | 1 dbaccess/source/filter/xml/xmlHelper.cxx | 1 editeng/source/misc/SvXMLAutoCorrectExport.cxx | 1 editeng/source/xml/xmltxtexp.cxx | 1 filter/source/svg/svgfilter.hxx | 1 include/IwyuFilter_include.yaml | 12 +++++----- include/xmloff/SchXMLSeriesHelper.hxx | 3 -- include/xmloff/XMLComplexColorExport.hxx | 6 ++++- include/xmloff/XMLConstantsPropertyHandler.hxx | 2 - include/xmloff/XMLDrawingPageStyleContext.hxx | 3 +- include/xmloff/XMLSettingsExportContext.hxx | 4 ++- include/xmloff/XMLTextShapeStyleContext.hxx | 3 +- include/xmloff/controlpropertyhdl.hxx | 3 +- include/xmloff/formlayerimport.hxx | 3 +- include/xmloff/settingsstore.hxx | 3 +- include/xmloff/shapeimport.hxx | 6 ++--- include/xmloff/table/XMLTableExport.hxx | 11 ++++----- include/xmloff/table/XMLTableImport.hxx | 19 ++++++++++------- include/xmloff/txtimp.hxx | 4 +-- include/xmloff/txtparae.hxx | 6 ++--- include/xmloff/unoatrcn.hxx | 4 +-- include/xmloff/xmlement.hxx | 3 +- include/xmloff/xmlexp.hxx | 4 +-- include/xmloff/xmlgrhlp.hxx | 7 ++++-- include/xmloff/xmlmetae.hxx | 4 +-- include/xmloff/xmlnumfe.hxx | 2 - include/xmloff/xmlprcon.hxx | 2 - include/xmloff/xmltkmap.hxx | 3 +- include/xmloff/xmluconv.hxx | 2 - linguistic/source/convdicxml.cxx | 1 reportdesign/source/filter/xml/xmlExport.cxx | 1 reportdesign/source/filter/xml/xmlHelper.cxx | 1 reportdesign/source/filter/xml/xmlStyleImport.cxx | 1 sc/source/filter/xml/XMLTableShapeImportHelper.cxx | 1 svx/source/table/tablestylesparser.cxx | 2 + svx/source/xml/xmlxtexp.cxx | 2 + svx/source/xml/xmlxtimp.cxx | 1 sw/source/core/inc/SwXMLBlockExport.hxx | 1 xmloff/source/chart/PropertyMaps.cxx | 1 xmloff/source/chart/SchXMLAutoStylePoolP.cxx | 1 xmloff/source/chart/SchXMLEnumConverter.cxx | 1 xmloff/source/chart/SchXMLExport.cxx | 2 + xmloff/source/core/xmlexp.cxx | 2 + xmloff/source/core/xmlimp.cxx | 1 xmloff/source/draw/shapeimport.cxx | 1 xmloff/source/draw/ximp3dscene.cxx | 2 + xmloff/source/draw/ximpbody.cxx | 1 xmloff/source/draw/ximpcustomshape.cxx | 1 xmloff/source/draw/ximpnote.cxx | 1 xmloff/source/draw/ximpshap.cxx | 1 xmloff/source/forms/layerexport.cxx | 1 xmloff/source/meta/MetaExportComponent.cxx | 1 xmloff/source/meta/xmlversion.cxx | 1 xmloff/source/style/xmlimppr.cxx | 2 - xmloff/source/table/XMLTableExport.cxx | 1 xmloff/source/table/XMLTableImport.cxx | 1 xmloff/source/text/XMLAutoTextEventExport.cxx | 1 xmloff/source/text/XMLTextShapeImportHelper.cxx | 1 58 files changed, 108 insertions(+), 51 deletions(-)
New commits: commit 0a42ddbdf1d9261a6c5814fcfad9dcef06287189 Author: Gabor Kelemen <[email protected]> AuthorDate: Tue Feb 10 22:20:52 2026 +0100 Commit: Gabor Kelemen <[email protected]> CommitDate: Sun Feb 22 10:42:36 2026 +0100 tdf#146619 Use more forward declarations in include/xmloff Change-Id: I49e39d669ba77a99b77322275d2e54e211da5b11 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199386 Tested-by: Jenkins Reviewed-by: Gabor Kelemen <[email protected]> diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx index f96a21818442..44b536633df9 100644 --- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx +++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx @@ -41,6 +41,7 @@ #include <sal/log.hxx> #include <xmloff/XMLSettingsExportContext.hxx> #include <xmloff/SettingsExportHelper.hxx> +#include <xmloff/xmltoken.hxx> #include <stack> diff --git a/dbaccess/source/filter/xml/xmlHelper.cxx b/dbaccess/source/filter/xml/xmlHelper.cxx index eb0e7d16f9b4..216889eda8ae 100644 --- a/dbaccess/source/filter/xml/xmlHelper.cxx +++ b/dbaccess/source/filter/xml/xmlHelper.cxx @@ -24,6 +24,7 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/xmltypes.hxx> #include <xmloff/maptype.hxx> +#include <xmloff/NamedBoolPropertyHdl.hxx> #include <strings.hxx> #include <rtl/ref.hxx> diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.cxx b/editeng/source/misc/SvXMLAutoCorrectExport.cxx index f7ef51a451b1..6aa33e004741 100644 --- a/editeng/source/misc/SvXMLAutoCorrectExport.cxx +++ b/editeng/source/misc/SvXMLAutoCorrectExport.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/util/MeasureUnit.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> +#include <comphelper/errcode.hxx> #include <xmloff/namespacemap.hxx> #include <xmloff/xmlnamespace.hxx> #include <xmloff/xmltoken.hxx> diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx index 5daa915cdc93..d9443e12d700 100644 --- a/editeng/source/xml/xmltxtexp.cxx +++ b/editeng/source/xml/xmltxtexp.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/diagnose_ex.hxx> +#include <tools/fldunit.hxx> #include <unotools/streamwrap.hxx> #include <xmloff/xmlexp.hxx> #include <editeng/unoedsrc.hxx> diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx index 7b51499e3ef9..7d1ea55ceb7d 100644 --- a/filter/source/svg/svgfilter.hxx +++ b/filter/source/svg/svgfilter.hxx @@ -33,6 +33,7 @@ #include <com/sun/star/xml/sax/XWriter.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> +#include <comphelper/errcode.hxx> #include <editeng/flditem.hxx> #include <vcl/gdimtf.hxx> #include <vcl/svapp.hxx> diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml index 37620c2b6704..af3216f02a30 100644 --- a/include/IwyuFilter_include.yaml +++ b/include/IwyuFilter_include.yaml @@ -431,16 +431,10 @@ excludelist: include/toolkit/helper/macros.hxx: # Needed for macros - comphelper/diagnose_ex.hxx - include/xmloff/unointerfacetouniqueidentifiermapper.hxx: - # base class has to be a complete type - - com/sun/star/uno/XInterface.hpp include/xmloff/unoatrcn.hxx: # base class has to be a complete type - com/sun/star/container/XNameContainer.hpp - com/sun/star/lang/XServiceInfo.hpp - include/xmloff/xmlictxt.hxx: - # base class has to be a complete type - - com/sun/star/xml/sax/XFastContextHandler.hpp include/xmloff/xmlexp.hxx: # base class has to be a complete type - com/sun/star/document/XFilter.hpp @@ -448,6 +442,11 @@ excludelist: - com/sun/star/document/XExporter.hpp - com/sun/star/lang/XInitialization.hpp - com/sun/star/container/XNamed.hpp + include/xmloff/xmlgrhlp.hxx: + # base class has to be a complete type + - com/sun/star/document/XBinaryStreamResolver.hpp + - com/sun/star/document/XGraphicObjectResolver.hpp + - com/sun/star/document/XGraphicStorageHandler.hpp include/xmloff/xmlmetae.hxx: # base class has to be a complete type - com/sun/star/xml/sax/XDocumentHandler.hpp @@ -459,6 +458,7 @@ excludelist: - com/sun/star/lang/XServiceInfo.hpp - com/sun/star/xml/sax/XFastDocumentHandler.hpp - com/sun/star/xml/sax/XFastParser.hpp + - com/sun/star/xml/sax/XDocumentHandler.hpp include/xmloff/XMLTextMasterPageContext.hxx: # needed in --fwdecl mode - struct ContextID_Index_Pair diff --git a/include/xmloff/SchXMLSeriesHelper.hxx b/include/xmloff/SchXMLSeriesHelper.hxx index 78c729306123..f5429542c9e6 100644 --- a/include/xmloff/SchXMLSeriesHelper.hxx +++ b/include/xmloff/SchXMLSeriesHelper.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_XMLOFF_SCHXMLSERIESHELPER_HXX #define INCLUDED_XMLOFF_SCHXMLSERIESHELPER_HXX -#include <com/sun/star/uno/Reference.hxx> - #include <xmloff/dllapi.h> #include <vector> @@ -31,6 +29,7 @@ namespace com::sun::star::beans { class XPropertySet; } namespace com::sun::star::chart2 { class XDataSeries; } namespace com::sun::star::chart2 { class XDiagram; } namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::uno { template <class interface_type> class Reference; } class XMLOFF_DLLPUBLIC SchXMLSeriesHelper { diff --git a/include/xmloff/XMLComplexColorExport.hxx b/include/xmloff/XMLComplexColorExport.hxx index 51425f52ab55..07d41d7bc66a 100644 --- a/include/xmloff/XMLComplexColorExport.hxx +++ b/include/xmloff/XMLComplexColorExport.hxx @@ -11,7 +11,11 @@ #include <xmloff/dllapi.h> #include <sal/types.h> #include <rtl/ustring.hxx> -#include <xmloff/xmltoken.hxx> + +namespace xmloff::token +{ +enum XMLTokenEnum : sal_Int16; +} namespace com::sun::star::uno { diff --git a/include/xmloff/XMLConstantsPropertyHandler.hxx b/include/xmloff/XMLConstantsPropertyHandler.hxx index 5fc6f735a8a8..e8779c269069 100644 --- a/include/xmloff/XMLConstantsPropertyHandler.hxx +++ b/include/xmloff/XMLConstantsPropertyHandler.hxx @@ -24,10 +24,10 @@ #include <sal/config.h> #include <xmloff/dllapi.h> #include <xmloff/xmlprhdl.hxx> -#include <xmloff/xmltoken.hxx> template<typename EnumT> struct SvXMLEnumMapEntry; +namespace xmloff::token { enum XMLTokenEnum : sal_Int16; } /** Abstract base-class for different XML-types. Derivations of this class diff --git a/include/xmloff/XMLDrawingPageStyleContext.hxx b/include/xmloff/XMLDrawingPageStyleContext.hxx index 68ddbeb5221b..42b1a32ac9e4 100644 --- a/include/xmloff/XMLDrawingPageStyleContext.hxx +++ b/include/xmloff/XMLDrawingPageStyleContext.hxx @@ -21,9 +21,10 @@ #include <xmloff/prstylei.hxx> #include <xmloff/xmlimppr.hxx> -#include <xmloff/families.hxx> #include <xmloff/dllapi.h> +enum class XmlStyleFamily; + class XMLOFF_DLLPUBLIC XMLDrawingPageStyleContext : public XMLPropStyleContext { public: diff --git a/include/xmloff/XMLSettingsExportContext.hxx b/include/xmloff/XMLSettingsExportContext.hxx index 1daf35ada17c..66eba50ac514 100644 --- a/include/xmloff/XMLSettingsExportContext.hxx +++ b/include/xmloff/XMLSettingsExportContext.hxx @@ -20,9 +20,11 @@ #ifndef INCLUDED_XMLOFF_XMLSETTINGSEXPORTCONTEXT_HXX #define INCLUDED_XMLOFF_XMLSETTINGSEXPORTCONTEXT_HXX -#include <xmloff/xmltoken.hxx> +#include <rtl/ustring.hxx> namespace com::sun::star::uno { class XComponentContext; } +namespace com::sun::star::uno { template <class interface_type> class Reference; } +namespace xmloff::token { enum XMLTokenEnum : sal_Int16; } namespace xmloff diff --git a/include/xmloff/XMLTextShapeStyleContext.hxx b/include/xmloff/XMLTextShapeStyleContext.hxx index 4425cb85f7e0..133ec99f8d1e 100644 --- a/include/xmloff/XMLTextShapeStyleContext.hxx +++ b/include/xmloff/XMLTextShapeStyleContext.hxx @@ -22,7 +22,8 @@ #include <sal/config.h> #include <xmloff/dllapi.h> #include <xmloff/XMLShapeStyleContext.hxx> -#include <xmloff/XMLEventsImportContext.hxx> + +class XMLEventsImportContext; class XMLOFF_DLLPUBLIC XMLTextShapeStyleContext final : public XMLShapeStyleContext { diff --git a/include/xmloff/controlpropertyhdl.hxx b/include/xmloff/controlpropertyhdl.hxx index b9be6a501ca8..2372f0613fee 100644 --- a/include/xmloff/controlpropertyhdl.hxx +++ b/include/xmloff/controlpropertyhdl.hxx @@ -29,7 +29,8 @@ #include <xmloff/prhdlfac.hxx> #include <rtl/ustring.hxx> #include <xmloff/XMLConstantsPropertyHandler.hxx> -#include <xmloff/NamedBoolPropertyHdl.hxx> + +class XMLNamedBoolPropertyHdl; namespace xmloff { diff --git a/include/xmloff/formlayerimport.hxx b/include/xmloff/formlayerimport.hxx index 5897df7340bd..18566b958d45 100644 --- a/include/xmloff/formlayerimport.hxx +++ b/include/xmloff/formlayerimport.hxx @@ -21,14 +21,15 @@ #define INCLUDED_XMLOFF_FORMLAYERIMPORT_HXX #include <sal/config.h> +#include <rtl/ustring.hxx> #include <xmloff/dllapi.h> -#include <com/sun/star/uno/Reference.hxx> #include <salhelper/simplereferenceobject.hxx> #include <memory> namespace com::sun::star::beans { class XPropertySet; } namespace com::sun::star::drawing { class XDrawPage; } namespace com::sun::star::xml::sax { class XFastAttributeList; } +namespace com::sun::star::uno { template <class interface_type> class Reference; } class SvXMLImport; class SvXMLImportContext; diff --git a/include/xmloff/settingsstore.hxx b/include/xmloff/settingsstore.hxx index f3872e671e83..b943e3760a21 100644 --- a/include/xmloff/settingsstore.hxx +++ b/include/xmloff/settingsstore.hxx @@ -11,11 +11,12 @@ #pragma once -#include <com/sun/star/uno/Sequence.hxx> +#include <rtl/ustring.hxx> namespace com::sun::star::beans { struct PropertyValue; } namespace com::sun::star::embed { class XStorage; } namespace com::sun::star::uno { template <typename > class Reference; } +namespace com::sun::star::uno { template <typename> class Sequence; } // Scans list of properties for certain URL properties that could refer // to internal objects, and initializes from these. diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx index 8bbffedfc91d..4eafbb99a7d4 100644 --- a/include/xmloff/shapeimport.hxx +++ b/include/xmloff/shapeimport.hxx @@ -22,10 +22,7 @@ #include <sal/config.h> #include <xmloff/dllapi.h> -#include <xmloff/xmlimppr.hxx> #include <com/sun/star/drawing/HomogenMatrix.hpp> -#include <com/sun/star/drawing/ProjectionMode.hpp> -#include <com/sun/star/drawing/ShadeMode.hpp> #include <salhelper/simplereferenceobject.hxx> #include <xmloff/xmlictxt.hxx> #include <sax/fastattribs.hxx> @@ -35,11 +32,14 @@ #include <memory> namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::drawing { enum class ProjectionMode; } +namespace com::sun::star::drawing { enum class ShadeMode; } namespace com::sun::star::drawing { class XShape; } namespace com::sun::star::drawing { class XShapes; } namespace com::sun::star::frame { class XModel; } class SvXMLImport; +class SvXMLImportPropertyMapper; class SvXMLStylesContext; class XMLSdPropHdlFactory; class XMLTableImport; diff --git a/include/xmloff/table/XMLTableExport.hxx b/include/xmloff/table/XMLTableExport.hxx index dfdb08d7315d..8dc91c6fed07 100644 --- a/include/xmloff/table/XMLTableExport.hxx +++ b/include/xmloff/table/XMLTableExport.hxx @@ -28,20 +28,19 @@ #include <memory> #include <vector> -#include <com/sun/star/table/XColumnRowRange.hpp> -#include <com/sun/star/table/XCell.hpp> -#include <com/sun/star/container/XIndexAccess.hpp> - #include <rtl/ref.hxx> #include <xmloff/dllapi.h> #include <salhelper/simplereferenceobject.hxx> -#include <xmloff/prhdlfac.hxx> -#include <xmloff/xmlexppr.hxx> #include <xmloff/styleexp.hxx> class SvXMLExport; class SvXMLExportPropertyMapper; +class XMLPropertyHandlerFactory; + +namespace com::sun::star::container { class XIndexAccess; } +namespace com::sun::star::table { class XCell; } +namespace com::sun::star::table { class XColumnRowRange; } typedef std::map< const css::uno::Reference< css::uno::XInterface >, OUString > TableStyleMap; diff --git a/include/xmloff/table/XMLTableImport.hxx b/include/xmloff/table/XMLTableImport.hxx index 2c21383547c7..ae85c73f5508 100644 --- a/include/xmloff/table/XMLTableImport.hxx +++ b/include/xmloff/table/XMLTableImport.hxx @@ -20,20 +20,25 @@ #ifndef INCLUDED_XMLOFF_TABLE_XMLTABLEIMPORT_HXX #define INCLUDED_XMLOFF_TABLE_XMLTABLEIMPORT_HXX -#include <com/sun/star/table/XColumnRowRange.hpp> - #include <xmloff/dllapi.h> -#include <xmloff/xmlictxt.hxx> +#include <rtl/ustring.hxx> #include <salhelper/simplereferenceobject.hxx> -#include <xmloff/xmlimppr.hxx> -#include <xmloff/prhdlfac.hxx> - -#include <rtl/ref.hxx> #include <map> #include <memory> +#include <vector> +class SvXMLImport; +class SvXMLImportContext; +class SvXMLImportPropertyMapper; class SvXMLStyleContext; +class XMLPropertyHandlerFactory; +class XMLPropertySetMapper; + +namespace com::sun::star::table { class XColumnRowRange; } +namespace com::sun::star::uno { template <class interface_type> class Reference; } +namespace com::sun::star::xml::sax { class XFastAttributeList; } +namespace rtl { template <class reference_type> class Reference; } typedef std::map< OUString, OUString > XMLTableTemplate; // Not using a map here, as we want the templates to be diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx index 4d290f25327e..927ab1aabadb 100644 --- a/include/xmloff/txtimp.hxx +++ b/include/xmloff/txtimp.hxx @@ -23,8 +23,6 @@ #include <xmloff/dllapi.h> #include <sal/types.h> #include <rtl/ustring.hxx> -#include <com/sun/star/uno/Reference.h> -#include <com/sun/star/uno/Sequence.hxx> #include <map> #include <memory> @@ -60,6 +58,8 @@ namespace beans { class XPropertySet; } namespace xml::sax { class XFastAttributeList; } namespace util { struct DateTime; } } +namespace com::sun::star::uno { template <class E> class Sequence; } +namespace com::sun::star::uno { template <class interface_type> class Reference; } namespace rtl { template <class reference_type> class Reference; } diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx index 74a07f3042c3..c20568afe094 100644 --- a/include/xmloff/txtparae.hxx +++ b/include/xmloff/txtparae.hxx @@ -24,10 +24,7 @@ #include <rtl/ref.hxx> #include <xmloff/dllapi.h> #include <rtl/ustring.hxx> -#include <com/sun/star/uno/Reference.h> -#include <xmloff/maptype.hxx> #include <xmloff/styleexp.hxx> -#include <xmloff/xmltoken.hxx> #include <xmloff/SinglePropertySetInfoCache.hxx> #include <xmloff/XMLTextListAutoStylePool.hxx> #include <o3tl/sorted_vector.hxx> @@ -46,6 +43,7 @@ class XMLRedlineExport; class MultiPropertySetHelper; enum class XMLShapeExportFlags; class SvXMLExportPropertyMapper; +struct XMLPropertyState; namespace com::sun::star { @@ -64,6 +62,8 @@ namespace xmloff } +namespace xmloff::token { enum XMLTokenEnum : sal_Int16; } + namespace basegfx { class B2DPoint; diff --git a/include/xmloff/unoatrcn.hxx b/include/xmloff/unoatrcn.hxx index 454885c26641..81b235c076ad 100644 --- a/include/xmloff/unoatrcn.hxx +++ b/include/xmloff/unoatrcn.hxx @@ -29,10 +29,10 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <xmloff/xmlcnimp.hxx> - #include <cppuhelper/implbase.hxx> +class SvXMLAttrContainerData; + extern css::uno::Reference< css::uno::XInterface > SvUnoAttributeContainer_CreateInstance(); class XMLOFF_DLLPUBLIC SvUnoAttributeContainer final : diff --git a/include/xmloff/xmlement.hxx b/include/xmloff/xmlement.hxx index bedef86e654c..8fdae8f58402 100644 --- a/include/xmloff/xmlement.hxx +++ b/include/xmloff/xmlement.hxx @@ -21,7 +21,8 @@ #define INCLUDED_XMLOFF_XMLEMENT_HXX #include <sal/types.h> -#include <xmloff/xmltoken.hxx> + +namespace xmloff::token { enum XMLTokenEnum : sal_Int16; } /** Map an XMLTokenEnum to an enum value. * To be used with SvXMLUnitConverter::convertEnum(...) diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx index 0fcdc0d64499..b54c97310fcb 100644 --- a/include/xmloff/xmlexp.hxx +++ b/include/xmloff/xmlexp.hxx @@ -46,8 +46,6 @@ #include <xmloff/XMLPageExport.hxx> #include <comphelper/attributelist.hxx> #include <cppuhelper/implbase.hxx> -#include <tools/fldunit.hxx> -#include <comphelper/errcode.hxx> #include <vector> #include <memory> @@ -69,6 +67,7 @@ namespace com::sun::star::xml::sax { class XDocumentHandler; } namespace com::sun::star::xml::sax { class XExtendedDocumentHandler; } namespace com::sun::star::xml::sax { class XLocator; } +class ErrCode; class SvXMLNamespaceMap; class SvXMLExport_Impl; class ProgressBarHelper; @@ -78,6 +77,7 @@ class XMLImageMapExport; class XMLErrors; class LanguageTag; enum class SvXMLErrorFlags; +enum class FieldUnit : sal_uInt16; // Shapes in Writer cannot be named via context menu (#i51726#) #include <unotools/moduleoptions.hxx> diff --git a/include/xmloff/xmlgrhlp.hxx b/include/xmloff/xmlgrhlp.hxx index 4c2e9f21f799..8aad2e0d7d40 100644 --- a/include/xmloff/xmlgrhlp.hxx +++ b/include/xmloff/xmlgrhlp.hxx @@ -21,7 +21,6 @@ #include <comphelper/compbase.hxx> #include <vcl/graph.hxx> -#include <rtl/ref.hxx> #include <string_view> #include <vector> @@ -30,9 +29,13 @@ #include <com/sun/star/document/XGraphicObjectResolver.hpp> #include <com/sun/star/document/XGraphicStorageHandler.hpp> #include <com/sun/star/document/XBinaryStreamResolver.hpp> -#include <com/sun/star/embed/XStorage.hpp> #include <xmloff/dllapi.h> +namespace com::sun::star::embed { class XStorage; } +namespace com::sun::star::io { class XStream; } + +namespace rtl { template <class reference_type> class Reference; } + enum class SvXMLGraphicHelperMode { Read, Write diff --git a/include/xmloff/xmlmetae.hxx b/include/xmloff/xmlmetae.hxx index 348a04457e51..eec087d66090 100644 --- a/include/xmloff/xmlmetae.hxx +++ b/include/xmloff/xmlmetae.hxx @@ -24,15 +24,15 @@ #include <sal/types.h> #include <cppuhelper/implbase.hxx> -#include <xmloff/xmltoken.hxx> #include <vector> -#include <com/sun/star/beans/StringPair.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> +namespace com::sun::star::beans { struct StringPair; } namespace com::sun::star::document { class XDocumentProperties; } namespace com::sun::star::util { struct DateTime; } +namespace xmloff::token { enum XMLTokenEnum : sal_Int16; } class SvXMLExport; diff --git a/include/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx index 24b397519389..b8ae876813db 100644 --- a/include/xmloff/xmlnumfe.hxx +++ b/include/xmloff/xmlnumfe.hxx @@ -24,7 +24,6 @@ #include <sal/config.h> #include <xmloff/dllapi.h> #include <sal/types.h> -#include <com/sun/star/uno/Sequence.h> #include <rtl/ustrbuf.hxx> #include <i18nlangtag/lang.h> #include <memory> @@ -32,6 +31,7 @@ namespace com::sun::star::lang { struct Locale; } namespace com::sun::star::uno { template <typename > class Reference; } namespace com::sun::star::util { class XNumberFormatsSupplier; } +namespace com::sun::star::uno { template <class E> class Sequence; } inline constexpr OUString XML_WRITTENNUMBERSTYLES = u"WrittenNumberStyles"_ustr; diff --git a/include/xmloff/xmlprcon.hxx b/include/xmloff/xmlprcon.hxx index 83cea94761d0..54a51614017e 100644 --- a/include/xmloff/xmlprcon.hxx +++ b/include/xmloff/xmlprcon.hxx @@ -21,10 +21,10 @@ #define INCLUDED_XMLOFF_XMLPRCON_HXX #include <xmloff/xmlictxt.hxx> -#include <xmloff/xmlimppr.hxx> #include <vector> +class SvXMLImportPropertyMapper; struct XMLPropertyState; class XMLOFF_DLLPUBLIC SvXMLPropertySetContext : public SvXMLImportContext diff --git a/include/xmloff/xmltkmap.hxx b/include/xmloff/xmltkmap.hxx index 3e2f0999b699..8e3d7f88890a 100644 --- a/include/xmloff/xmltkmap.hxx +++ b/include/xmloff/xmltkmap.hxx @@ -22,13 +22,14 @@ #include <config_options.h> #include <sal/config.h> +#include <rtl/ustring.hxx> #include <xmloff/dllapi.h> #include <sal/types.h> -#include <xmloff/xmltoken.hxx> #include <memory> class SvXMLTokenMap_Impl; +namespace xmloff::token { enum XMLTokenEnum : sal_Int16; } #define XML_TOK_UNKNOWN 0xffffU #define XML_TOKEN_MAP_END { 0xffffU, xmloff::token::XML_TOKEN_INVALID, 0U } diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx index c9e1bea3c9ec..135fa834965d 100644 --- a/include/xmloff/xmluconv.hxx +++ b/include/xmloff/xmluconv.hxx @@ -32,7 +32,7 @@ #include <unotools/saveopt.hxx> -#include <tools/fldunit.hxx> +enum class FieldUnit : sal_uInt16; namespace com::sun::star { namespace text { class XNumberingTypeInfo; } diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx index 5fca39078e8f..c88db58e0eb7 100644 --- a/linguistic/source/convdicxml.cxx +++ b/linguistic/source/convdicxml.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/document/XFilter.hpp> #include <com/sun/star/beans/PropertyValue.hpp> +#include <comphelper/errcode.hxx> #include <xmloff/namespacemap.hxx> #include <xmloff/xmlnamespace.hxx> #include <unotools/streamwrap.hxx> diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 7d09758dbcbf..b617e2f4176c 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -24,6 +24,7 @@ #include <xmloff/xmlnamespace.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/namespacemap.hxx> +#include <xmloff/NamedBoolPropertyHdl.hxx> #include <xmloff/txtprmap.hxx> #include <xmloff/numehelp.hxx> #include "xmlHelper.hxx" diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx index b30f7b56d961..76f43115198c 100644 --- a/reportdesign/source/filter/xml/xmlHelper.cxx +++ b/reportdesign/source/filter/xml/xmlHelper.cxx @@ -38,6 +38,7 @@ #include <xmloff/xmlement.hxx> #include <xmloff/xmltypes.hxx> #include <xmloff/maptype.hxx> +#include <xmloff/NamedBoolPropertyHdl.hxx> #include <com/sun/star/report/XReportControlFormat.hpp> #include <com/sun/star/form/ListSourceType.hpp> #include <com/sun/star/sdb/CommandType.hpp> diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx index 7fa1056300fa..b22dae422533 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.cxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx @@ -19,6 +19,7 @@ #include "xmlStyleImport.hxx" #include <xmloff/maptype.hxx> #include <xmloff/namespacemap.hxx> +#include <xmloff/NamedBoolPropertyHdl.hxx> #include <xmloff/xmlimppr.hxx> #include <xmloff/txtimppr.hxx> #include <xmloff/families.hxx> diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx index e3a891ca7c9c..41432da2f100 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx @@ -26,6 +26,7 @@ #include <docuno.hxx> #include <sheetdata.hxx> #include <comphelper/servicehelper.hxx> +#include <xmloff/xmlimppr.hxx> #include <xmloff/xmlnamespace.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/xmltoken.hxx> diff --git a/svx/source/table/tablestylesparser.cxx b/svx/source/table/tablestylesparser.cxx index 618874600165..7c5e8471325d 100644 --- a/svx/source/table/tablestylesparser.cxx +++ b/svx/source/table/tablestylesparser.cxx @@ -26,6 +26,8 @@ #include <editeng/adjustitem.hxx> #include <sax/tools/converter.hxx> #include <svx/svxtableitems.hxx> +#include <xmloff/maptype.hxx> +#include <xmloff/xmlimppr.hxx> #include <xmloff/xmlprmap.hxx> #include <svx/TableAutoFmt.hxx> #include <svx/TableStylesParser.hxx> diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx index e0adf8d3cdc3..436b010b141d 100644 --- a/svx/source/xml/xmlxtexp.cxx +++ b/svx/source/xml/xmlxtexp.cxx @@ -23,6 +23,7 @@ #include <tools/urlobj.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameContainer.hpp> +#include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/xml/sax/Writer.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp> @@ -34,6 +35,7 @@ #include <sax/tools/converter.hxx> #include <sfx2/docfile.hxx> +#include <tools/fldunit.hxx> #include <rtl/ustrbuf.hxx> #include <xmloff/xmlnamespace.hxx> #include <xmloff/namespacemap.hxx> diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx index 9d3858ab901c..98ee6e653c4c 100644 --- a/svx/source/xml/xmlxtimp.cxx +++ b/svx/source/xml/xmlxtimp.cxx @@ -20,6 +20,7 @@ #include <tools/urlobj.hxx> #include <com/sun/star/document/XGraphicStorageHandler.hpp> #include <com/sun/star/embed/ElementModes.hpp> +#include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp> diff --git a/sw/source/core/inc/SwXMLBlockExport.hxx b/sw/source/core/inc/SwXMLBlockExport.hxx index 90f8c59595d9..9cbc4aa0c264 100644 --- a/sw/source/core/inc/SwXMLBlockExport.hxx +++ b/sw/source/core/inc/SwXMLBlockExport.hxx @@ -19,6 +19,7 @@ #pragma once +#include <comphelper/errcode.hxx> #include <xmloff/xmlexp.hxx> class SwXMLTextBlocks; diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx index 141a67f35fc7..7beb35055183 100644 --- a/xmloff/source/chart/PropertyMaps.cxx +++ b/xmloff/source/chart/PropertyMaps.cxx @@ -32,6 +32,7 @@ #include <xmloff/EnumPropertyHdl.hxx> #include <comphelper/attributelist.hxx> +#include <xmloff/maptype.hxx> #include <xmloff/namespacemap.hxx> #include <xmloff/xmlnamespace.hxx> #include <xmloff/xmluconv.hxx> diff --git a/xmloff/source/chart/SchXMLAutoStylePoolP.cxx b/xmloff/source/chart/SchXMLAutoStylePoolP.cxx index c893408ec3c0..f3068ee427c0 100644 --- a/xmloff/source/chart/SchXMLAutoStylePoolP.cxx +++ b/xmloff/source/chart/SchXMLAutoStylePoolP.cxx @@ -22,6 +22,7 @@ #include <SchXMLExport.hxx> #include <xmloff/families.hxx> #include <xmloff/namespacemap.hxx> +#include <xmloff/maptype.hxx> SchXMLAutoStylePoolP::SchXMLAutoStylePoolP( SchXMLExport& rSchXMLExport ) : diff --git a/xmloff/source/chart/SchXMLEnumConverter.cxx b/xmloff/source/chart/SchXMLEnumConverter.cxx index 7bb888ee0380..43ef80944380 100644 --- a/xmloff/source/chart/SchXMLEnumConverter.cxx +++ b/xmloff/source/chart/SchXMLEnumConverter.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/chart/ChartLegendExpansion.hpp> #include "SchXMLEnumConverter.hxx" #include <xmloff/xmlement.hxx> +#include <xmloff/xmltoken.hxx> using namespace ::xmloff::token; using namespace ::com::sun::star; diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index d66684b64dbd..9c3893d5e593 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -35,8 +35,10 @@ #include <comphelper/processfactory.hxx> #include <tools/globname.hxx> #include <comphelper/classids.hxx> +#include <comphelper/errcode.hxx> #include <comphelper/sequence.hxx> +#include <xmloff/maptype.hxx> #include <xmloff/namespacemap.hxx> #include <xmloff/xmlnamespace.hxx> #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index ed5a39326cbb..2523a47ea286 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -36,6 +36,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/document/XEmbeddedObjectResolver.hpp> +#include <com/sun/star/document/XGraphicObjectResolver.hpp> #include <com/sun/star/text/XTextContent.hpp> #include <com/sun/star/xml/sax/SAXInvalidCharacterException.hpp> #include <com/sun/star/uri/XUriReferenceFactory.hpp> @@ -43,6 +44,7 @@ #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/util/MeasureUnit.hpp> #include <i18nlangtag/languagetag.hxx> +#include <comphelper/errcode.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/propertysetinfo.hxx> #include <comphelper/propertyvalue.hxx> diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index b2fd943cc599..1c2ab9682398 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -33,6 +33,7 @@ #include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <xmloff/namespacemap.hxx> #include <xmloff/xmlgrhlp.hxx> +#include <xmloff/xmlimppr.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/xmlnamespace.hxx> #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index 5a8f135dddf5..2b3150844e38 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -29,6 +29,7 @@ #include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <xmloff/shapeimport.hxx> +#include <xmloff/xmlimppr.hxx> #include <xmloff/xmlstyle.hxx> #include <xmloff/xmlnamespace.hxx> #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx index 8c1648be4490..46a56425348a 100644 --- a/xmloff/source/draw/ximp3dscene.cxx +++ b/xmloff/source/draw/ximp3dscene.cxx @@ -28,6 +28,8 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/Direction3D.hpp> #include <com/sun/star/drawing/CameraGeometry.hpp> +#include <com/sun/star/drawing/ProjectionMode.hpp> +#include <com/sun/star/drawing/ShadeMode.hpp> #include "eventimp.hxx" #include "descriptionimp.hxx" diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx index 591832735414..6639c658c6ab 100644 --- a/xmloff/source/draw/ximpbody.cxx +++ b/xmloff/source/draw/ximpbody.cxx @@ -31,6 +31,7 @@ #include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <xmloff/families.hxx> +#include <xmloff/xmltoken.hxx> #include "ximpshow.hxx" #include "layerimp.hxx" #include <animationimport.hxx> diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx index 9be35a5a1d0f..385b2e2c1050 100644 --- a/xmloff/source/draw/ximpcustomshape.cxx +++ b/xmloff/source/draw/ximpcustomshape.cxx @@ -40,6 +40,7 @@ #include <com/sun/star/drawing/EnhancedCustomShapeMetalType.hpp> #include <com/sun/star/drawing/ProjectionMode.hpp> #include <com/sun/star/drawing/Position3D.hpp> +#include <com/sun/star/drawing/ShadeMode.hpp> #include <sax/tools/converter.hxx> #include <comphelper/sequence.hxx> #include <o3tl/string_view.hxx> diff --git a/xmloff/source/draw/ximpnote.cxx b/xmloff/source/draw/ximpnote.cxx index 9035648cb9ed..08cb6971bdd5 100644 --- a/xmloff/source/draw/ximpnote.cxx +++ b/xmloff/source/draw/ximpnote.cxx @@ -20,6 +20,7 @@ #include "ximpnote.hxx" #include "ximpshap.hxx" #include <xmloff/xmlnamespace.hxx> +#include <xmloff/xmltoken.hxx> using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 5caef558f8a7..b033111be983 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -81,6 +81,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp> #include <com/sun/star/container/XChild.hpp> +#include <com/sun/star/table/XColumnRowRange.hpp> #include <com/sun/star/text/XTextDocument.hpp> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <basegfx/point/b2dpoint.hxx> diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx index 136a10368d85..1072a4835206 100644 --- a/xmloff/source/forms/layerexport.cxx +++ b/xmloff/source/forms/layerexport.cxx @@ -27,6 +27,7 @@ #include <xmloff/contextid.hxx> #include <xmloff/controlpropertyhdl.hxx> #include <xmloff/maptype.hxx> +#include <xmloff/NamedBoolPropertyHdl.hxx> #include <sal/log.hxx> #include <comphelper/diagnose_ex.hxx> #include "controlpropertymap.hxx" diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx index e4a23caaff1c..29d1f703af1b 100644 --- a/xmloff/source/meta/MetaExportComponent.cxx +++ b/xmloff/source/meta/MetaExportComponent.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +#include <comphelper/errcode.hxx> #include <comphelper/genericpropertyset.hxx> #include <comphelper/propertysetinfo.hxx> #include <osl/diagnose.h> diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx index abd0615d0973..b39217a48058 100644 --- a/xmloff/source/meta/xmlversion.cxx +++ b/xmloff/source/meta/xmlversion.cxx @@ -26,6 +26,7 @@ #include <o3tl/string_view.hxx> #include <xmloff/xmltoken.hxx> +#include <comphelper/errcode.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/io/IOException.hpp> diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx index 5626da2e3c99..264adf027974 100644 --- a/xmloff/source/style/xmlimppr.cxx +++ b/xmloff/source/style/xmlimppr.cxx @@ -34,7 +34,7 @@ #include <xmloff/namespacemap.hxx> #include <xmloff/xmlimppr.hxx> #include <xmloff/xmlimp.hxx> - +#include <xmloff/xmlcnimp.hxx> #include <xmloff/unoatrcn.hxx> #include <xmloff/xmlnamespace.hxx> #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx index c22e68db1609..94c36fb3aee2 100644 --- a/xmloff/source/table/XMLTableExport.cxx +++ b/xmloff/source/table/XMLTableExport.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/text/XText.hpp> #include <com/sun/star/table/XCellRange.hpp> +#include <com/sun/star/table/XColumnRowRange.hpp> #include <com/sun/star/table/XMergeableCell.hpp> #include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/beans/XPropertyState.hpp> diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx index a1effb5c5117..8dc7672992b3 100644 --- a/xmloff/source/table/XMLTableImport.cxx +++ b/xmloff/source/table/XMLTableImport.cxx @@ -35,6 +35,7 @@ #include <utility> #include <xmloff/table/XMLTableImport.hxx> #include <xmloff/maptype.hxx> +#include <xmloff/xmlimppr.hxx> #include <xmloff/xmlprmap.hxx> #include <xmloff/txtimp.hxx> #include <xmloff/xmlimp.hxx> diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx index 1186470d6c20..10a514460a17 100644 --- a/xmloff/source/text/XMLAutoTextEventExport.cxx +++ b/xmloff/source/text/XMLAutoTextEventExport.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +#include <comphelper/errcode.hxx> #include <osl/diagnose.h> #include <xmloff/xmlnamespace.hxx> #include <xmloff/namespacemap.hxx> diff --git a/xmloff/source/text/XMLTextShapeImportHelper.cxx b/xmloff/source/text/XMLTextShapeImportHelper.cxx index 56dba8ed2271..730885d1e501 100644 --- a/xmloff/source/text/XMLTextShapeImportHelper.cxx +++ b/xmloff/source/text/XMLTextShapeImportHelper.cxx @@ -24,6 +24,7 @@ #include <sax/tools/converter.hxx> #include <xmloff/xmlimp.hxx> +#include <xmloff/xmlimppr.hxx> #include <xmloff/txtimp.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/xmlnamespace.hxx>
