[Libreoffice-commits] core.git: dbaccess/source editeng/source filter/source include/IwyuFilter_include.yaml include/xmloff linguistic/source reportdesign/source sc/source starmath/source svx/qa svx/source sw/source xmloff/inc xmloff/qa xmloff/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Jan 22 08:28:07 UTC 2019
dbaccess/source/core/recovery/subcomponentrecovery.cxx | 1
dbaccess/source/filter/xml/xmlConnectionData.cxx | 1
dbaccess/source/filter/xml/xmlDataSource.cxx | 1
dbaccess/source/filter/xml/xmlDataSourceSetting.cxx | 1
dbaccess/source/filter/xml/xmlDataSourceSettings.cxx | 1
dbaccess/source/filter/xml/xmlDatabase.cxx | 1
dbaccess/source/filter/xml/xmlDatabaseDescription.cxx | 1
dbaccess/source/filter/xml/xmlDocuments.cxx | 1
dbaccess/source/filter/xml/xmlExport.cxx | 1
dbaccess/source/filter/xml/xmlExport.hxx | 1
dbaccess/source/filter/xml/xmlHelper.cxx | 1
dbaccess/source/filter/xml/xmlHierarchyCollection.cxx | 1
dbaccess/source/filter/xml/xmlQuery.cxx | 1
dbaccess/source/filter/xml/xmlTable.cxx | 3
dbaccess/source/filter/xml/xmlTableFilterList.cxx | 1
dbaccess/source/filter/xml/xmlfilter.cxx | 2
dbaccess/source/filter/xml/xmlfilter.hxx | 1
editeng/source/misc/SvXMLAutoCorrectExport.cxx | 1
editeng/source/misc/svxacorr.cxx | 1
editeng/source/xml/xmltxtexp.cxx | 1
editeng/source/xml/xmltxtimp.cxx | 1
filter/source/t602/t602filter.hxx | 1
include/IwyuFilter_include.yaml | 48 +++++++++++
include/xmloff/AutoStyleEntry.hxx | 5 -
include/xmloff/DocumentSettingsContext.hxx | 1
include/xmloff/EnumPropertyHdl.hxx | 4
include/xmloff/GradientStyle.hxx | 1
include/xmloff/HatchStyle.hxx | 1
include/xmloff/ImageStyle.hxx | 10 +-
include/xmloff/MarkerStyle.hxx | 1
include/xmloff/NamedBoolPropertyHdl.hxx | 1
include/xmloff/SchXMLExportHelper.hxx | 9 --
include/xmloff/SchXMLImportHelper.hxx | 16 ---
include/xmloff/SchXMLSeriesHelper.hxx | 12 +-
include/xmloff/SettingsExportHelper.hxx | 9 +-
include/xmloff/SinglePropertySetInfoCache.hxx | 5 -
include/xmloff/WordWrapPropertyHdl.hxx | 2
include/xmloff/XMLBase64ImportContext.hxx | 3
include/xmloff/XMLCharContext.hxx | 3
include/xmloff/XMLEventExport.hxx | 5 -
include/xmloff/XMLEventsImportContext.hxx | 5 -
include/xmloff/XMLGraphicsDefaultStyle.hxx | 5 -
include/xmloff/XMLPageExport.hxx | 5 -
include/xmloff/XMLSettingsExportContext.hxx | 4
include/xmloff/XMLShapeStyleContext.hxx | 1
include/xmloff/XMLTextListAutoStylePool.hxx | 3
include/xmloff/XMLTextMasterPageExport.hxx | 2
include/xmloff/XMLTextTableContext.hxx | 4
include/xmloff/animationexport.hxx | 7 -
include/xmloff/animexp.hxx | 4
include/xmloff/attrlist.hxx | 5 -
include/xmloff/controlpropertyhdl.hxx | 9 --
include/xmloff/formlayerexport.hxx | 10 +-
include/xmloff/formlayerimport.hxx | 11 +-
include/xmloff/numehelp.hxx | 5 -
include/xmloff/prstylei.hxx | 4
include/xmloff/settingsstore.hxx | 8 +
include/xmloff/shapeexport.hxx | 16 +--
include/xmloff/shapeimport.hxx | 15 +--
include/xmloff/styleexp.hxx | 6 -
include/xmloff/txtimp.hxx | 13 +-
include/xmloff/txtimppr.hxx | 2
include/xmloff/txtparae.hxx | 10 --
include/xmloff/txtstyli.hxx | 1
include/xmloff/unoatrcn.hxx | 1
include/xmloff/xformsexport.hxx | 1
include/xmloff/xformsimport.hxx | 4
include/xmloff/xmlaustp.hxx | 14 ++-
include/xmloff/xmlerror.hxx | 2
include/xmloff/xmlevent.hxx | 6 -
include/xmloff/xmlexp.hxx | 35 +++-----
include/xmloff/xmlexppr.hxx | 13 ++
include/xmloff/xmlictxt.hxx | 5 -
include/xmloff/xmlimp.hxx | 36 +++-----
include/xmloff/xmlimppr.hxx | 16 ++-
include/xmloff/xmlmetae.hxx | 5 -
include/xmloff/xmlmetai.hxx | 6 -
include/xmloff/xmlnume.hxx | 10 --
include/xmloff/xmlnumfe.hxx | 8 -
include/xmloff/xmlnumfi.hxx | 14 +--
include/xmloff/xmlnumi.hxx | 4
include/xmloff/xmlprcon.hxx | 4
include/xmloff/xmlprhdl.hxx | 2
include/xmloff/xmlprmap.hxx | 3
include/xmloff/xmlstyle.hxx | 4
include/xmloff/xmltabe.hxx | 1
include/xmloff/xmltoken.hxx | 1
include/xmloff/xmluconv.hxx | 21 ++--
linguistic/source/convdic.cxx | 3
reportdesign/source/filter/xml/xmlCell.cxx | 1
reportdesign/source/filter/xml/xmlColumn.cxx | 1
reportdesign/source/filter/xml/xmlControlProperty.cxx | 1
reportdesign/source/filter/xml/xmlExport.hxx | 1
reportdesign/source/filter/xml/xmlFixedContent.cxx | 1
reportdesign/source/filter/xml/xmlGroup.cxx | 1
reportdesign/source/filter/xml/xmlHelper.cxx | 1
reportdesign/source/filter/xml/xmlMasterFields.cxx | 1
reportdesign/source/filter/xml/xmlReport.cxx | 1
reportdesign/source/filter/xml/xmlReportElement.cxx | 1
reportdesign/source/filter/xml/xmlReportElementBase.cxx | 1
reportdesign/source/filter/xml/xmlSubDocument.cxx | 1
reportdesign/source/filter/xml/xmlTable.cxx | 1
reportdesign/source/filter/xml/xmlfilter.cxx | 2
sc/source/filter/xml/XMLCalculationSettingsContext.cxx | 2
sc/source/filter/xml/XMLExportDDELinks.cxx | 2
sc/source/filter/xml/XMLTableHeaderFooterContext.cxx | 1
sc/source/filter/xml/XMLTableShapeResizer.cxx | 1
sc/source/filter/xml/xmlcelli.cxx | 1
sc/source/filter/xml/xmlexprt.cxx | 2
sc/source/filter/xml/xmlexprt.hxx | 1
sc/source/filter/xml/xmlimprt.cxx | 2
sc/source/filter/xml/xmlimprt.hxx | 1
sc/source/filter/xml/xmlstyle.cxx | 2
sc/source/filter/xml/xmlwrap.cxx | 3
starmath/source/mathmlimport.cxx | 2
svx/qa/unit/XTableImportExportTest.cxx | 1
svx/source/xml/xmlxtexp.cxx | 1
sw/source/core/swg/SwXMLBlockExport.cxx | 1
sw/source/core/swg/SwXMLTextBlocks1.cxx | 1
sw/source/filter/xml/swxml.cxx | 1
sw/source/filter/xml/xmlfmt.cxx | 1
sw/source/filter/xml/xmlfmte.cxx | 1
sw/source/filter/xml/xmlmeta.cxx | 1
sw/source/filter/xml/xmltexte.cxx | 1
sw/source/filter/xml/xmltexti.cxx | 1
xmloff/inc/XMLChartPropertySetMapper.hxx | 1
xmloff/inc/txtfldi.hxx | 1
xmloff/qa/unit/uxmloff.cxx | 1
xmloff/source/chart/PropertyMaps.cxx | 3
xmloff/source/chart/SchXMLAxisContext.hxx | 2
xmloff/source/chart/SchXMLEnumConverter.cxx | 1
xmloff/source/chart/SchXMLExport.cxx | 2
xmloff/source/chart/SchXMLLegendContext.cxx | 1
xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx | 1
xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx | 1
xmloff/source/chart/SchXMLSeries2Context.cxx | 1
xmloff/source/chart/SchXMLTools.cxx | 1
xmloff/source/chart/XMLChartPropertyContext.cxx | 1
xmloff/source/chart/XMLChartStyleContext.cxx | 2
xmloff/source/core/DocumentSettingsContext.cxx | 1
xmloff/source/core/SettingsExportHelper.cxx | 1
xmloff/source/core/XMLEmbeddedObjectImportContext.cxx | 1
xmloff/source/core/xmlexp.cxx | 4
xmloff/source/core/xmlictxt.cxx | 1
xmloff/source/core/xmlimp.cxx | 6 +
xmloff/source/core/xmluconv.cxx | 1
xmloff/source/draw/XMLGraphicsDefaultStyle.cxx | 3
xmloff/source/draw/XMLShapePropertySetContext.cxx | 3
xmloff/source/draw/XMLShapeStyleContext.cxx | 3
xmloff/source/draw/animationexport.cxx | 1
xmloff/source/draw/animexp.cxx | 1
xmloff/source/draw/sdpropls.cxx | 1
xmloff/source/draw/sdxmlexp.cxx | 2
xmloff/source/draw/sdxmlimp.cxx | 1
xmloff/source/draw/shapeexport.cxx | 2
xmloff/source/draw/shapeimport.cxx | 4
xmloff/source/draw/ximp3dscene.cxx | 1
xmloff/source/draw/ximpcustomshape.cxx | 3
xmloff/source/draw/ximpshap.cxx | 5 +
xmloff/source/draw/ximpshow.cxx | 1
xmloff/source/draw/ximpstyl.cxx | 2
xmloff/source/forms/controlpropertymap.cxx | 1
xmloff/source/forms/elementimport.cxx | 1
xmloff/source/forms/propertyexport.cxx | 2
xmloff/source/meta/MetaExportComponent.cxx | 2
xmloff/source/meta/MetaImportComponent.cxx | 1
xmloff/source/meta/xmlmetae.cxx | 2
xmloff/source/meta/xmlmetai.cxx | 1
xmloff/source/meta/xmlversion.cxx | 2
xmloff/source/style/DashStyle.cxx | 1
xmloff/source/style/GradientStyle.cxx | 1
xmloff/source/style/HatchStyle.cxx | 1
xmloff/source/style/ImageStyle.cxx | 1
xmloff/source/style/PageHeaderFooterContext.cxx | 1
xmloff/source/style/PageHeaderFooterContext.hxx | 1
xmloff/source/style/PageMasterExportPropMapper.cxx | 2
xmloff/source/style/PageMasterImportContext.cxx | 1
xmloff/source/style/PageMasterPropHdl.cxx | 1
xmloff/source/style/PageMasterPropHdlFactory.cxx | 1
xmloff/source/style/PageMasterPropMapper.cxx | 1
xmloff/source/style/PagePropertySetContext.cxx | 1
xmloff/source/style/SinglePropertySetInfoCache.cxx | 1
xmloff/source/style/TransGradientStyle.cxx | 1
xmloff/source/style/XMLBackgroundImageContext.cxx | 2
xmloff/source/style/XMLBackgroundImageExport.cxx | 1
xmloff/source/style/XMLFontAutoStylePool.cxx | 2
xmloff/source/style/XMLFontStylesContext.cxx | 1
xmloff/source/style/XMLFootnoteSeparatorExport.cxx | 1
xmloff/source/style/XMLFootnoteSeparatorImport.cxx | 1
xmloff/source/style/adjushdl.cxx | 1
xmloff/source/style/backhdl.cxx | 1
xmloff/source/style/bordrhdl.cxx | 3
xmloff/source/style/breakhdl.cxx | 1
xmloff/source/style/cdouthdl.cxx | 1
xmloff/source/style/csmaphdl.cxx | 1
xmloff/source/style/fonthdl.cxx | 1
xmloff/source/style/impastpl.hxx | 2
xmloff/source/style/numehelp.cxx | 1
xmloff/source/style/postuhdl.cxx | 1
xmloff/source/style/prhdlfac.cxx | 1
xmloff/source/style/prstylei.cxx | 2
xmloff/source/style/undlihdl.cxx | 1
xmloff/source/style/xmlbahdl.cxx | 2
xmloff/source/style/xmlexppr.cxx | 1
xmloff/source/style/xmlimppr.cxx | 2
xmloff/source/style/xmlnumfi.cxx | 1
xmloff/source/style/xmlnumi.cxx | 2
xmloff/source/style/xmlprcon.cxx | 2
xmloff/source/style/xmlprmap.cxx | 2
xmloff/source/style/xmlstyle.cxx | 1
xmloff/source/style/xmltabe.cxx | 1
xmloff/source/table/XMLTableExport.cxx | 1
xmloff/source/table/XMLTableImport.cxx | 1
xmloff/source/text/XMLAutoTextEventExport.cxx | 1
xmloff/source/text/XMLAutoTextEventImport.hxx | 1
xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx | 1
xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx | 1
xmloff/source/text/XMLIndexBibliographyEntryContext.cxx | 1
xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx | 1
xmloff/source/text/XMLIndexSimpleEntryContext.cxx | 2
xmloff/source/text/XMLIndexTOCContext.cxx | 1
xmloff/source/text/XMLIndexTableSourceContext.cxx | 1
xmloff/source/text/XMLIndexTemplateContext.cxx | 3
xmloff/source/text/XMLIndexTitleTemplateContext.cxx | 3
xmloff/source/text/XMLLineNumberingExport.cxx | 1
xmloff/source/text/XMLLineNumberingImportContext.cxx | 1
xmloff/source/text/XMLSectionExport.cxx | 1
xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx | 1
xmloff/source/text/XMLTextColumnsContext.cxx | 1
xmloff/source/text/XMLTextFrameContext.cxx | 2
xmloff/source/text/XMLTextHeaderFooterContext.cxx | 1
xmloff/source/text/XMLTextListItemContext.cxx | 2
xmloff/source/text/XMLTextMarkImportContext.cxx | 1
xmloff/source/text/XMLTextMasterPageContext.cxx | 3
xmloff/source/text/XMLTextPropertySetContext.cxx | 1
xmloff/source/text/XMLTextShapeImportHelper.cxx | 1
xmloff/source/text/XMLTextShapeStyleContext.cxx | 2
xmloff/source/text/XMLTextTableContext.cxx | 1
xmloff/source/text/txtexppr.cxx | 1
xmloff/source/text/txtfldi.cxx | 1
xmloff/source/text/txtimp.cxx | 3
xmloff/source/text/txtlists.cxx | 1
xmloff/source/text/txtprhdl.cxx | 1
xmloff/source/text/txtprmap.cxx | 1
xmloff/source/text/txtstyle.cxx | 1
xmloff/source/text/txtstyli.cxx | 3
xmloff/source/text/txtvfldi.cxx | 2
247 files changed, 512 insertions(+), 252 deletions(-)
New commits:
commit 6e5cdd9d550576095c046f968877956a337330cb
Author: Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Sat Jan 12 22:28:32 2019 +0100
Commit: Miklos Vajna <vmiklos at collabora.com>
CommitDate: Tue Jan 22 09:27:34 2019 +0100
tdf#42949 Fix IWYU warnings in include/xmloff/*
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: Id20e0bc42e39f868a7c5d49d756f2ad5e14a86c0
Reviewed-on: https://gerrit.libreoffice.org/66637
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index da572744727a..90c1ccc7f77c 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -32,6 +32,7 @@
#include <com/sun/star/sdb/XFormDocumentsSupplier.hpp>
#include <com/sun/star/sdb/XReportDocumentsSupplier.hpp>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
+#include <com/sun/star/xml/sax/SAXException.hpp>
#include <comphelper/namedvaluecollection.hxx>
#include <cppuhelper/implbase.hxx>
diff --git a/dbaccess/source/filter/xml/xmlConnectionData.cxx b/dbaccess/source/filter/xml/xmlConnectionData.cxx
index d20fa42d75d4..41cd781b56c6 100644
--- a/dbaccess/source/filter/xml/xmlConnectionData.cxx
+++ b/dbaccess/source/filter/xml/xmlConnectionData.cxx
@@ -24,6 +24,7 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
+#include <xmloff/ProgressBarHelper.hxx>
#include "xmlEnums.hxx"
#include "xmlDatabaseDescription.hxx"
#include "xmlConnectionResource.hxx"
diff --git a/dbaccess/source/filter/xml/xmlDataSource.cxx b/dbaccess/source/filter/xml/xmlDataSource.cxx
index 6d67763b4b20..50b6b494abf2 100644
--- a/dbaccess/source/filter/xml/xmlDataSource.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSource.cxx
@@ -27,6 +27,7 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
+#include <xmloff/ProgressBarHelper.hxx>
#include "xmlEnums.hxx"
#include <stringconstants.hxx>
#include <strings.hxx>
diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
index e5defb425a0e..7d928d140949 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
@@ -29,6 +29,7 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
+#include <xmloff/ProgressBarHelper.hxx>
#include "xmlEnums.hxx"
#include <stringconstants.hxx>
#include <rtl/strbuf.hxx>
diff --git a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
index 71bea2183f0b..2b40d715f136 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
@@ -23,6 +23,7 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
+#include <xmloff/ProgressBarHelper.hxx>
#include "xmlEnums.hxx"
#include <stringconstants.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/dbaccess/source/filter/xml/xmlDatabase.cxx b/dbaccess/source/filter/xml/xmlDatabase.cxx
index 3bc805124a6b..62778fdb36d6 100644
--- a/dbaccess/source/filter/xml/xmlDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlDatabase.cxx
@@ -21,6 +21,7 @@
#include "xmlfilter.hxx"
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
+#include <xmloff/ProgressBarHelper.hxx>
#include "xmlDataSource.hxx"
#include "xmlDocuments.hxx"
#include "xmlEnums.hxx"
diff --git a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
index d449715e2d69..dbdd3b540642 100644
--- a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
+++ b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
@@ -23,6 +23,7 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
+#include <xmloff/ProgressBarHelper.hxx>
#include "xmlEnums.hxx"
#include "xmlFileBasedDatabase.hxx"
#include "xmlServerDatabase.hxx"
diff --git a/dbaccess/source/filter/xml/xmlDocuments.cxx b/dbaccess/source/filter/xml/xmlDocuments.cxx
index b34a524c72be..5edc6cd10106 100644
--- a/dbaccess/source/filter/xml/xmlDocuments.cxx
+++ b/dbaccess/source/filter/xml/xmlDocuments.cxx
@@ -21,6 +21,7 @@
#include "xmlfilter.hxx"
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
+#include <xmloff/ProgressBarHelper.hxx>
#include "xmlQuery.hxx"
#include "xmlTable.hxx"
#include "xmlComponent.hxx"
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 4a23c3d9f5be..1915b6815b91 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -37,6 +37,7 @@
#include "xmlEnums.hxx"
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/sdb/XFormDocumentsSupplier.hpp>
#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
#include <com/sun/star/sdb/XReportDocumentsSupplier.hpp>
diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx
index c28766d79a4d..dd795e3b8529 100644
--- a/dbaccess/source/filter/xml/xmlExport.hxx
+++ b/dbaccess/source/filter/xml/xmlExport.hxx
@@ -35,6 +35,7 @@
#include <unotools/localfilehelper.hxx>
#include <xmloff/xmlexp.hxx>
#include <xmloff/xmlimp.hxx>
+#include <xmloff/xmlexppr.hxx>
#include <dsntypes.hxx>
#include <comphelper/stl_types.hxx>
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
diff --git a/dbaccess/source/filter/xml/xmlHelper.cxx b/dbaccess/source/filter/xml/xmlHelper.cxx
index 16385e7d0df6..809f50d8ab8b 100644
--- a/dbaccess/source/filter/xml/xmlHelper.cxx
+++ b/dbaccess/source/filter/xml/xmlHelper.cxx
@@ -30,6 +30,7 @@
#include <stringconstants.hxx>
#include <strings.hxx>
#include "xmlEnums.hxx"
+#include <rtl/ref.hxx>
namespace dbaxml
{
diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
index a52c7b42f604..7b94d3f1176d 100644
--- a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
+++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
@@ -25,6 +25,7 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
+#include <xmloff/ProgressBarHelper.hxx>
#include "xmlEnums.hxx"
#include <stringconstants.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/dbaccess/source/filter/xml/xmlQuery.cxx b/dbaccess/source/filter/xml/xmlQuery.cxx
index fe52372459c6..a88e604c48ed 100644
--- a/dbaccess/source/filter/xml/xmlQuery.cxx
+++ b/dbaccess/source/filter/xml/xmlQuery.cxx
@@ -22,6 +22,7 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
+#include <xmloff/ProgressBarHelper.hxx>
#include "xmlEnums.hxx"
#include <stringconstants.hxx>
#include <strings.hxx>
diff --git a/dbaccess/source/filter/xml/xmlTable.cxx b/dbaccess/source/filter/xml/xmlTable.cxx
index 94c51199d802..7d574d09565e 100644
--- a/dbaccess/source/filter/xml/xmlTable.cxx
+++ b/dbaccess/source/filter/xml/xmlTable.cxx
@@ -22,6 +22,7 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
+#include <xmloff/ProgressBarHelper.hxx>
#include "xmlEnums.hxx"
#include "xmlStyleImport.hxx"
#include "xmlHierarchyCollection.hxx"
@@ -30,6 +31,8 @@
#include <ucbhelper/content.hxx>
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
+#include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
#include <comphelper/propertysequence.hxx>
namespace dbaxml
diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.cxx b/dbaccess/source/filter/xml/xmlTableFilterList.cxx
index 1267172df13e..e09a9482506a 100644
--- a/dbaccess/source/filter/xml/xmlTableFilterList.cxx
+++ b/dbaccess/source/filter/xml/xmlTableFilterList.cxx
@@ -23,6 +23,7 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
+#include <xmloff/ProgressBarHelper.hxx>
#include <stringconstants.hxx>
#include <strings.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 8b34d35f4be4..2ad43c7fd64f 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -23,6 +23,7 @@
#include <vcl/errinf.hxx>
#include <com/sun/star/uri/UriReferenceFactory.hpp>
#include <com/sun/star/util/MeasureUnit.hpp>
+#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/packages/WrongPasswordException.hpp>
#include <com/sun/star/packages/zip/ZipIOException.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
@@ -39,6 +40,7 @@
#include <xmloff/nmspmap.hxx>
#include <com/sun/star/xml/sax/InputSource.hpp>
#include <com/sun/star/xml/sax/Parser.hpp>
+#include <com/sun/star/xml/sax/SAXParseException.hpp>
#include <xmloff/ProgressBarHelper.hxx>
#include <sfx2/docfile.hxx>
#include <com/sun/star/io/XInputStream.hpp>
diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx
index 8489095c3595..c73230e94ff3 100644
--- a/dbaccess/source/filter/xml/xmlfilter.hxx
+++ b/dbaccess/source/filter/xml/xmlfilter.hxx
@@ -34,6 +34,7 @@
#include <unotools/tempfile.hxx>
#include <unotools/localfilehelper.hxx>
#include <xmloff/xmlimp.hxx>
+#include <xmloff/xmlprmap.hxx>
#include <map>
#include <memory>
diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.cxx b/editeng/source/misc/SvXMLAutoCorrectExport.cxx
index 5c41f5f63b46..8ebefccbe17f 100644
--- a/editeng/source/misc/SvXMLAutoCorrectExport.cxx
+++ b/editeng/source/misc/SvXMLAutoCorrectExport.cxx
@@ -20,6 +20,7 @@
#include "SvXMLAutoCorrectExport.hxx"
#include <com/sun/star/util/MeasureUnit.hpp>
+#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <xmloff/xmltoken.hxx>
using namespace ::com::sun::star::uno;
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 2ef3ab48523a..940ac0bae248 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -63,6 +63,7 @@
#include <com/sun/star/xml/sax/FastToken.hpp>
#include <com/sun/star/xml/sax/Writer.hpp>
#include <com/sun/star/xml/sax/FastTokenHandler.hpp>
+#include <com/sun/star/xml/sax/SAXParseException.hpp>
#include <unotools/streamwrap.hxx>
#include "SvXMLAutoCorrectImport.hxx"
#include "SvXMLAutoCorrectExport.hxx"
diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx
index b7de6f7b9c16..abeba94e1e6b 100644
--- a/editeng/source/xml/xmltxtexp.cxx
+++ b/editeng/source/xml/xmltxtexp.cxx
@@ -26,6 +26,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/io/XActiveDataSource.hpp>
#include <com/sun/star/xml/sax/Writer.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <svl/itemprop.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <sot/storage.hxx>
diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx
index fa7e84546609..6a8e87656fd3 100644
--- a/editeng/source/xml/xmltxtimp.cxx
+++ b/editeng/source/xml/xmltxtimp.cxx
@@ -24,6 +24,7 @@
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <com/sun/star/io/XOutputStream.hpp>
#include <com/sun/star/text/XText.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <comphelper/processfactory.hxx>
#include <unotools/streamwrap.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx
index 5eeebdab0707..7eeba2cf7ccd 100644
--- a/filter/source/t602/t602filter.hxx
+++ b/filter/source/t602/t602filter.hxx
@@ -31,6 +31,7 @@
#include <com/sun/star/lang/XLocalizable.hpp>
#include <com/sun/star/beans/XPropertyAccess.hpp>
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
+#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <cppuhelper/implbase.hxx>
#include <xmloff/attrlist.hxx>
#include <i18nlangtag/languagetag.hxx>
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index e9f6ccf7d8fe..d4f652f42911 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -436,3 +436,51 @@ blacklist:
include/toolkit/helper/macros.hxx:
# Needed for macros
- comphelper/servicehelper.hxx
+ include/xmloff/XMLEmbeddedObjectExportFilter.hxx:
+ # base class has to be a complete type
+ - com/sun/star/lang/XInitialization.hpp
+ - com/sun/star/lang/XServiceInfo.hpp
+ - com/sun/star/xml/sax/XExtendedDocumentHandler.hpp
+ include/xmloff/attrlist.hxx:
+ # base class has to be a complete type
+ - com/sun/star/lang/XUnoTunnel.hpp
+ - com/sun/star/util/XCloneable.hpp
+ - com/sun/star/xml/sax/XAttributeList.hpp
+ include/xmloff/fasttokenhandler.hxx:
+ # base class has to be a complete type
+ - com/sun/star/xml/sax/XFastTokenHandler.hpp
+ 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
+ - com/sun/star/lang/XUnoTunnel.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
+ - com/sun/star/lang/XServiceInfo.hpp
+ - com/sun/star/document/XExporter.hpp
+ - com/sun/star/lang/XInitialization.hpp
+ - com/sun/star/container/XNamed.hpp
+ - com/sun/star/lang/XUnoTunnel.hpp
+ include/xmloff/xmlmetae.hxx:
+ # base class has to be a complete type
+ - com/sun/star/xml/sax/XDocumentHandler.hpp
+ include/xmloff/xmlimp.hxx:
+ # base class has to be a complete type
+ - com/sun/star/document/XFilter.hpp
+ - com/sun/star/document/XImporter.hpp
+ - com/sun/star/lang/XInitialization.hpp
+ - com/sun/star/lang/XServiceInfo.hpp
+ - com/sun/star/lang/XUnoTunnel.hpp
+ - com/sun/star/xml/sax/XExtendedDocumentHandler.hpp
+ - com/sun/star/xml/sax/XFastDocumentHandler.hpp
+ - com/sun/star/xml/sax/XFastParser.hpp
+ include/xmloff/xmltabe.hxx:
+ # Needed for css shortcut
+ - sal/types.h
diff --git a/include/xmloff/AutoStyleEntry.hxx b/include/xmloff/AutoStyleEntry.hxx
index 7cca2d868ef4..c961e09f107a 100644
--- a/include/xmloff/AutoStyleEntry.hxx
+++ b/include/xmloff/AutoStyleEntry.hxx
@@ -12,8 +12,11 @@
#define INCLUDED_XMLOFF_AUTOSTYLEENTRY_HXX
#include <sal/config.h>
+#include <rtl/ustring.hxx>
+#include <com/sun/star/uno/Any.hxx>
#include <xmloff/dllapi.h>
-#include <memory>
+#include <utility>
+#include <vector>
namespace xmloff
{
diff --git a/include/xmloff/DocumentSettingsContext.hxx b/include/xmloff/DocumentSettingsContext.hxx
index 9fd34a38a44d..ca993b17efee 100644
--- a/include/xmloff/DocumentSettingsContext.hxx
+++ b/include/xmloff/DocumentSettingsContext.hxx
@@ -23,7 +23,6 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
#include <xmloff/xmlictxt.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
#include <memory>
diff --git a/include/xmloff/EnumPropertyHdl.hxx b/include/xmloff/EnumPropertyHdl.hxx
index 4d3e8c5e19fe..7256dd69ffa0 100644
--- a/include/xmloff/EnumPropertyHdl.hxx
+++ b/include/xmloff/EnumPropertyHdl.hxx
@@ -21,9 +21,9 @@
#define INCLUDED_XMLOFF_ENUMPROPERTYHDL_HXX
#include <xmloff/xmlprhdl.hxx>
-#include <com/sun/star/uno/Type.h>
#include <cppu/unotype.hxx>
-#include <xmloff/xmlement.hxx>
+
+template <typename EnumT> struct SvXMLEnumMapEntry;
/**
PropertyHandler for a generic xml enumeration type:
diff --git a/include/xmloff/GradientStyle.hxx b/include/xmloff/GradientStyle.hxx
index 58cc2e885377..e365d57560c8 100644
--- a/include/xmloff/GradientStyle.hxx
+++ b/include/xmloff/GradientStyle.hxx
@@ -22,7 +22,6 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
-#include <sal/types.h>
#include <rtl/ustring.hxx>
class SvXMLImport;
diff --git a/include/xmloff/HatchStyle.hxx b/include/xmloff/HatchStyle.hxx
index 6fe2dacc703b..f272ed161ed0 100644
--- a/include/xmloff/HatchStyle.hxx
+++ b/include/xmloff/HatchStyle.hxx
@@ -22,7 +22,6 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
-#include <sal/types.h>
#include <rtl/ustring.hxx>
class SvXMLImport;
diff --git a/include/xmloff/ImageStyle.hxx b/include/xmloff/ImageStyle.hxx
index 80f873d386fc..99d0d3394673 100644
--- a/include/xmloff/ImageStyle.hxx
+++ b/include/xmloff/ImageStyle.hxx
@@ -22,12 +22,12 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
-#include <sal/types.h>
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
+#include <rtl/ustring.hxx>
+
+namespace com { namespace sun { namespace star { namespace uno { class Any; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } }
-class SvXMLNamespaceMap;
-class SvXMLAttributeList;
-class SvXMLUnitConverter;
class SvXMLExport;
class SvXMLImport;
diff --git a/include/xmloff/MarkerStyle.hxx b/include/xmloff/MarkerStyle.hxx
index 679c4706eb34..2f2df0570640 100644
--- a/include/xmloff/MarkerStyle.hxx
+++ b/include/xmloff/MarkerStyle.hxx
@@ -22,7 +22,6 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
-#include <sal/types.h>
#include <rtl/ustring.hxx>
class SvXMLImport;
diff --git a/include/xmloff/NamedBoolPropertyHdl.hxx b/include/xmloff/NamedBoolPropertyHdl.hxx
index 05f7489f4d7a..d5fe6eb83927 100644
--- a/include/xmloff/NamedBoolPropertyHdl.hxx
+++ b/include/xmloff/NamedBoolPropertyHdl.hxx
@@ -22,7 +22,6 @@
#include <xmloff/xmlprhdl.hxx>
#include <xmloff/xmltoken.hxx>
-#include <xmloff/xmlement.hxx>
/**
PropertyHandler for a named xml bool type:
diff --git a/include/xmloff/SchXMLExportHelper.hxx b/include/xmloff/SchXMLExportHelper.hxx
index 38544067c63d..dbabc6932ea1 100644
--- a/include/xmloff/SchXMLExportHelper.hxx
+++ b/include/xmloff/SchXMLExportHelper.hxx
@@ -21,16 +21,9 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
-#include <sal/types.h>
+#include <rtl/ustring.hxx>
#include <salhelper/simplereferenceobject.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <com/sun/star/util/XStringMapping.hpp>
-#include <com/sun/star/awt/Size.hpp>
-#include <com/sun/star/awt/Point.hpp>
-#include <xmloff/xmlprmap.hxx>
-#include <queue>
-#include <vector>
#include <memory>
class SvXMLAutoStylePoolP;
diff --git a/include/xmloff/SchXMLImportHelper.hxx b/include/xmloff/SchXMLImportHelper.hxx
index a842fd470560..e6ffd80f543f 100644
--- a/include/xmloff/SchXMLImportHelper.hxx
+++ b/include/xmloff/SchXMLImportHelper.hxx
@@ -23,35 +23,27 @@
#include <salhelper/simplereferenceobject.hxx>
#include <xmloff/families.hxx>
-#include <com/sun/star/util/XStringMapping.hpp>
-#include <com/sun/star/chart/XChartDocument.hpp>
+#include <xmloff/xmltkmap.hxx>
+
+namespace com { namespace sun { namespace star { namespace chart { class XChartDocument; } } } }
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
namespace com { namespace sun { namespace star {
namespace frame {
class XModel;
}
- namespace task {
- class XStatusIndicator;
- }
namespace xml {
namespace sax {
class XAttributeList;
}
}
namespace chart2 {
- namespace data {
- class XDataProvider;
- class XLabeledDataSequence;
- }
class XChartDocument;
class XDataSeries;
}
}}}
-class SvXMLUnitConverter;
class SvXMLStylesContext;
-class XMLChartImportPropertyMapper;
-class SvXMLTokenMap;
class SvXMLImportContext;
class SvXMLImport;
diff --git a/include/xmloff/SchXMLSeriesHelper.hxx b/include/xmloff/SchXMLSeriesHelper.hxx
index 567ad0c4c2b6..c8857ae06370 100644
--- a/include/xmloff/SchXMLSeriesHelper.hxx
+++ b/include/xmloff/SchXMLSeriesHelper.hxx
@@ -20,17 +20,17 @@
#ifndef INCLUDED_XMLOFF_SCHXMLSERIESHELPER_HXX
#define INCLUDED_XMLOFF_SCHXMLSERIESHELPER_HXX
-#include <com/sun/star/chart2/data/XDataSequence.hpp>
-#include <com/sun/star/chart2/data/XDataSource.hpp>
-#include <com/sun/star/chart2/XDataSeries.hpp>
-#include <com/sun/star/chart2/XDiagram.hpp>
-#include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/uno/Reference.hxx>
#include <xmloff/dllapi.h>
#include <vector>
#include <map>
-#include <iterator>
+
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { class XDiagram; } } } }
+namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
class XMLOFF_DLLPUBLIC SchXMLSeriesHelper
{
diff --git a/include/xmloff/SettingsExportHelper.hxx b/include/xmloff/SettingsExportHelper.hxx
index ff503b2b2749..505ecce1b00a 100644
--- a/include/xmloff/SettingsExportHelper.hxx
+++ b/include/xmloff/SettingsExportHelper.hxx
@@ -22,10 +22,11 @@
#include <xmloff/dllapi.h>
-#include <com/sun/star/awt/Rectangle.hpp>
-#include <com/sun/star/formula/SymbolDescriptor.hpp>
-#include <com/sun/star/util/XStringSubstitution.hpp>
-#include <xmloff/xmlexp.hxx>
+#include <com/sun/star/uno/Reference.hxx>
+
+namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+namespace com { namespace sun { namespace star { namespace formula { struct SymbolDescriptor; } } } }
+namespace com { namespace sun { namespace star { namespace util { class XStringSubstitution; } } } }
namespace com
{
diff --git a/include/xmloff/SinglePropertySetInfoCache.hxx b/include/xmloff/SinglePropertySetInfoCache.hxx
index 6a15d2c348c8..75ec174f5b92 100644
--- a/include/xmloff/SinglePropertySetInfoCache.hxx
+++ b/include/xmloff/SinglePropertySetInfoCache.hxx
@@ -24,7 +24,10 @@
#include <map>
-#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySetInfo; } } } }
class SinglePropertySetInfoCache
{
diff --git a/include/xmloff/WordWrapPropertyHdl.hxx b/include/xmloff/WordWrapPropertyHdl.hxx
index 81b681674084..5552958feefc 100644
--- a/include/xmloff/WordWrapPropertyHdl.hxx
+++ b/include/xmloff/WordWrapPropertyHdl.hxx
@@ -21,8 +21,6 @@
#define INCLUDED_XMLOFF_WORDWRAPPROPERTYHDL_HXX
#include <xmloff/xmlprhdl.hxx>
-#include <xmloff/xmltoken.hxx>
-#include <xmloff/xmlement.hxx>
/**
PropertyHandler for a named xml bool type:
diff --git a/include/xmloff/XMLBase64ImportContext.hxx b/include/xmloff/XMLBase64ImportContext.hxx
index 1c347b3fbf82..0c3e4ac2075d 100644
--- a/include/xmloff/XMLBase64ImportContext.hxx
+++ b/include/xmloff/XMLBase64ImportContext.hxx
@@ -22,9 +22,10 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <xmloff/xmlictxt.hxx>
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } }
+
namespace com { namespace sun { namespace star { namespace io {
class XOutputStream; } } } }
diff --git a/include/xmloff/XMLCharContext.hxx b/include/xmloff/XMLCharContext.hxx
index 584d993d6563..282421458820 100644
--- a/include/xmloff/XMLCharContext.hxx
+++ b/include/xmloff/XMLCharContext.hxx
@@ -20,9 +20,10 @@
#define INCLUDED_XMLOFF_XMLCHARCONTEXT_HXX
#include <xmloff/dllapi.h>
-#include <com/sun/star/uno/Reference.h>
#include <xmloff/xmlictxt.hxx>
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+
class XMLOFF_DLLPUBLIC XMLCharContext : public SvXMLImportContext
{
XMLCharContext(const XMLCharContext&) = delete;
diff --git a/include/xmloff/XMLEventExport.hxx b/include/xmloff/XMLEventExport.hxx
index 8dba84465ace..98caf8502232 100644
--- a/include/xmloff/XMLEventExport.hxx
+++ b/include/xmloff/XMLEventExport.hxx
@@ -23,8 +23,6 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
#include <sal/types.h>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/Reference.hxx>
#include <rtl/ustring.hxx>
#include <xmloff/xmlevent.hxx>
@@ -39,6 +37,9 @@ namespace com { namespace sun { namespace star {
namespace beans { struct PropertyValue; }
} } }
+namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
+
typedef ::std::map< OUString, std::unique_ptr<XMLEventExportHandler> > HandlerMap;
typedef ::std::map< OUString, XMLEventName > NameMap;
diff --git a/include/xmloff/XMLEventsImportContext.hxx b/include/xmloff/XMLEventsImportContext.hxx
index ee45e1b95f0e..0dd1a0194f4b 100644
--- a/include/xmloff/XMLEventsImportContext.hxx
+++ b/include/xmloff/XMLEventsImportContext.hxx
@@ -23,11 +23,8 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
#include <xmloff/xmlictxt.hxx>
-#include <xmloff/xmlevent.hxx>
-#include <map>
#include <vector>
namespace com { namespace sun { namespace star {
@@ -37,6 +34,8 @@ namespace com { namespace sun { namespace star {
namespace document { class XEventsSupplier; }
} } }
+namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } }
+
typedef ::std::pair<
OUString,
css::uno::Sequence<css::beans::PropertyValue> > EventNameValuesPair;
diff --git a/include/xmloff/XMLGraphicsDefaultStyle.hxx b/include/xmloff/XMLGraphicsDefaultStyle.hxx
index 816ff0db2f46..a52e2745a9b4 100644
--- a/include/xmloff/XMLGraphicsDefaultStyle.hxx
+++ b/include/xmloff/XMLGraphicsDefaultStyle.hxx
@@ -24,11 +24,6 @@
#include <xmloff/dllapi.h>
#include <xmloff/prstylei.hxx>
-namespace com { namespace sun { namespace star { namespace container
-{
- class XNameContainer;
-} } } }
-
class XMLOFF_DLLPUBLIC XMLGraphicsDefaultStyle : public XMLPropStyleContext
{
public:
diff --git a/include/xmloff/XMLPageExport.hxx b/include/xmloff/XMLPageExport.hxx
index 4df54310e731..818b79b66c24 100644
--- a/include/xmloff/XMLPageExport.hxx
+++ b/include/xmloff/XMLPageExport.hxx
@@ -25,14 +25,13 @@
#include <sal/types.h>
#include <rtl/ustring.hxx>
#include <vector>
-#include <xmloff/attrlist.hxx>
#include <rtl/ref.hxx>
#include <salhelper/simplereferenceobject.hxx>
-#include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/uno/Reference.hxx>
namespace com { namespace sun { namespace star {
namespace style { class XStyle; }
- namespace container { class XIndexReplace; class XNameAccess;}
+ namespace container { class XNameAccess;}
namespace beans { class XPropertySet; }
} } }
diff --git a/include/xmloff/XMLSettingsExportContext.hxx b/include/xmloff/XMLSettingsExportContext.hxx
index 542333942a9c..aad2db51ecd8 100644
--- a/include/xmloff/XMLSettingsExportContext.hxx
+++ b/include/xmloff/XMLSettingsExportContext.hxx
@@ -20,10 +20,10 @@
#ifndef INCLUDED_XMLOFF_XMLSETTINGSEXPORTCONTEXT_HXX
#define INCLUDED_XMLOFF_XMLSETTINGSEXPORTCONTEXT_HXX
-#include <com/sun/star/uno/XComponentContext.hpp>
-
#include <xmloff/xmltoken.hxx>
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+
namespace xmloff
{
diff --git a/include/xmloff/XMLShapeStyleContext.hxx b/include/xmloff/XMLShapeStyleContext.hxx
index a0eace1100a9..15f754d04db9 100644
--- a/include/xmloff/XMLShapeStyleContext.hxx
+++ b/include/xmloff/XMLShapeStyleContext.hxx
@@ -23,7 +23,6 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
#include <xmloff/prstylei.hxx>
-#include <xmloff/families.hxx>
class SvXMLImport;
diff --git a/include/xmloff/XMLTextListAutoStylePool.hxx b/include/xmloff/XMLTextListAutoStylePool.hxx
index 3b6ba2906c13..dc3690802b2a 100644
--- a/include/xmloff/XMLTextListAutoStylePool.hxx
+++ b/include/xmloff/XMLTextListAutoStylePool.hxx
@@ -24,12 +24,13 @@
#include <xmloff/dllapi.h>
#include <sal/types.h>
#include <rtl/ustring.hxx>
-#include <com/sun/star/ucb/XAnyCompare.hpp>
+#include <com/sun/star/uno/Reference.hxx>
#include <memory>
#include <set>
namespace com { namespace sun { namespace star { namespace container {
class XIndexReplace; } } } }
+namespace com { namespace sun { namespace star { namespace ucb { class XAnyCompare; } } } }
class XMLTextListAutoStylePool_Impl;
diff --git a/include/xmloff/XMLTextMasterPageExport.hxx b/include/xmloff/XMLTextMasterPageExport.hxx
index c56e90116c31..907652e898e5 100644
--- a/include/xmloff/XMLTextMasterPageExport.hxx
+++ b/include/xmloff/XMLTextMasterPageExport.hxx
@@ -22,8 +22,6 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
-#include <rtl/ustring.hxx>
-#include <xmloff/attrlist.hxx>
#include <xmloff/XMLPageExport.hxx>
namespace com { namespace sun { namespace star {
diff --git a/include/xmloff/XMLTextTableContext.hxx b/include/xmloff/XMLTextTableContext.hxx
index 6077ccd5ae18..f781ee102f43 100644
--- a/include/xmloff/XMLTextTableContext.hxx
+++ b/include/xmloff/XMLTextTableContext.hxx
@@ -24,10 +24,6 @@
#include <xmloff/dllapi.h>
#include <xmloff/xmlictxt.hxx>
-namespace com { namespace sun { namespace star {
- namespace text { class XTextContent; }
-} } }
-
class XMLOFF_DLLPUBLIC XMLTextTableContext : public SvXMLImportContext
{
diff --git a/include/xmloff/animationexport.hxx b/include/xmloff/animationexport.hxx
index 10bbd50fae31..b50f5ae53dff 100644
--- a/include/xmloff/animationexport.hxx
+++ b/include/xmloff/animationexport.hxx
@@ -22,13 +22,14 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
-#include <sal/types.h>
-#include <com/sun/star/animations/XAnimationNode.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
#include <salhelper/simplereferenceobject.hxx>
#include <memory>
+namespace com { namespace sun { namespace star { namespace animations { class XAnimationNode; } } } }
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+
class SvXMLExport;
namespace xmloff
diff --git a/include/xmloff/animexp.hxx b/include/xmloff/animexp.hxx
index 78c23e416c66..9dfdbc6bdccf 100644
--- a/include/xmloff/animexp.hxx
+++ b/include/xmloff/animexp.hxx
@@ -20,10 +20,12 @@
#ifndef INCLUDED_XMLOFF_ANIMEXP_HXX
#define INCLUDED_XMLOFF_ANIMEXP_HXX
-#include <com/sun/star/drawing/XShape.hpp>
#include <salhelper/simplereferenceobject.hxx>
#include <memory>
+namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+
class AnimExpImpl;
class SvXMLExport;
class XMLShapeExport;
diff --git a/include/xmloff/attrlist.hxx b/include/xmloff/attrlist.hxx
index 5bd306400406..0d8aa945c4c4 100644
--- a/include/xmloff/attrlist.hxx
+++ b/include/xmloff/attrlist.hxx
@@ -23,12 +23,7 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
#include <com/sun/star/util/XCloneable.hpp>
-#include <com/sun/star/xml/sax/SAXParseException.hpp>
-#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
-#include <com/sun/star/xml/sax/SAXException.hpp>
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <com/sun/star/xml/sax/XAttributeList.hpp>
-#include <com/sun/star/xml/sax/XLocator.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <cppuhelper/implbase.hxx>
diff --git a/include/xmloff/controlpropertyhdl.hxx b/include/xmloff/controlpropertyhdl.hxx
index 8aec6d46178d..141111816dad 100644
--- a/include/xmloff/controlpropertyhdl.hxx
+++ b/include/xmloff/controlpropertyhdl.hxx
@@ -26,23 +26,14 @@
#include <xmloff/dllapi.h>
#include <xmloff/prhdlfac.hxx>
-#include <rtl/ref.hxx>
#include <rtl/ustring.hxx>
-#include <xmloff/xmlexppr.hxx>
#include <xmloff/XMLConstantsPropertyHandler.hxx>
#include <xmloff/NamedBoolPropertyHdl.hxx>
-template<typename EnumT> struct SvXMLEnumMapEntry;
-class Color;
-
namespace xmloff
{
- class IFormsExportContext;
- class OFormLayerXMLImport_Impl;
-
-
//= ORotationAngleHandler
class ORotationAngleHandler : public XMLPropertyHandler
diff --git a/include/xmloff/formlayerexport.hxx b/include/xmloff/formlayerexport.hxx
index 1e0da3dde3ba..abe6f30ad943 100644
--- a/include/xmloff/formlayerexport.hxx
+++ b/include/xmloff/formlayerexport.hxx
@@ -22,18 +22,18 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
-#include <com/sun/star/drawing/XDrawPage.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <rtl/ref.hxx>
+#include <rtl/ustring.hxx>
#include <salhelper/simplereferenceobject.hxx>
-#include <xmloff/xmlexppr.hxx>
#include <memory>
namespace com { namespace sun { namespace star { namespace awt {
class XControlModel;
} } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+
class SvXMLExport;
namespace xmloff
diff --git a/include/xmloff/formlayerimport.hxx b/include/xmloff/formlayerimport.hxx
index cbb9dbfe477b..1835528873fe 100644
--- a/include/xmloff/formlayerimport.hxx
+++ b/include/xmloff/formlayerimport.hxx
@@ -22,18 +22,17 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
-#include <com/sun/star/drawing/XDrawPage.hpp>
-#include <com/sun/star/xml/sax/XAttributeList.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <rtl/ref.hxx>
+#include <com/sun/star/uno/Reference.hxx>
#include <salhelper/simplereferenceobject.hxx>
-#include <xmloff/xmlimppr.hxx>
#include <memory>
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } }
+
class SvXMLImport;
class SvXMLImportContext;
class SvXMLStylesContext;
-class XMLPropStyleContext;
namespace xmloff
diff --git a/include/xmloff/numehelp.hxx b/include/xmloff/numehelp.hxx
index b60da6822661..9e0292e6380e 100644
--- a/include/xmloff/numehelp.hxx
+++ b/include/xmloff/numehelp.hxx
@@ -24,10 +24,13 @@
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/dllapi.h>
#include <sal/types.h>
-#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
+#include <com/sun/star/uno/Reference.hxx>
#include <set>
+namespace com { namespace sun { namespace star { namespace util { class XNumberFormats; } } } }
+namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; } } } }
+
class SvXMLExport;
struct XMLNumberFormat
diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx
index 8b506b6dc4ad..db1700cb9e2f 100644
--- a/include/xmloff/prstylei.hxx
+++ b/include/xmloff/prstylei.hxx
@@ -22,19 +22,19 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
#include <sal/types.h>
-#include <com/sun/star/style/XStyle.hpp>
#include <vector>
#include <xmloff/xmlstyle.hxx>
#include <unordered_set>
struct XMLPropertyState;
-class SvXMLStylesContext;
namespace com { namespace sun { namespace star {
namespace beans { class XPropertySet; }
} } }
+namespace com { namespace sun { namespace star { namespace style { class XStyle; } } } }
+
typedef std::unordered_set<OUString> OldFillStyleDefinitionSet;
class XMLOFF_DLLPUBLIC XMLPropStyleContext : public SvXMLStyleContext
diff --git a/include/xmloff/settingsstore.hxx b/include/xmloff/settingsstore.hxx
index 0878a5ec288f..2cd0bc196e04 100644
--- a/include/xmloff/settingsstore.hxx
+++ b/include/xmloff/settingsstore.hxx
@@ -12,9 +12,11 @@
#ifndef INCLUDED_XMLOFF_SETTINGSSTORE_HXX
#define INCLUDED_XMLOFF_SETTINGSSTORE_HXX
-#include <vector>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/embed/XStorage.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
+
+namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+namespace com { namespace sun { namespace star { namespace embed { class XStorage; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
// Scans list of properties for certain URL properties that could refer
// to internal objects, and initializes from these.
diff --git a/include/xmloff/shapeexport.hxx b/include/xmloff/shapeexport.hxx
index 6dbbde2b8b82..13cd97505fab 100644
--- a/include/xmloff/shapeexport.hxx
+++ b/include/xmloff/shapeexport.hxx
@@ -28,20 +28,20 @@
#include <rtl/ustrbuf.hxx>
#include <salhelper/simplereferenceobject.hxx>
-#include <com/sun/star/drawing/XShape.hpp>
-#include <com/sun/star/drawing/XShapes.hpp>
-#include <com/sun/star/awt/Point.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-
#include <map>
-#include <xmloff/xmlprmap.hxx>
-#include <xmloff/xmlexppr.hxx>
#include <xmloff/animexp.hxx>
#include <xmloff/families.hxx>
#include <xmloff/txtparae.hxx>
#include <o3tl/typed_flags_set.hxx>
-#include <xmloff/table/XMLTableExport.hxx>
+namespace com { namespace sun { namespace star { namespace awt { struct Point; } } } }
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } }
+
+class XMLTableExport;
+class SvXMLAttributeList;
+class XMLPropertyHandlerFactory;
// shape export features are bits used for the nFeature
// parameter of XMLShapeExport::exportShape
diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx
index 1bc00431d51d..0bf3999dcb9e 100644
--- a/include/xmloff/shapeimport.hxx
+++ b/include/xmloff/shapeimport.hxx
@@ -22,28 +22,28 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/xml/sax/XAttributeList.hpp>
-#include <com/sun/star/drawing/XShapes.hpp>
#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 <xmloff/table/XMLTableImport.hxx>
#include <basegfx/vector/b3dvector.hxx>
#include <vector>
#include <memory>
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } }
+namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } }
+
class SvXMLImport;
-class SvXMLImportContext;
class SvXMLTokenMap;
class SvXMLStylesContext;
class XMLSdPropHdlFactory;
-class XMLPropertySetMapper;
class SvXMLImportPropertyMapper;
+class XMLTableImport;
enum SdXMLGroupShapeElemTokenMap
@@ -213,7 +213,6 @@ public:
};
-class ShapeSortContext;
struct XMLShapeImportHelperImpl;
struct XMLShapeImportPageContextImpl;
diff --git a/include/xmloff/styleexp.hxx b/include/xmloff/styleexp.hxx
index 66a23053005e..84f687713911 100644
--- a/include/xmloff/styleexp.hxx
+++ b/include/xmloff/styleexp.hxx
@@ -21,12 +21,13 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
-#include <rtl/ref.hxx>
#include <rtl/ustring.hxx>
-#include <com/sun/star/uno/Reference.h>
#include <salhelper/simplereferenceobject.hxx>
+namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+namespace rtl { template <class reference_type> class Reference; }
+
namespace com { namespace sun { namespace star
{
namespace style
@@ -44,7 +45,6 @@ namespace com { namespace sun { namespace star
} } }
-class XMLPropertySetMapper;
class SvXMLExportPropertyMapper;
class SvXMLAutoStylePoolP;
class SvXMLExport;
diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx
index 2caeff3ea689..596d09352b82 100644
--- a/include/xmloff/txtimp.hxx
+++ b/include/xmloff/txtimp.hxx
@@ -22,28 +22,24 @@
#include <sal/config.h>
#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>
-#include <xmloff/xmltkmap.hxx>
-#include <rtl/ref.hxx>
#include <salhelper/simplereferenceobject.hxx>
class XMLTextListsHelper;
class SvXMLImportContext;
class SvXMLTokenMap;
class SvXMLImportPropertyMapper;
-class SvXMLNamespaceMap;
class SvXMLImport;
class SvXMLStylesContext;
-class XMLTextListBlockContext;
class SvxXMLListStyleContext;
class XMLPropStyleContext;
class SvI18NMap;
-class XMLSectionImportContext;
-class XMLFontStylesContext;
template<class A> class XMLPropertyBackpatcher;
class XMLEventsImportContext;
@@ -60,13 +56,14 @@ namespace text {
class XFormField;
}
namespace frame { class XModel; }
-namespace container { class XNameContainer; class XIndexReplace; class XNameAccess; }
+namespace container { class XNameContainer; class XIndexReplace; }
namespace beans { class XPropertySet; }
namespace xml { namespace sax { class XAttributeList; } }
namespace util { struct DateTime; }
-namespace lang { class XMultiServiceFactory; }
} } }
+namespace rtl { template <class reference_type> class Reference; }
+
enum SwXMLTextElemTokens
{
XML_TOK_TEXT_P,
diff --git a/include/xmloff/txtimppr.hxx b/include/xmloff/txtimppr.hxx
index 3786de22f478..377a032edb19 100644
--- a/include/xmloff/txtimppr.hxx
+++ b/include/xmloff/txtimppr.hxx
@@ -23,8 +23,6 @@
#include <xmloff/xmlimppr.hxx>
#include <memory>
-class XMLFontStylesContext;
-
class XMLOFF_DLLPUBLIC XMLTextImportPropertyMapper : public SvXMLImportPropertyMapper
{
sal_Int32 nSizeTypeIndex;
diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx
index 5b2099714c0d..b85f78f1dbfe 100644
--- a/include/xmloff/txtparae.hxx
+++ b/include/xmloff/txtparae.hxx
@@ -21,11 +21,10 @@
#define INCLUDED_XMLOFF_TXTPARAE_HXX
#include <sal/config.h>
+#include <rtl/ref.hxx>
#include <xmloff/dllapi.h>
#include <rtl/ustring.hxx>
#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <xmloff/xmlexppr.hxx>
#include <xmloff/styleexp.hxx>
#include <xmloff/xmltoken.hxx>
#include <xmloff/SinglePropertySetInfoCache.hxx>
@@ -38,23 +37,22 @@ class SvXMLExport;
class SvXMLAutoStylePoolP;
class XMLTextFieldExport;
class XMLTextNumRuleInfo;
-class XMLTextListAutoStylePool;
class XMLSectionExport;
class XMLIndexMarkExport;
class XMLRedlineExport;
struct XMLPropertyState;
class MultiPropertySetHelper;
enum class XMLShapeExportFlags;
+class SvXMLExportPropertyMapper;
namespace com { namespace sun { namespace star
{
namespace beans { class XPropertySet; class XPropertyState;
class XPropertySetInfo; }
- namespace container { class XEnumerationAccess; class XEnumeration; class XIndexAccess; }
+ namespace container { class XEnumeration; class XIndexAccess; }
namespace text { class XTextContent; class XTextRange; class XText;
class XFootnote; class XTextFrame; class XTextSection;
- class XTextField;
- class XDocumentIndex; class XTextShapesSupplier; }
+ class XTextField; }
} } }
namespace xmloff
diff --git a/include/xmloff/txtstyli.hxx b/include/xmloff/txtstyli.hxx
index 85efa3f79d7c..be117980df59 100644
--- a/include/xmloff/txtstyli.hxx
+++ b/include/xmloff/txtstyli.hxx
@@ -23,7 +23,6 @@
#include <xmloff/dllapi.h>
#include <xmloff/prstylei.hxx>
-class SvXMLTokenMap;
class XMLEventsImportContext;
class XMLOFF_DLLPUBLIC XMLTextStyleContext : public XMLPropStyleContext
diff --git a/include/xmloff/unoatrcn.hxx b/include/xmloff/unoatrcn.hxx
index 54b2db7841ef..4880f74fde7c 100644
--- a/include/xmloff/unoatrcn.hxx
+++ b/include/xmloff/unoatrcn.hxx
@@ -26,7 +26,6 @@
#include <xmloff/dllapi.h>
#include <sal/types.h>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
diff --git a/include/xmloff/xformsexport.hxx b/include/xmloff/xformsexport.hxx
index 5fb10ec782e0..5911d4a0c41f 100644
--- a/include/xmloff/xformsexport.hxx
+++ b/include/xmloff/xformsexport.hxx
@@ -26,7 +26,6 @@ class SvXMLExport;
namespace com { namespace sun { namespace star {
namespace uno { template<typename T> class Reference; }
namespace uno { template<typename T> class Sequence; }
- namespace frame { class XModel; }
namespace beans { class XPropertySet; struct PropertyValue; }
namespace container { class XNameAccess; }
} } }
diff --git a/include/xmloff/xformsimport.hxx b/include/xmloff/xformsimport.hxx
index 99c511790883..5975ea993416 100644
--- a/include/xmloff/xformsimport.hxx
+++ b/include/xmloff/xformsimport.hxx
@@ -21,14 +21,14 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
-
-#include <com/sun/star/uno/Reference.hxx>
+#include <rtl/ustring.hxx>
class SvXMLImport;
class SvXMLImportContext;
namespace com { namespace sun { namespace star {
namespace uno { template<typename T> class Reference; }
+ namespace uno { template <typename > class Sequence; }
namespace beans { class XPropertySet; struct PropertyValue; }
namespace frame { class XModel; }
namespace container { class XNameAccess; }
diff --git a/include/xmloff/xmlaustp.hxx b/include/xmloff/xmlaustp.hxx
index 1d708ad12806..6902dd9aa106 100644
--- a/include/xmloff/xmlaustp.hxx
+++ b/include/xmloff/xmlaustp.hxx
@@ -22,21 +22,29 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#include <xmloff/xmlprmap.hxx>
-#include <xmloff/AutoStyleEntry.hxx>
+#include <rtl/ustring.hxx>
#include <salhelper/simplereferenceobject.hxx>
#include <memory>
+#include <vector>
class SvXMLExportPropertyMapper;
class SvXMLNamespaceMap;
class SvXMLAutoStylePoolP_Impl;
class SvXMLAttributeList;
class SvXMLExport;
+class SvXMLUnitConverter;
+struct XMLPropertyState;
+
namespace com { namespace sun { namespace star { namespace uno
{ template<typename A> class Sequence; }
} } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XDocumentHandler; } } } } }
+namespace xmloff { struct AutoStyleEntry; }
+namespace rtl { template <class reference_type> class Reference; }
+
class XMLOFF_DLLPUBLIC SvXMLAutoStylePoolP : public salhelper::SimpleReferenceObject
{
friend class Test;
diff --git a/include/xmloff/xmlerror.hxx b/include/xmloff/xmlerror.hxx
index 3a7c2b20d256..f6b0479c0a30 100644
--- a/include/xmloff/xmlerror.hxx
+++ b/include/xmloff/xmlerror.hxx
@@ -20,8 +20,8 @@
#ifndef INCLUDED_XMLOFF_XMLERROR_HXX
#define INCLUDED_XMLOFF_XMLERROR_HXX
-#include <com/sun/star/xml/sax/SAXParseException.hpp>
#include <sal/types.h>
+#include <rtl/ustring.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <vector>
diff --git a/include/xmloff/xmlevent.hxx b/include/xmloff/xmlevent.hxx
index 811cd719c789..d300c8d06679 100644
--- a/include/xmloff/xmlevent.hxx
+++ b/include/xmloff/xmlevent.hxx
@@ -20,8 +20,10 @@
#ifndef INCLUDED_XMLOFF_XMLEVENT_HXX
#define INCLUDED_XMLOFF_XMLEVENT_HXX
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/Reference.hxx>
+#include <rtl/ustring.hxx>
+
+namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
/**
diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx
index 89ebac095657..7bed9eb22643 100644
--- a/include/xmloff/xmlexp.hxx
+++ b/include/xmloff/xmlexp.hxx
@@ -24,16 +24,9 @@
#include <xmloff/dllapi.h>
#include <sal/types.h>
-#include <com/sun/star/embed/XStorage.hpp>
-#include <com/sun/star/xml/sax/SAXParseException.hpp>
-#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
-#include <com/sun/star/xml/sax/SAXException.hpp>
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#include <com/sun/star/xml/sax/XAttributeList.hpp>
-#include <com/sun/star/xml/sax/XLocator.hpp>
-#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <rtl/ustring.hxx>
+#include <xmloff/attrlist.hxx>
#include <xmloff/txtparae.hxx>
#include <xmloff/formlayerexport.hxx>
#include <xmloff/xmlnumfe.hxx>
@@ -46,35 +39,38 @@
#include <com/sun/star/document/XFilter.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/document/XExporter.hpp>
-#include <com/sun/star/document/XGraphicStorageHandler.hpp>
-#include <com/sun/star/document/XEmbeddedObjectResolver.hpp>
-#include <com/sun/star/graphic/XGraphic.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/XEventListener.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/container/XNamed.hpp>
#include <unotools/saveopt.hxx>
#include <xmloff/XMLPageExport.hxx>
-#include <xmloff/ProgressBarHelper.hxx>
#include <cppuhelper/implbase.hxx>
#include <tools/fldunit.hxx>
#include <vcl/errcode.hxx>
-#include <list>
#include <vector>
#include <memory>
#include <o3tl/typed_flags_set.hxx>
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace document { class XEmbeddedObjectResolver; } } } }
+namespace com { namespace sun { namespace star { namespace document { class XGraphicStorageHandler; } } } }
+namespace com { namespace sun { namespace star { namespace embed { class XStorage; } } } }
+namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; } } } }
+namespace com { namespace sun { namespace star { namespace lang { class XEventListener; } } } }
+namespace com { namespace sun { namespace star { namespace task { class XStatusIndicator; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; } } } }
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } }
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XDocumentHandler; } } } } }
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XExtendedDocumentHandler; } } } } }
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XLocator; } } } } }
+
class SvXMLNamespaceMap;
-class SvXMLAttributeList;
class SvXMLExport_Impl;
-class SvXMLUnitConverter;
class ProgressBarHelper;
class XMLEventExport;
-class XMLSettingsExportHelper;
class XMLImageMapExport;
class XMLErrors;
class LanguageTag;
@@ -85,7 +81,6 @@ enum class SvXMLErrorFlags;
namespace com { namespace sun { namespace star {
namespace frame { class XModel; }
- namespace container { class XIndexContainer; }
namespace lang { struct Locale; }
} } }
namespace comphelper { class UnoInterfaceToUniqueIdentifierMapper; }
diff --git a/include/xmloff/xmlexppr.hxx b/include/xmloff/xmlexppr.hxx
index 770572c3bd99..28be918474ee 100644
--- a/include/xmloff/xmlexppr.hxx
+++ b/include/xmloff/xmlexppr.hxx
@@ -20,15 +20,21 @@
#ifndef INCLUDED_XMLOFF_XMLEXPPR_HXX
#define INCLUDED_XMLOFF_XMLEXPPR_HXX
-#include <rtl/ref.hxx>
#include <sal/config.h>
#include <xmloff/dllapi.h>
-#include <xmloff/xmlprmap.hxx>
#include <salhelper/simplereferenceobject.hxx>
#include <o3tl/typed_flags_set.hxx>
+#include <rtl/ustring.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
#include <memory>
+#include <vector>
+
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace rtl { template <class reference_type> class Reference; }
+
+class XMLPropertySetMapper;
+struct XMLPropertyState;
enum class SvXmlExportFlags {
NONE = 0x0000,
@@ -42,7 +48,6 @@ namespace o3tl
class SvXMLUnitConverter;
class SvXMLAttributeList;
class SvXMLNamespaceMap;
-class FilterPropertiesInfos_Impl;
class SvXMLExport;
class XMLOFF_DLLPUBLIC SvXMLExportPropertyMapper : public salhelper::SimpleReferenceObject
diff --git a/include/xmloff/xmlictxt.hxx b/include/xmloff/xmlictxt.hxx
index 6a15d4e7c589..bc3943cefb6a 100644
--- a/include/xmloff/xmlictxt.hxx
+++ b/include/xmloff/xmlictxt.hxx
@@ -23,15 +23,14 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
#include <sal/types.h>
-#include <com/sun/star/xml/sax/XAttributeList.hpp>
#include <com/sun/star/xml/sax/XFastContextHandler.hpp>
-#include <tools/ref.hxx>
#include <rtl/ustring.hxx>
#include <cppuhelper/implbase.hxx>
#include <xmloff/nmspmap.hxx>
#include <memory>
-class SvXMLNamespaceMap;
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } }
+
class SvXMLImport;
class SvXMLImportContext;
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 39415336591a..885bab2ab1fe 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -27,45 +27,42 @@
#include <xmloff/dllapi.h>
#include <sal/types.h>
-#include <com/sun/star/graphic/XGraphic.hpp>
-#include <com/sun/star/embed/XStorage.hpp>
-#include <com/sun/star/xml/sax/SAXParseException.hpp>
#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
-#include <com/sun/star/xml/sax/SAXException.hpp>
-#include <com/sun/star/xml/sax/XAttributeList.hpp>
#include <com/sun/star/xml/sax/XFastParser.hpp>
-#include <com/sun/star/xml/sax/XLocator.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/document/XImporter.hpp>
#include <com/sun/star/document/XFilter.hpp>
-#include <com/sun/star/document/XGraphicStorageHandler.hpp>
-#include <com/sun/star/document/XEmbeddedObjectResolver.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/weak.hxx>
#include <xmloff/txtimp.hxx>
#include <xmloff/shapeimport.hxx>
#include <xmloff/SchXMLImportHelper.hxx>
-#include <xmloff/ProgressBarHelper.hxx>
#include <cppuhelper/implbase.hxx>
#include <xmloff/formlayerimport.hxx>
-#include <comphelper/attributelist.hxx>
#include <sax/fastattribs.hxx>
#include <rtl/ustring.hxx>
#include <unordered_map>
-#include <com/sun/star/beans/NamedValue.hpp>
-
#include <com/sun/star/xml/sax/XFastDocumentHandler.hpp>
-#include <com/sun/star/xml/sax/XFastContextHandler.hpp>
-#include <com/sun/star/xml/sax/XFastAttributeList.hpp>
#include <o3tl/typed_flags_set.hxx>
#include <memory>
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace beans { struct NamedValue; } } } }
+namespace com { namespace sun { namespace star { namespace document { class XEmbeddedObjectResolver; } } } }
+namespace com { namespace sun { namespace star { namespace document { class XGraphicStorageHandler; } } } }
+namespace com { namespace sun { namespace star { namespace embed { class XStorage; } } } }
+namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; } } } }
+namespace com { namespace sun { namespace star { namespace task { class XStatusIndicator; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; } } } }
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } }
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XFastAttributeList; } } } } }
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XFastContextHandler; } } } } }
+namespace comphelper { class AttributeList; }
+
+class ProgressBarHelper;
+
#define NAMESPACE_TOKEN( prefixToken ) ( ( sal_Int32( prefixToken + 1 ) ) << NMSP_SHIFT )
#define XML_ELEMENT( prefix, name ) ( NAMESPACE_TOKEN( XML_NAMESPACE_##prefix ) | name )
@@ -81,7 +78,6 @@ namespace com { namespace sun { namespace star {
namespace comphelper { class UnoInterfaceToUniqueIdentifierMapper; }
class SvXMLNamespaceMap;
-class SvXMLImportContext;
class SvXMLImport_Impl;
class SvXMLUnitConverter;
class SvXMLNumFmtHelper;
diff --git a/include/xmloff/xmlimppr.hxx b/include/xmloff/xmlimppr.hxx
index fe4cf515ea49..4b557ca0a580 100644
--- a/include/xmloff/xmlimppr.hxx
+++ b/include/xmloff/xmlimppr.hxx
@@ -23,15 +23,21 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
#include <sal/types.h>
-#include <com/sun/star/xml/sax/XAttributeList.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/XMultiPropertySet.hpp>
-#include <com/sun/star/beans/XTolerantMultiPropertySet.hpp>
+#include <rtl/ustring.hxx>
#include <vector>
#include <salhelper/simplereferenceobject.hxx>
+namespace com { namespace sun { namespace star { namespace beans { class XMultiPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySetInfo; } } } }
+namespace com { namespace sun { namespace star { namespace beans { class XTolerantMultiPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class Any; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } }
+
struct XMLPropertyState;
class XMLPropertySetMapper;
diff --git a/include/xmloff/xmlmetae.hxx b/include/xmloff/xmlmetae.hxx
index c4f62f609684..af269e00ec78 100644
--- a/include/xmloff/xmlmetae.hxx
+++ b/include/xmloff/xmlmetae.hxx
@@ -30,9 +30,10 @@
#include <vector>
#include <com/sun/star/beans/StringPair.hpp>
-#include <com/sun/star/util/DateTime.hpp>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#include <com/sun/star/document/XDocumentProperties.hpp>
+
+namespace com { namespace sun { namespace star { namespace document { class XDocumentProperties; } } } }
+namespace com { namespace sun { namespace star { namespace util { struct DateTime; } } } }
class SvXMLExport;
diff --git a/include/xmloff/xmlmetai.hxx b/include/xmloff/xmlmetai.hxx
index 9b9f59da7f10..ca908b41c114 100644
--- a/include/xmloff/xmlmetai.hxx
+++ b/include/xmloff/xmlmetai.hxx
@@ -24,10 +24,10 @@
#include <xmloff/dllapi.h>
#include <xmloff/xmlictxt.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/document/XDocumentProperties.hpp>
-#include <com/sun/star/xml/dom/XSAXDocumentBuilder2.hpp>
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace document { class XDocumentProperties; } } } }
+namespace com { namespace sun { namespace star { namespace xml { namespace dom { class XSAXDocumentBuilder2; } } } } }
/// handles the top-level office:document-meta element of meta.xml documents
// NB: virtual inheritance is needed so that the context that handles the
diff --git a/include/xmloff/xmlnume.hxx b/include/xmloff/xmlnume.hxx
index f8d905e522f4..a7615930db4b 100644
--- a/include/xmloff/xmlnume.hxx
+++ b/include/xmloff/xmlnume.hxx
@@ -21,19 +21,17 @@
#define INCLUDED_XMLOFF_XMLNUME_HXX
#include <rtl/ustring.hxx>
-#include <tools/mapunit.hxx>
-#include <xmloff/attrlist.hxx>
+#include <xmloff/dllapi.h>
namespace com { namespace sun { namespace star {
- namespace frame { class XModel; }
namespace style { class XStyle; }
namespace container { class XIndexReplace; }
namespace beans { struct PropertyValue; }
} } }
-class SvXMLNamespaceMap;
-class SvXMLUnitConverter;
-class SvXMLExportItemMapper;
+namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+
class SvXMLExport;
class XMLTextListAutoStylePool;
diff --git a/include/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx
index ec7d3878aa59..5db3352540ee 100644
--- a/include/xmloff/xmlnumfe.hxx
+++ b/include/xmloff/xmlnumfe.hxx
@@ -23,25 +23,25 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
#include <sal/types.h>
-#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/uno/Sequence.h>
#include <rtl/ustrbuf.hxx>
#include <i18nlangtag/lang.h>
#include <memory>
+namespace com { namespace sun { namespace star { namespace lang { struct Locale; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; } } } }
+
#define XML_WRITTENNUMBERSTYLES "WrittenNumberStyles"
class Color;
class LocaleDataWrapper;
class CharClass;
class SvXMLExport;
-class SvXMLNamespaceMap;
-class SvXMLAttributeList;
class SvNumberFormatter;
class SvNumberformat;
class SvXMLNumUsedList_Impl;
-struct SvXMLEmbeddedTextEntry;
class SvXMLEmbeddedTextEntryArr;
class XMLOFF_DLLPUBLIC SvXMLNumFmtExport final
diff --git a/include/xmloff/xmlnumfi.hxx b/include/xmloff/xmlnumfi.hxx
index 67fe154e9911..9a50b34a6555 100644
--- a/include/xmloff/xmlnumfi.hxx
+++ b/include/xmloff/xmlnumfi.hxx
@@ -23,14 +23,15 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
#include <sal/types.h>
-#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
-#include <com/sun/star/xml/sax/XAttributeList.hpp>
#include <xmloff/xmlstyle.hxx>
#include <rtl/ustrbuf.hxx>
#include <i18nlangtag/lang.h>
#include <memory>
#include <vector>
-#include <unotools/localedatawrapper.hxx>
+
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; } } } }
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } }
#define XML_NUMBERSTYLES "NumberStyles"
@@ -58,14 +59,9 @@ enum SvXMLDateElementAttributes
class Color;
class SvXMLNumImpData;
class SvXMLImport;
-class SvXMLStyleContext;
-class SvXMLStylesContext;
struct SvXMLNumberInfo;
class SvNumberFormatter;
-class SvtSysLocale;
-namespace com { namespace sun { namespace star { namespace lang {
- class XMultiServiceFactory;
-}}}}
+class LocaleDataWrapper;
// use SvXMLNumFmtHelper in the context for <office:styles> to create
diff --git a/include/xmloff/xmlnumi.hxx b/include/xmloff/xmlnumi.hxx
index caecd76f3b4f..0ba540415f69 100644
--- a/include/xmloff/xmlnumi.hxx
+++ b/include/xmloff/xmlnumi.hxx
@@ -25,12 +25,10 @@
#include <memory>
#include <vector>
-#include <com/sun/star/container/XIndexReplace.hpp>
-
#include <xmloff/xmlstyle.hxx>
-#include <com/sun/star/style/NumberingType.hpp>
namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com { namespace sun { namespace star { namespace container { class XIndexReplace; } } } }
class SvxXMLListLevelStyleContext_Impl;
typedef std::vector<rtl::Reference<SvxXMLListLevelStyleContext_Impl>> SvxXMLListStyle_Impl;
diff --git a/include/xmloff/xmlprcon.hxx b/include/xmloff/xmlprcon.hxx
index fb2cba45f6db..dc528233e187 100644
--- a/include/xmloff/xmlprcon.hxx
+++ b/include/xmloff/xmlprcon.hxx
@@ -21,11 +21,11 @@
#define INCLUDED_XMLOFF_XMLPRCON_HXX
#include <xmloff/xmlictxt.hxx>
-#include <xmloff/xmlimppr.hxx>
-#include <xmloff/xmlprmap.hxx>
+#include <vector>
class SvXMLImportPropertyMapper;
+struct XMLPropertyState;
class XMLOFF_DLLPUBLIC SvXMLPropertySetContext : public SvXMLImportContext
{
diff --git a/include/xmloff/xmlprhdl.hxx b/include/xmloff/xmlprhdl.hxx
index 9c9a6f79b8de..7e98304349f8 100644
--- a/include/xmloff/xmlprhdl.hxx
+++ b/include/xmloff/xmlprhdl.hxx
@@ -22,13 +22,11 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
-#include <sal/types.h>
#include <rtl/ustring.hxx>
namespace com{ namespace sun{ namespace star{ namespace uno{ class Any; } } } }
class SvXMLUnitConverter;
-struct XMLPropertyState;
/** Abstract base-class for different XML-types. Derivations of this class
diff --git a/include/xmloff/xmlprmap.hxx b/include/xmloff/xmlprmap.hxx
index ab1690da7078..baf01aa2eadd 100644
--- a/include/xmloff/xmlprmap.hxx
+++ b/include/xmloff/xmlprmap.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_XMLOFF_XMLPRMAP_HXX
#define INCLUDED_XMLOFF_XMLPRMAP_HXX
-#include <rtl/ref.hxx>
#include <xmloff/dllapi.h>
#include <unotools/saveopt.hxx>
#include <rtl/ustring.hxx>
@@ -28,6 +27,8 @@
#include <salhelper/simplereferenceobject.hxx>
#include <memory>
+namespace rtl { template <class reference_type> class Reference; }
+
class SvXMLUnitConverter;
class XMLPropertyHandler;
class XMLPropertyHandlerFactory;
diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx
index 6d60a1114b73..00e9d7b285bc 100644
--- a/include/xmloff/xmlstyle.hxx
+++ b/include/xmloff/xmlstyle.hxx
@@ -24,14 +24,12 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
#include <sal/types.h>
-#include <svl/style.hxx>
-#include <xmloff/xmltkmap.hxx>
#include <xmloff/xmlictxt.hxx>
#include <memory>
class SvXMLStylesContext_Impl;
-class SvXMLUnitConverter;
class SvXMLImportPropertyMapper;
+class SvXMLTokenMap;
namespace com { namespace sun { namespace star {
namespace container { class XNameContainer; }
diff --git a/include/xmloff/xmltabe.hxx b/include/xmloff/xmltabe.hxx
index 3bdd0a368406..7d4fb76dc53a 100644
--- a/include/xmloff/xmltabe.hxx
+++ b/include/xmloff/xmltabe.hxx
@@ -22,6 +22,7 @@
// prevent funny things like "#define sun 1" from the compiler
#include <sal/config.h>
+#include <sal/types.h>
class SvXMLExport;
namespace com { namespace sun { namespace star {
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 2d1906016039..01467992f3d2 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -22,7 +22,6 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
-#include <sal/types.h>
#include <rtl/ustring.hxx>
#include <sax/fastattribs.hxx>
diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx
index 142ecaa6d620..cc7c4736e6c7 100644
--- a/include/xmloff/xmluconv.hxx
+++ b/include/xmloff/xmluconv.hxx
@@ -25,25 +25,14 @@
#include <sal/types.h>
#include <memory>
-#include <limits.h>
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
-#include <xmloff/xmlement.hxx>
#include <xmloff/xmltoken.hxx>
-#include <com/sun/star/util/Date.hpp>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/drawing/Position3D.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
#include <tools/fldunit.hxx>
-#include <tools/mapunit.hxx>
-
-namespace tools { class Time; }
namespace com { namespace sun { namespace star {
- namespace util { struct DateTime; }
namespace text { class XNumberingTypeInfo; }
}}}
@@ -52,6 +41,16 @@ namespace basegfx
class B3DVector;
}
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { struct Position3D; } } } }
+namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } }
+namespace com { namespace sun { namespace star { namespace util { struct Date; } } } }
+template <typename EnumT> struct SvXMLEnumMapEntry;
+template <typename EnumT> struct SvXMLEnumStringMapEntry;
+
class XMLOFF_DLLPUBLIC SvXMLTokenEnumerator
{
private:
diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx
index 6efba5177523..3c574212044e 100644
--- a/linguistic/source/convdic.cxx
+++ b/linguistic/source/convdic.cxx
@@ -48,6 +48,9 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/xml/sax/InputSource.hpp>
#include <com/sun/star/xml/sax/Parser.hpp>
+#include <com/sun/star/xml/sax/SAXParseException.hpp>
+#include <com/sun/star/container/NoSuchElementException.hpp>
+#include <com/sun/star/container/ElementExistException.hpp>
#include "convdic.hxx"
diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx
index 9d501ff5074b..9e22dd5a346d 100644
--- a/reportdesign/source/filter/xml/xmlCell.cxx
+++ b/reportdesign/source/filter/xml/xmlCell.cxx
@@ -23,6 +23,7 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
+#include <xmloff/ProgressBarHelper.hxx>
#include "xmlEnums.hxx"
#include "xmlStyleImport.hxx"
#include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/reportdesign/source/filter/xml/xmlColumn.cxx b/reportdesign/source/filter/xml/xmlColumn.cxx
index 75a1e1873852..1fca8a23e08b 100644
--- a/reportdesign/source/filter/xml/xmlColumn.cxx
+++ b/reportdesign/source/filter/xml/xmlColumn.cxx
@@ -23,6 +23,7 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
+#include <xmloff/ProgressBarHelper.hxx>
#include "xmlEnums.hxx"
#include "xmlCell.hxx"
#include "xmlStyleImport.hxx"
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx
index 82cb361d58c7..06455cc95339 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.cxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx
@@ -31,6 +31,7 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
+#include <xmloff/ProgressBarHelper.hxx>
#include "xmlEnums.hxx"
#include <tools/datetime.hxx>
#include <unotools/datetime.hxx>
diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx
index aef3f6cad58c..5f71c3d25e37 100644
--- a/reportdesign/source/filter/xml/xmlExport.hxx
+++ b/reportdesign/source/filter/xml/xmlExport.hxx
@@ -39,6 +39,7 @@
#include <unotools/localfilehelper.hxx>
#include <xmloff/xmlexp.hxx>
#include <xmloff/xmlimp.hxx>
+#include <xmloff/xmlexppr.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <memory>
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index afc5141201b4..72da5a31a7fc 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.cxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx
@@ -21,6 +21,7 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
+#include <xmloff/ProgressBarHelper.hxx>
#include "xmlEnums.hxx"
#include "xmlReportElement.hxx"
#include "xmlCell.hxx"
diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx
index c6d623726d15..1c976c31a5e8 100644
--- a/reportdesign/source/filter/xml/xmlGroup.cxx
+++ b/reportdesign/source/filter/xml/xmlGroup.cxx
@@ -24,6 +24,7 @@
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
#include <xmloff/xmluconv.hxx>
+#include <xmloff/ProgressBarHelper.hxx>
#include "xmlHelper.hxx"
#include "xmlEnums.hxx"
#include <ucbhelper/content.hxx>
diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx
index 524248f647a3..7efab158ae5b 100644
--- a/reportdesign/source/filter/xml/xmlHelper.cxx
+++ b/reportdesign/source/filter/xml/xmlHelper.cxx
@@ -21,6 +21,7 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/families.hxx>
#include <xmloff/controlpropertyhdl.hxx>
+#include <xmloff/xmltkmap.hxx>
#include <connectivity/dbtools.hxx>
#include <comphelper/genericpropertyset.hxx>
#include <comphelper/propertysetinfo.hxx>
diff --git a/reportdesign/source/filter/xml/xmlMasterFields.cxx b/reportdesign/source/filter/xml/xmlMasterFields.cxx
index 777a2c45c6b5..3beed87e9f56 100644
--- a/reportdesign/source/filter/xml/xmlMasterFields.cxx
+++ b/reportdesign/source/filter/xml/xmlMasterFields.cxx
@@ -21,6 +21,7 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
+#include <xmloff/ProgressBarHelper.hxx>
#include "xmlEnums.hxx"
#include "xmlReport.hxx"
diff --git a/reportdesign/source/filter/xml/xmlReport.cxx b/reportdesign/source/filter/xml/xmlReport.cxx
index 8675bcde84a1..b5bc5d0db848 100644
--- a/reportdesign/source/filter/xml/xmlReport.cxx
+++ b/reportdesign/source/filter/xml/xmlReport.cxx
@@ -22,6 +22,7 @@
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
#include <xmloff/xmluconv.hxx>
+#include <xmloff/ProgressBarHelper.hxx>
#include "xmlHelper.hxx"
#include "xmlGroup.hxx"
#include "xmlSection.hxx"
diff --git a/reportdesign/source/filter/xml/xmlReportElement.cxx b/reportdesign/source/filter/xml/xmlReportElement.cxx
index fa7f06e939f8..cff142c726eb 100644
--- a/reportdesign/source/filter/xml/xmlReportElement.cxx
+++ b/reportdesign/source/filter/xml/xmlReportElement.cxx
@@ -21,6 +21,7 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
+#include <xmloff/ProgressBarHelper.hxx>
#include "xmlEnums.hxx"
#include "xmlComponent.hxx"
#include "xmlCondPrtExpr.hxx"
diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.cxx b/reportdesign/source/filter/xml/xmlReportElementBase.cxx
index 54eb0494217e..6d0a953ecca3 100644
--- a/reportdesign/source/filter/xml/xmlReportElementBase.cxx
+++ b/reportdesign/source/filter/xml/xmlReportElementBase.cxx
@@ -16,6 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <xmloff/ProgressBarHelper.hxx>
#include "xmlReportElementBase.hxx"
#include "xmlfilter.hxx"
#include "xmlControlProperty.hxx"
diff --git a/reportdesign/source/filter/xml/xmlSubDocument.cxx b/reportdesign/source/filter/xml/xmlSubDocument.cxx
index c8c01a6c85b8..f6196d21e87d 100644
--- a/reportdesign/source/filter/xml/xmlSubDocument.cxx
+++ b/reportdesign/source/filter/xml/xmlSubDocument.cxx
@@ -22,6 +22,7 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
+#include <xmloff/ProgressBarHelper.hxx>
#include "xmlEnums.hxx"
#include "xmlMasterFields.hxx"
#include "xmlTable.hxx"
diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx
index 574e9fd8e06a..a9bd5d1b1d9a 100644
--- a/reportdesign/source/filter/xml/xmlTable.cxx
+++ b/reportdesign/source/filter/xml/xmlTable.cxx
@@ -22,6 +22,7 @@
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
#include <xmloff/xmluconv.hxx>
+#include <xmloff/ProgressBarHelper.hxx>
#include <RptDef.hxx>
#include "xmlHelper.hxx"
#include "xmlEnums.hxx"
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index 8323bd865037..2ff95dd1b3f8 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -27,7 +27,9 @@
#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
#include <com/sun/star/util/MeasureUnit.hpp>
#include <com/sun/star/xml/sax/Parser.hpp>
+#include <com/sun/star/xml/sax/SAXParseException.hpp>
#include <com/sun/star/document/GraphicStorageHandler.hpp>
+#include <com/sun/star/document/XEmbeddedObjectResolver.hpp>
#include "xmlfilter.hxx"
#include "xmlGroup.hxx"
#include "xmlReport.hxx"
diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
index 445b563ec1ed..1b69a38a34a5 100644
--- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
+++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
@@ -26,6 +26,8 @@
#include <xmloff/xmlnmspe.hxx>
#include <sax/tools/converter.hxx>
+#include <com/sun/star/beans/XPropertySet.hpp>
+
using namespace com::sun::star;
using namespace xmloff::token;
diff --git a/sc/source/filter/xml/XMLExportDDELinks.cxx b/sc/source/filter/xml/XMLExportDDELinks.cxx
index b3c43f24e738..1f17b91390f3 100644
--- a/sc/source/filter/xml/XMLExportDDELinks.cxx
+++ b/sc/source/filter/xml/XMLExportDDELinks.cxx
@@ -26,6 +26,8 @@
#include <document.hxx>
#include <scmatrix.hxx>
#include <com/sun/star/sheet/XDDELink.hpp>
+#include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
using namespace com::sun::star;
using namespace xmloff::token;
diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
index 1671ebebf070..c61ee8f3986d 100644
--- a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
+++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/text/XText.hpp>
#include <com/sun/star/sheet/XHeaderFooterContent.hpp>
#include <xmloff/nmspmap.hxx>
diff --git a/sc/source/filter/xml/XMLTableShapeResizer.cxx b/sc/source/filter/xml/XMLTableShapeResizer.cxx
index 232aa52cbf62..9cbdc7e6b6a7 100644
--- a/sc/source/filter/xml/XMLTableShapeResizer.cxx
+++ b/sc/source/filter/xml/XMLTableShapeResizer.cxx
@@ -28,6 +28,7 @@
#include <osl/diagnose.h>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/drawing/XShape.hpp>
#include <memory>
#include <vector>
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index 1300b5b38afa..6b50715f1185 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -57,6 +57,7 @@
#include <xmloff/families.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/prstylei.hxx>
+#include <xmloff/xmlimppr.hxx>
#include <svl/zforlist.hxx>
#include <svx/svdocapt.hxx>
#include <editeng/outlobj.hxx>
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index e15f71a4ec91..000a48550c91 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -99,6 +99,8 @@
#include <formula/errorcodes.hxx>
#include <xmloff/xmlerror.hxx>
#include <xmloff/XMLEventExport.hxx>
+#include <xmloff/xmlprmap.hxx>
+#include <xmloff/ProgressBarHelper.hxx>
#include <sax/tools/converter.hxx>
diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx
index 3a97a7d07e70..3d36904b0bac 100644
--- a/sc/source/filter/xml/xmlexprt.hxx
+++ b/sc/source/filter/xml/xmlexprt.hxx
@@ -21,6 +21,7 @@
#include <xmloff/xmlexp.hxx>
#include <com/sun/star/table/CellRangeAddress.hpp>
+#include <com/sun/star/io/XInputStream.hpp>
#include <address.hxx>
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index a1923a93415d..6faa14c6b656 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -36,6 +36,7 @@
#include <xmloff/numehelp.hxx>
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlerror.hxx>
+#include <xmloff/ProgressBarHelper.hxx>
#include <svl/languageoptions.hxx>
#include <editeng/editstat.hxx>
@@ -86,6 +87,7 @@
#include <com/sun/star/util/MalformedNumberFormatException.hpp>
#include <com/sun/star/util/NumberFormat.hpp>
#include <com/sun/star/util/XNumberFormatTypes.hpp>
+#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/sheet/NamedRangeFlag.hpp>
#include <com/sun/star/sheet/XLabelRanges.hpp>
#include <com/sun/star/io/XSeekable.hpp>
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index 7ebe66e10458..f6b248e159b3 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_SC_SOURCE_FILTER_XML_XMLIMPRT_HXX
#include <xmloff/xmlimp.hxx>
+#include <xmloff/xmlprmap.hxx>
#include "xmlsubti.hxx"
#include <formula/grammar.hxx>
#include <dociter.hxx>
diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx
index 4f80c8a0c022..6afef36ba39a 100644
--- a/sc/source/filter/xml/xmlstyle.cxx
+++ b/sc/source/filter/xml/xmlstyle.cxx
@@ -38,7 +38,9 @@
#include <com/sun/star/table/BorderLine2.hpp>
#include <com/sun/star/sheet/XSheetConditionalEntry.hpp>
#include <com/sun/star/sheet/XSheetCondition.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
+#include <com/sun/star/container/XIndexAccess.hpp>
#include <comphelper/extract.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 5910779f9e4f..45a38a6b1581 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -39,6 +39,8 @@
#include <com/sun/star/xml/sax/Parser.hpp>
#include <com/sun/star/xml/sax/XFastParser.hpp>
#include <com/sun/star/xml/sax/Writer.hpp>
+#include <com/sun/star/xml/sax/SAXParseException.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <comphelper/propertysetinfo.hxx>
#include <comphelper/genericpropertyset.hxx>
@@ -48,6 +50,7 @@
#include <com/sun/star/script/vba/XVBACompatibility.hpp>
#include <com/sun/star/rdf/XDocumentMetadataAccess.hpp>
#include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
+#include <com/sun/star/task/XStatusIndicator.hpp>
#include <sfx2/DocumentMetadataAccess.hxx>
#include <comphelper/documentconstants.hxx>
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index c22d31db49d7..a48c2617217e 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -25,6 +25,7 @@ one go*/
#include <com/sun/star/xml/sax/InputSource.hpp>
#include <com/sun/star/xml/sax/Parser.hpp>
#include <com/sun/star/xml/sax/XFastParser.hpp>
+#include <com/sun/star/xml/sax/SAXParseException.hpp>
#include <com/sun/star/document/XDocumentProperties.hpp>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
#include <com/sun/star/packages/WrongPasswordException.hpp>
@@ -33,6 +34,7 @@ one go*/
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/uno/Any.h>
+#include <com/sun/star/task/XStatusIndicator.hpp>
#include <comphelper/fileformat.h>
#include <comphelper/genericpropertyset.hxx>
diff --git a/svx/qa/unit/XTableImportExportTest.cxx b/svx/qa/unit/XTableImportExportTest.cxx
index 6e136558efd8..564920f801d3 100644
--- a/svx/qa/unit/XTableImportExportTest.cxx
+++ b/svx/qa/unit/XTableImportExportTest.cxx
@@ -23,6 +23,7 @@
#include <xmlxtexp.hxx>
#include <com/sun/star/awt/XBitmap.hpp>
+#include <com/sun/star/graphic/XGraphic.hpp>
using namespace css;
diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx
index 3491b03044f4..23d1305c0b2b 100644
--- a/svx/source/xml/xmlxtexp.cxx
+++ b/svx/source/xml/xmlxtexp.cxx
@@ -18,6 +18,7 @@
*/
#include <tools/urlobj.hxx>
+#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/xml/sax/Writer.hpp>
#include <com/sun/star/uno/Sequence.hxx>
diff --git a/sw/source/core/swg/SwXMLBlockExport.cxx b/sw/source/core/swg/SwXMLBlockExport.cxx
index 005211412e5e..ae8d81ca2352 100644
--- a/sw/source/core/swg/SwXMLBlockExport.cxx
+++ b/sw/source/core/swg/SwXMLBlockExport.cxx
@@ -20,6 +20,7 @@
#include <SwXMLBlockExport.hxx>
#include <SwXMLTextBlocks.hxx>
#include <com/sun/star/util/MeasureUnit.hpp>
+#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <xmloff/nmspmap.hxx>
#include <xmloff/xmlnmspe.hxx>
using namespace ::com::sun::star::uno;
diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx
index 247cab4e6b21..91a9e385063e 100644
--- a/sw/source/core/swg/SwXMLTextBlocks1.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx
@@ -33,6 +33,7 @@
#include <com/sun/star/xml/sax/FastParser.hpp>
#include <com/sun/star/xml/sax/FastToken.hpp>
#include <com/sun/star/xml/sax/Writer.hpp>
+#include <com/sun/star/xml/sax/SAXParseException.hpp>
#include <com/sun/star/document/XStorageBasedDocument.hpp>
#include <doc.hxx>
#include <docsh.hxx>
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 138dc19981c8..01fe0ef9eefa 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -23,6 +23,7 @@
#include <comphelper/processfactory.hxx>
#include <com/sun/star/xml/sax/InputSource.hpp>
#include <com/sun/star/xml/sax/Parser.hpp>
+#include <com/sun/star/xml/sax/SAXParseException.hpp>
#include <com/sun/star/text/XTextRange.hpp>
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/document/NamedPropertyValues.hpp>
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index 35257d16dfdc..43c851f23152 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -47,6 +47,7 @@
#include <xmloff/XMLTextMasterStylesContext.hxx>
#include <xmloff/XMLTextShapeStyleContext.hxx>
#include <xmloff/XMLGraphicsDefaultStyle.hxx>
+#include <xmloff/table/XMLTableImport.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include "xmlimp.hxx"
#include "xmltbli.hxx"
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index c8aa5a172691..c739acac7a1a 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -24,6 +24,7 @@
#include <xmloff/nmspmap.hxx>
#include <xmloff/XMLTextListAutoStylePool.hxx>
#include <xmloff/XMLTextMasterPageExport.hxx>
+#include <xmloff/table/XMLTableExport.hxx>
#include <xmloff/txtprmap.hxx>
#include <xmloff/xmlaustp.hxx>
diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx
index 350e9d088535..b7b17b2e2b65 100644
--- a/sw/source/filter/xml/xmlmeta.cxx
+++ b/sw/source/filter/xml/xmlmeta.cxx
@@ -23,6 +23,7 @@
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/xmlmetai.hxx>
#include <xmloff/xmlmetae.hxx>
+#include <xmloff/ProgressBarHelper.hxx>
#include <editeng/langitem.hxx>
#include <o3tl/safeint.hxx>
#include <xmloff/xmluconv.hxx>
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index 5d12115e023c..a46db95870ca 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -30,6 +30,7 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/txtprmap.hxx>
#include <xmloff/maptype.hxx>
+#include <xmloff/xmlexppr.hxx>
#include <svx/svdobj.hxx>
#include <doc.hxx>
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index 02851e8e6a48..01d742dc1489 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -35,6 +35,7 @@
#include <xmloff/xmlprmap.hxx>
#include <xmloff/txtprmap.hxx>
#include <xmloff/i18nmap.hxx>
+#include <xmloff/xmlimppr.hxx>
#include <unocrsr.hxx>
#include <TextCursorHelper.hxx>
#include <unoframe.hxx>
diff --git a/xmloff/inc/XMLChartPropertySetMapper.hxx b/xmloff/inc/XMLChartPropertySetMapper.hxx
index f5cc42fd5f31..22564367d925 100644
--- a/xmloff/inc/XMLChartPropertySetMapper.hxx
+++ b/xmloff/inc/XMLChartPropertySetMapper.hxx
@@ -23,6 +23,7 @@
#include <xmloff/xmlexppr.hxx>
#include <xmloff/xmlimppr.hxx>
#include <xmloff/xmlimp.hxx>
+#include <xmloff/prhdlfac.hxx>
extern const XMLPropertyMapEntry aXMLChartPropMap[];
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index 2448e1b649b3..44540e4df500 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -32,6 +32,7 @@
#include <com/sun/star/util/Date.hpp>
#include <xmloff/xmlictxt.hxx>
#include <xmloff/txtimp.hxx>
+#include <xmloff/xmltkmap.hxx>
#include <rtl/ustrbuf.hxx>
#include <vector>
diff --git a/xmloff/qa/unit/uxmloff.cxx b/xmloff/qa/unit/uxmloff.cxx
index a5e11528fe81..6e3485b2510b 100644
--- a/xmloff/qa/unit/uxmloff.cxx
+++ b/xmloff/qa/unit/uxmloff.cxx
@@ -11,6 +11,7 @@
#include <test/bootstrapfixture.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
#include <comphelper/genericpropertyset.hxx>
#include <comphelper/propertysetinfo.hxx>
diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx
index fcef31d05036..bc5111262bec 100644
--- a/xmloff/source/chart/PropertyMaps.cxx
+++ b/xmloff/source/chart/PropertyMaps.cxx
@@ -45,7 +45,9 @@
#include <xmloff/NamedBoolPropertyHdl.hxx>
#include <xmloff/xmlexp.hxx>
#include <xmloff/xmltoken.hxx>
+#include <xmloff/prhdlfac.hxx>
+#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
#include <com/sun/star/drawing/FillStyle.hpp>
#include <com/sun/star/drawing/LineJoint.hpp>
@@ -56,6 +58,7 @@
#include <com/sun/star/chart/ChartAxisPosition.hpp>
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/chart2/data/XRangeXMLConversion.hpp>
+#include <com/sun/star/graphic/XGraphic.hpp>
#include <rtl/ustrbuf.hxx>
#include <rtl/math.hxx>
diff --git a/xmloff/source/chart/SchXMLAxisContext.hxx b/xmloff/source/chart/SchXMLAxisContext.hxx
index 7ece3f353f79..a629c91b3a5d 100644
--- a/xmloff/source/chart/SchXMLAxisContext.hxx
+++ b/xmloff/source/chart/SchXMLAxisContext.hxx
@@ -22,6 +22,8 @@
#include <SchXMLImport.hxx>
#include "transporttypes.hxx"
+#include <com/sun/star/chart/XChartDocument.hpp>
+
class SchXMLAxisContext : public SvXMLImportContext
{
public:
diff --git a/xmloff/source/chart/SchXMLEnumConverter.cxx b/xmloff/source/chart/SchXMLEnumConverter.cxx
index 13480c808d2e..6349b457746c 100644
--- a/xmloff/source/chart/SchXMLEnumConverter.cxx
+++ b/xmloff/source/chart/SchXMLEnumConverter.cxx
@@ -20,6 +20,7 @@
#include <com/sun/star/chart/ChartLegendPosition.hpp>
#include <com/sun/star/chart/ChartLegendExpansion.hpp>
#include "SchXMLEnumConverter.hxx"
+#include <xmloff/xmlement.hxx>
#include <rtl/instance.hxx>
using namespace ::xmloff::token;
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index d27dc8659c55..097eb55a281f 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -51,6 +51,8 @@
#include <vector>
#include <typeinfo>
#include <algorithm>
+#include <queue>
+#include <iterator>
#include <com/sun/star/task/XStatusIndicatorSupplier.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/xmloff/source/chart/SchXMLLegendContext.cxx b/xmloff/source/chart/SchXMLLegendContext.cxx
index 5e2ccab63d92..1f0f25f2c138 100644
--- a/xmloff/source/chart/SchXMLLegendContext.cxx
+++ b/xmloff/source/chart/SchXMLLegendContext.cxx
@@ -30,6 +30,7 @@
#include <com/sun/star/chart/ChartLegendPosition.hpp>
#include <com/sun/star/chart/ChartLegendExpansion.hpp>
+#include <com/sun/star/chart/XChartDocument.hpp>
#include <com/sun/star/drawing/FillStyle.hpp>
using namespace ::xmloff::token;
diff --git a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx
index 19031dffc63e..1c42c5b7e6f2 100644
--- a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx
+++ b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx
@@ -30,6 +30,7 @@
#include <comphelper/processfactory.hxx>
+#include <com/sun/star/awt/Point.hpp>
#include <com/sun/star/chart2/RegressionEquation.hpp>
#include <com/sun/star/chart2/RelativePosition.hpp>
diff --git a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx
index 1b41fcda951a..46376c447374 100644
--- a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx
+++ b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx
@@ -21,6 +21,7 @@
#include <SchXMLImport.hxx>
+#include <com/sun/star/awt/Size.hpp>
#include <xmloff/xmlictxt.hxx>
#include <xmloff/shapeimport.hxx>
#include <list>
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx
index 03d00181ff0e..93c9d2120fae 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -34,6 +34,7 @@
#include <com/sun/star/chart/ChartAxisAssign.hpp>
#include <com/sun/star/chart/ChartSymbolType.hpp>
+#include <com/sun/star/chart/XChartDocument.hpp>
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/chart/ChartLegendPosition.hpp>
diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx
index ccce96ef93a6..7d3f71cb6ca9 100644
--- a/xmloff/source/chart/SchXMLTools.cxx
+++ b/xmloff/source/chart/SchXMLTools.cxx
@@ -45,6 +45,7 @@
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceName.hpp>
+#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <comphelper/processfactory.hxx>
#include <tools/diagnose_ex.h>
diff --git a/xmloff/source/chart/XMLChartPropertyContext.cxx b/xmloff/source/chart/XMLChartPropertyContext.cxx
index eca08cccf629..6cd56d8e3f44 100644
--- a/xmloff/source/chart/XMLChartPropertyContext.cxx
+++ b/xmloff/source/chart/XMLChartPropertyContext.cxx
@@ -22,6 +22,7 @@
#include "XMLSymbolImageContext.hxx"
#include "XMLLabelSeparatorContext.hxx"
+#include <xmloff/xmlimppr.hxx>
using namespace ::com::sun::star;
diff --git a/xmloff/source/chart/XMLChartStyleContext.cxx b/xmloff/source/chart/XMLChartStyleContext.cxx
index e3a8b40e052d..ceee2fd60b5c 100644
--- a/xmloff/source/chart/XMLChartStyleContext.cxx
+++ b/xmloff/source/chart/XMLChartStyleContext.cxx
@@ -23,8 +23,10 @@
#include <xmloff/xmlnumfi.hxx>
#include <xmloff/families.hxx>
#include <xmloff/xmltypes.hxx>
+#include <xmloff/xmlimppr.hxx>
#include <sal/log.hxx>
+#include <com/sun/star/beans/XPropertySet.hpp>
#include "XMLChartPropertyContext.hxx"
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx
index c804aeb179f5..15e8d92fbc30 100644
--- a/xmloff/source/core/DocumentSettingsContext.cxx
+++ b/xmloff/source/core/DocumentSettingsContext.cxx
@@ -42,6 +42,7 @@
#include <com/sun/star/document/PrinterIndependentLayout.hpp>
#include <com/sun/star/document/IndexedPropertyValues.hpp>
#include <com/sun/star/document/NamedPropertyValues.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
#include <rtl/ustrbuf.hxx>
#include <sal/log.hxx>
#include <osl/diagnose.h>
diff --git a/xmloff/source/core/SettingsExportHelper.cxx b/xmloff/source/core/SettingsExportHelper.cxx
index c3df15c10ac8..7cdc59301adf 100644
--- a/xmloff/source/core/SettingsExportHelper.cxx
+++ b/xmloff/source/core/SettingsExportHelper.cxx
@@ -31,6 +31,7 @@
#include <com/sun/star/linguistic2/XSupportedLocales.hpp>
#include <com/sun/star/i18n/XForbiddenCharacters.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/container/XIndexContainer.hpp>
diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
index bfa90235b40b..5e09a373cd97 100644
--- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
+++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
@@ -18,6 +18,7 @@
*/
#include <com/sun/star/document/XImporter.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/util/XModifiable.hpp>
#include <com/sun/star/util/XModifiable2.hpp>
#include <tools/globname.hxx>
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 8a918aeeff00..b8e8b96f51d5 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -33,9 +33,11 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/document/XBinaryStreamResolver.hpp>
+#include <com/sun/star/document/XEmbeddedObjectResolver.hpp>
#include <com/sun/star/xml/sax/SAXInvalidCharacterException.hpp>
#include <com/sun/star/uri/XUriReferenceFactory.hpp>
#include <com/sun/star/uri/UriReferenceFactory.hpp>
+#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/util/MeasureUnit.hpp>
#include <i18nlangtag/languagetag.hxx>
#include <comphelper/processfactory.hxx>
@@ -51,12 +53,14 @@
#include <xmloff/XMLSettingsExportContext.hxx>
#include <xmloff/families.hxx>
#include <xmloff/XMLEventExport.hxx>
+#include <xmloff/ProgressBarHelper.hxx>
#include <XMLStarBasicExportHandler.hxx>
#include <XMLScriptExportHandler.hxx>
#include <xmloff/SettingsExportHelper.hxx>
#include <com/sun/star/container/XIndexContainer.hpp>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list