[Libreoffice-commits] core.git: sc/IwyuFilter_sc.yaml sc/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Jan 10 08:09:31 UTC 2019


 sc/IwyuFilter_sc.yaml                                  |    9 +++++++
 sc/source/filter/xml/XMLCalculationSettingsContext.cxx |    1 
 sc/source/filter/xml/XMLCellRangeSourceContext.cxx     |    1 
 sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx |    3 --
 sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx |    2 -
 sc/source/filter/xml/XMLConsolidationContext.cxx       |    1 
 sc/source/filter/xml/XMLConverter.cxx                  |    4 ---
 sc/source/filter/xml/XMLDDELinksContext.cxx            |    2 -
 sc/source/filter/xml/XMLDetectiveContext.cxx           |    4 ---
 sc/source/filter/xml/XMLExportDDELinks.cxx             |    3 --
 sc/source/filter/xml/XMLExportDataPilot.cxx            |    1 
 sc/source/filter/xml/XMLExportIterator.cxx             |    4 ---
 sc/source/filter/xml/XMLStylesExportHelper.cxx         |    4 ---
 sc/source/filter/xml/XMLTableHeaderFooterContext.cxx   |    2 -
 sc/source/filter/xml/XMLTableMasterPageExport.cxx      |    3 +-
 sc/source/filter/xml/XMLTableShapeImportHelper.cxx     |    3 --
 sc/source/filter/xml/XMLTableShapeResizer.cxx          |    2 -
 sc/source/filter/xml/XMLTableShapesContext.cxx         |    1 
 sc/source/filter/xml/XMLTableSourceContext.cxx         |    1 
 sc/source/filter/xml/XMLTrackedChangesContext.cxx      |    3 --
 sc/source/filter/xml/celltextparacontext.cxx           |    3 --
 sc/source/filter/xml/datastreamimport.cxx              |    1 
 sc/source/filter/xml/sheetdata.cxx                     |    1 
 sc/source/filter/xml/xmlbodyi.cxx                      |    6 -----
 sc/source/filter/xml/xmlcelli.cxx                      |   20 +----------------
 sc/source/filter/xml/xmlcoli.cxx                       |    3 --
 sc/source/filter/xml/xmlcondformat.cxx                 |    2 -
 sc/source/filter/xml/xmlconti.cxx                      |    3 --
 sc/source/filter/xml/xmlcvali.cxx                      |    1 
 sc/source/filter/xml/xmldpimp.cxx                      |    6 -----
 sc/source/filter/xml/xmldrani.cxx                      |    6 -----
 sc/source/filter/xml/xmlexprt.cxx                      |   16 +++----------
 sc/source/filter/xml/xmlexternaltabi.cxx               |    2 -
 sc/source/filter/xml/xmlfilti.cxx                      |    5 ----
 sc/source/filter/xml/xmlimprt.cxx                      |   10 --------
 sc/source/filter/xml/xmlimprt.hxx                      |    1 
 sc/source/filter/xml/xmllabri.cxx                      |    1 
 sc/source/filter/xml/xmlmappingi.cxx                   |    6 -----
 sc/source/filter/xml/xmlnexpi.cxx                      |    4 ---
 sc/source/filter/xml/xmlrowi.cxx                       |    3 --
 sc/source/filter/xml/xmlsceni.cxx                      |    4 ---
 sc/source/filter/xml/xmlsorti.cxx                      |    4 ---
 sc/source/filter/xml/xmlstyle.cxx                      |    6 -----
 sc/source/filter/xml/xmlstyli.cxx                      |    9 -------
 sc/source/filter/xml/xmlsubti.cxx                      |   11 +--------
 sc/source/filter/xml/xmltabi.cxx                       |    2 -
 sc/source/filter/xml/xmltransformationi.cxx            |    5 ----
 sc/source/filter/xml/xmlwrap.cxx                       |    5 ----
 48 files changed, 20 insertions(+), 180 deletions(-)

New commits:
commit 96e7dbc8c3b57b152a59a53d03f1a0fdc51f3ae8
Author:     Gabor Kelemen <kelemeng at ubuntu.com>
AuthorDate: Fri Dec 28 22:25:57 2018 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Jan 10 09:09:06 2019 +0100

    tdf#42949 Fix IWYU warnings in sc/source/filter/xml/*cxx
    
    Found with bin/find-unneeded-includes
    Only removal proposals are dealt with here.
    
    Change-Id: I39b7da64f92520f1fb583b2a2f038955e5de2f24
    Reviewed-on: https://gerrit.libreoffice.org/65690
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index 3cb54640a9ba..68f62a5773ae 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -697,3 +697,12 @@ blacklist:
     sc/source/filter/oox/worksheethelper.cxx:
     # Needed for implicit dtor
     - editeng/editobj.hxx
+    sc/source/filter/xml/XMLExportIterator.cxx:
+    # Needed for direct member access
+    - com/sun/star/table/XCellRange.hpp
+    sc/source/filter/xml/xmlimprt.cxx:
+    # Needed to avoid loplugin:unreffun error
+    - appluno.hxx
+    sc/source/filter/xml/xmlsubti.cxx:
+    # Needed for direct member access
+    - com/sun/star/sheet/XSpreadsheet.hpp
diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
index fd7aab6ddb23..445b563ec1ed 100644
--- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
+++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
@@ -24,7 +24,6 @@
 #include <document.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnmspe.hxx>
-#include <xmloff/nmspmap.hxx>
 #include <sax/tools/converter.hxx>
 
 using namespace com::sun::star;
diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx
index 2ccc32306f76..936f565c93a6 100644
--- a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx
+++ b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx
@@ -21,7 +21,6 @@
 
 #include <sax/tools/converter.hxx>
 
-#include <xmloff/nmspmap.hxx>
 #include "xmlimprt.hxx"
 #include <xmloff/xmlnmspe.hxx>
 
diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
index 7adec97f2ca6..9c21a593b627 100644
--- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
@@ -22,7 +22,6 @@
 #include "XMLConverter.hxx"
 #include <document.hxx>
 #include <chgtrack.hxx>
-#include <chgviset.hxx>
 #include <formulacell.hxx>
 #include <textuno.hxx>
 #include <rangeutl.hxx>
@@ -33,8 +32,6 @@
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <sax/tools/converter.hxx>
-#include <com/sun/star/util/DateTime.hpp>
-#include <tools/datetime.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/sharedstring.hxx>
 #include <sal/log.hxx>
diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
index acd43adcea6a..12d611c081cc 100644
--- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
@@ -18,10 +18,8 @@
  */
 
 #include "XMLChangeTrackingImportHelper.hxx"
-#include "XMLConverter.hxx"
 #include <formulacell.hxx>
 #include <document.hxx>
-#include <chgviset.hxx>
 #include <rangeutl.hxx>
 #include <tools/datetime.hxx>
 #include <osl/diagnose.h>
diff --git a/sc/source/filter/xml/XMLConsolidationContext.cxx b/sc/source/filter/xml/XMLConsolidationContext.cxx
index ba6525eabce3..71dafb482636 100644
--- a/sc/source/filter/xml/XMLConsolidationContext.cxx
+++ b/sc/source/filter/xml/XMLConsolidationContext.cxx
@@ -22,7 +22,6 @@
 #include <rangeutl.hxx>
 #include "xmlimprt.hxx"
 #include "XMLConverter.hxx"
-#include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnmspe.hxx>
 
diff --git a/sc/source/filter/xml/XMLConverter.cxx b/sc/source/filter/xml/XMLConverter.cxx
index faa292eea4a6..54c5fdce1f4b 100644
--- a/sc/source/filter/xml/XMLConverter.cxx
+++ b/sc/source/filter/xml/XMLConverter.cxx
@@ -23,12 +23,8 @@
 #include <tools/datetime.hxx>
 #include <sax/tools/converter.hxx>
 #include <xmloff/xmltoken.hxx>
-#include <rangelst.hxx>
 #include <rangeutl.hxx>
 #include <docuno.hxx>
-#include <convuno.hxx>
-#include <document.hxx>
-#include <ftools.hxx>
 #include <generalfunction.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxx
index b87e33eab516..ae3c7bb46a8d 100644
--- a/sc/source/filter/xml/XMLDDELinksContext.cxx
+++ b/sc/source/filter/xml/XMLDDELinksContext.cxx
@@ -23,8 +23,6 @@
 #include <scmatrix.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnmspe.hxx>
-#include <xmloff/nmspmap.hxx>
-#include <sax/tools/converter.hxx>
 #include <svl/sharedstringpool.hxx>
 #include <osl/diagnose.h>
 #include <sal/log.hxx>
diff --git a/sc/source/filter/xml/XMLDetectiveContext.cxx b/sc/source/filter/xml/XMLDetectiveContext.cxx
index 35b613f614b0..ea7b370130d2 100644
--- a/sc/source/filter/xml/XMLDetectiveContext.cxx
+++ b/sc/source/filter/xml/XMLDetectiveContext.cxx
@@ -20,16 +20,12 @@
 #include "XMLDetectiveContext.hxx"
 
 #include <sax/tools/converter.hxx>
-#include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnmspe.hxx>
-#include <convuno.hxx>
 #include "xmlimprt.hxx"
 #include "XMLConverter.hxx"
 #include <rangeutl.hxx>
 
-#include <algorithm>
-
 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 73194517a62c..b3c43f24e738 100644
--- a/sc/source/filter/xml/XMLExportDDELinks.cxx
+++ b/sc/source/filter/xml/XMLExportDDELinks.cxx
@@ -20,7 +20,6 @@
 #include "XMLExportDDELinks.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnmspe.hxx>
-#include <xmloff/nmspmap.hxx>
 #include <sax/tools/converter.hxx>
 #include "xmlexprt.hxx"
 #include <unonames.hxx>
@@ -28,8 +27,6 @@
 #include <scmatrix.hxx>
 #include <com/sun/star/sheet/XDDELink.hpp>
 
-class ScMatrix;
-
 using namespace com::sun::star;
 using namespace xmloff::token;
 
diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx
index a39784c7f8ab..633cdc2d5eba 100644
--- a/sc/source/filter/xml/XMLExportDataPilot.cxx
+++ b/sc/source/filter/xml/XMLExportDataPilot.cxx
@@ -37,7 +37,6 @@
 #include <dpshttab.hxx>
 #include <dpsdbtab.hxx>
 #include <dpdimsave.hxx>
-#include <dpgroup.hxx>
 #include <dputil.hxx>
 #include <rangeutl.hxx>
 #include <queryentry.hxx>
diff --git a/sc/source/filter/xml/XMLExportIterator.cxx b/sc/source/filter/xml/XMLExportIterator.cxx
index c08867e8fd75..b428f4803afb 100644
--- a/sc/source/filter/xml/XMLExportIterator.cxx
+++ b/sc/source/filter/xml/XMLExportIterator.cxx
@@ -20,17 +20,13 @@
 #include <com/sun/star/table/XCellRange.hpp>
 
 #include "XMLExportIterator.hxx"
-#include <xmloff/xmlnmspe.hxx>
 #include <dociter.hxx>
-#include <convuno.hxx>
 #include "xmlexprt.hxx"
 #include "XMLExportSharedData.hxx"
 #include "XMLStylesExportHelper.hxx"
 #include <document.hxx>
 #include <osl/diagnose.h>
 
-#include <algorithm>
-
 using namespace ::com::sun::star;
 
 ScMyIteratorBase::ScMyIteratorBase()
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index 7ed2653f5a15..770cfbc518cc 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -18,10 +18,8 @@
  */
 
 #include "XMLStylesExportHelper.hxx"
-#include <global.hxx>
 #include <tools/lineend.hxx>
 #include <unonames.hxx>
-#include "XMLConverter.hxx"
 #include "xmlexprt.hxx"
 #include <document.hxx>
 #include <rangeutl.hxx>
@@ -39,8 +37,6 @@
 #include <o3tl/make_unique.hxx>
 #include <osl/diagnose.h>
 
-#include <algorithm>
-
 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 db7b99c4b0a4..1671ebebf070 100644
--- a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
+++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <com/sun/star/text/XText.hpp>
+#include <com/sun/star/sheet/XHeaderFooterContent.hpp>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmlimp.hxx>
@@ -26,7 +27,6 @@
 #include <comphelper/extract.hxx>
 
 #include <unonames.hxx>
-#include <textuno.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sc/source/filter/xml/XMLTableMasterPageExport.cxx b/sc/source/filter/xml/XMLTableMasterPageExport.cxx
index 5819f8f9167f..69cbda1f83a1 100644
--- a/sc/source/filter/xml/XMLTableMasterPageExport.cxx
+++ b/sc/source/filter/xml/XMLTableMasterPageExport.cxx
@@ -21,13 +21,14 @@
 #include <xmloff/xmltoken.hxx>
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/sheet/XHeaderFooterContent.hpp>
 #include "XMLTableMasterPageExport.hxx"
 #include <comphelper/extract.hxx>
 #include <rtl/ref.hxx>
+#include <osl/diagnose.h>
 
 #include <unonames.hxx>
 #include "xmlexprt.hxx"
-#include <textuno.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx
index a81396b1cf8b..6c8f0639462b 100644
--- a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx
+++ b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx
@@ -17,10 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <memory>
 #include "XMLTableShapeImportHelper.hxx"
 #include "xmlimprt.hxx"
-#include "XMLConverter.hxx"
 #include <drwlayer.hxx>
 #include "xmlannoi.hxx"
 #include <rangeutl.hxx>
@@ -32,7 +30,6 @@
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <svx/unoshape.hxx>
-#include <svx/svdobj.hxx>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
 
diff --git a/sc/source/filter/xml/XMLTableShapeResizer.cxx b/sc/source/filter/xml/XMLTableShapeResizer.cxx
index c1b2e27bc197..232aa52cbf62 100644
--- a/sc/source/filter/xml/XMLTableShapeResizer.cxx
+++ b/sc/source/filter/xml/XMLTableShapeResizer.cxx
@@ -18,11 +18,9 @@
  */
 
 #include "XMLTableShapeResizer.hxx"
-#include <unonames.hxx>
 #include <document.hxx>
 #include "xmlimprt.hxx"
 #include <chartlis.hxx>
-#include "XMLConverter.hxx"
 #include <rangeutl.hxx>
 #include <compiler.hxx>
 #include <reftokenhelper.hxx>
diff --git a/sc/source/filter/xml/XMLTableShapesContext.cxx b/sc/source/filter/xml/XMLTableShapesContext.cxx
index e62bef223322..93779e84dc4e 100644
--- a/sc/source/filter/xml/XMLTableShapesContext.cxx
+++ b/sc/source/filter/xml/XMLTableShapesContext.cxx
@@ -20,7 +20,6 @@
 #include "XMLTableShapesContext.hxx"
 #include "XMLTableShapeImportHelper.hxx"
 #include "xmlimprt.hxx"
-#include <document.hxx>
 
 using namespace com::sun::star;
 
diff --git a/sc/source/filter/xml/XMLTableSourceContext.cxx b/sc/source/filter/xml/XMLTableSourceContext.cxx
index 5efbe6ef4157..93ec9ac0ea75 100644
--- a/sc/source/filter/xml/XMLTableSourceContext.cxx
+++ b/sc/source/filter/xml/XMLTableSourceContext.cxx
@@ -24,7 +24,6 @@
 #include <tablink.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnmspe.hxx>
-#include <xmloff/nmspmap.hxx>
 #include <sax/tools/converter.hxx>
 #include <com/sun/star/sheet/XSheetLinkable.hpp>
 
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
index 7a017ac740d3..b9eef7c55d76 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
@@ -22,18 +22,15 @@
 #include "XMLChangeTrackingImportHelper.hxx"
 #include "xmlimprt.hxx"
 #include "xmlconti.hxx"
-#include "XMLConverter.hxx"
 #include <formulacell.hxx>
 #include <textuno.hxx>
 #include <editutil.hxx>
 #include <document.hxx>
-#include <editeng/editobj.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <sax/tools/converter.hxx>
-#include <svl/zforlist.hxx>
 #include <svl/sharedstringpool.hxx>
 #include <comphelper/base64.hxx>
 #include <com/sun/star/text/XTextCursor.hpp>
diff --git a/sc/source/filter/xml/celltextparacontext.cxx b/sc/source/filter/xml/celltextparacontext.cxx
index 17d391fc4523..2f7cc12397cb 100644
--- a/sc/source/filter/xml/celltextparacontext.cxx
+++ b/sc/source/filter/xml/celltextparacontext.cxx
@@ -11,12 +11,9 @@
 #include "xmlimprt.hxx"
 #include "xmlcelli.hxx"
 
-#include <xmloff/nmspmap.hxx>
 #include <comphelper/string.hxx>
 #include <xmloff/xmlnmspe.hxx>
 
-#include <com/sun/star/xml/sax/XAttributeList.hpp>
-
 using namespace com::sun::star;
 using namespace xmloff::token;
 
diff --git a/sc/source/filter/xml/datastreamimport.cxx b/sc/source/filter/xml/datastreamimport.cxx
index 9840c64f46c8..9a7a708bd281 100644
--- a/sc/source/filter/xml/datastreamimport.cxx
+++ b/sc/source/filter/xml/datastreamimport.cxx
@@ -12,7 +12,6 @@
 
 #include <rangeutl.hxx>
 #include <importfilterdata.hxx>
-#include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <formula/grammar.hxx>
diff --git a/sc/source/filter/xml/sheetdata.cxx b/sc/source/filter/xml/sheetdata.cxx
index 3e92862a2182..68d0ada52ca5 100644
--- a/sc/source/filter/xml/sheetdata.cxx
+++ b/sc/source/filter/xml/sheetdata.cxx
@@ -20,7 +20,6 @@
 #include <rtl/ustring.hxx>
 #include <osl/diagnose.h>
 #include <xmloff/families.hxx>
-#include <xmloff/xmlaustp.hxx>
 #include <xmloff/nmspmap.hxx>
 
 #include <sheetdata.hxx>
diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx
index a820514a973c..0a123090de11 100644
--- a/sc/source/filter/xml/xmlbodyi.cxx
+++ b/sc/source/filter/xml/xmlbodyi.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <cstdio>
-
 #include <document.hxx>
 #include <docuno.hxx>
 #include <sheetdata.hxx>
@@ -30,7 +28,6 @@
 #include "xmlimprt.hxx"
 #include "xmldpimp.hxx"
 #include "xmlcvali.hxx"
-#include "xmlstyli.hxx"
 #include "xmllabri.hxx"
 #include "xmlmappingi.hxx"
 #include "XMLConsolidationContext.hxx"
@@ -45,13 +42,10 @@
 #include "datastreamimport.hxx"
 #include <sax/fastattribs.hxx>
 
-#include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnmspe.hxx>
-#include <xmloff/nmspmap.hxx>
 
 #include <comphelper/base64.hxx>
-#include <sax/tools/converter.hxx>
 #include <sal/types.h>
 #include <sal/log.hxx>
 
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index 87627bbc84c7..0e1bac59a14a 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -20,18 +20,13 @@
 #include <memory>
 #include "xmlcelli.hxx"
 #include "xmlimprt.hxx"
-#include "xmltabi.hxx"
-#include "xmlstyli.hxx"
 #include "xmlannoi.hxx"
 #include <global.hxx>
 #include <cellvalue.hxx>
 #include <document.hxx>
-#include <cellsuno.hxx>
 #include <docuno.hxx>
-#include <unonames.hxx>
 #include <postit.hxx>
 #include <sheetdata.hxx>
-#include <docsh.hxx>
 #include <cellform.hxx>
 #include <validat.hxx>
 #include <patattr.hxx>
@@ -45,33 +40,26 @@
 
 #include <arealink.hxx>
 #include <sfx2/linkmgr.hxx>
-#include <convuno.hxx>
-#include "XMLConverter.hxx"
 #include <scerrors.hxx>
 #include <editutil.hxx>
 #include <formulacell.hxx>
 #include "editattributemap.hxx"
-#include <stringutil.hxx>
 #include <tokenarray.hxx>
 #include <scmatrix.hxx>
 #include <documentimport.hxx>
-#include <datastream.hxx>
-#include <rangeutl.hxx>
+#include <externalrefmgr.hxx>
 
 #include <xmloff/maptype.hxx>
-#include <xmloff/xmlaustp.hxx>
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmltoken.hxx>
-#include <xmloff/nmspmap.hxx>
+#include <xmloff/xmlprmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/families.hxx>
-#include <xmloff/numehelp.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/prstylei.hxx>
 #include <svl/zforlist.hxx>
 #include <svx/svdocapt.hxx>
 #include <editeng/outlobj.hxx>
-#include <editeng/editobj.hxx>
 #include <editeng/wghtitem.hxx>
 #include <editeng/colritem.hxx>
 #include <editeng/fhgtitem.hxx>
@@ -91,21 +79,17 @@
 #include <editeng/emphasismarkitem.hxx>
 #include <editeng/langitem.hxx>
 #include <svx/unoapi.hxx>
-#include <svl/languageoptions.hxx>
 #include <svl/sharedstringpool.hxx>
-#include <svtools/miscopt.hxx>
 #include <sax/tools/converter.hxx>
 #include <sax/fastattribs.hxx>
 
 #include <com/sun/star/util/NumberFormat.hpp>
-#include <com/sun/star/util/Date.hpp>
 
 #include <com/sun/star/sheet/ValidationType.hpp>
 #include <com/sun/star/sheet/ValidationAlertStyle.hpp>
 
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
-#include <tools/date.hxx>
 #include <i18nlangtag/lang.h>
 #include <o3tl/make_unique.hxx>
 
diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx
index a9033196ecbc..f4271ef75192 100644
--- a/sc/source/filter/xml/xmlcoli.cxx
+++ b/sc/source/filter/xml/xmlcoli.cxx
@@ -19,7 +19,6 @@
 
 #include "xmlcoli.hxx"
 #include "xmlimprt.hxx"
-#include <global.hxx>
 #include "xmlstyli.hxx"
 #include <document.hxx>
 #include <docuno.hxx>
@@ -27,8 +26,6 @@
 #include <sheetdata.hxx>
 #include <unonames.hxx>
 
-#include <xmloff/xmltkmap.hxx>
-#include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/families.hxx>
 #include <xmloff/xmltoken.hxx>
diff --git a/sc/source/filter/xml/xmlcondformat.cxx b/sc/source/filter/xml/xmlcondformat.cxx
index f1ee6d7fdc02..86bc2b7ef53b 100644
--- a/sc/source/filter/xml/xmlcondformat.cxx
+++ b/sc/source/filter/xml/xmlcondformat.cxx
@@ -10,7 +10,6 @@
 #include <memory>
 #include "xmlcondformat.hxx"
 #include "xmlimprt.hxx"
-#include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmlictxt.hxx>
 #include <sal/log.hxx>
@@ -22,7 +21,6 @@
 #include <sax/tools/converter.hxx>
 #include <rangelst.hxx>
 #include <rangeutl.hxx>
-#include <docfunc.hxx>
 #include "XMLConverter.hxx"
 #include <stylehelper.hxx>
 #include <tokenarray.hxx>
diff --git a/sc/source/filter/xml/xmlconti.cxx b/sc/source/filter/xml/xmlconti.cxx
index e3b7a72ad7f3..884b8b79a4f4 100644
--- a/sc/source/filter/xml/xmlconti.cxx
+++ b/sc/source/filter/xml/xmlconti.cxx
@@ -19,10 +19,7 @@
 
 #include "xmlconti.hxx"
 #include "xmlimprt.hxx"
-#include <global.hxx>
-#include <document.hxx>
 
-#include <xmloff/xmltkmap.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltoken.hxx>
diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx
index b91b2f2d0048..58a6e588dbc0 100644
--- a/sc/source/filter/xml/xmlcvali.cxx
+++ b/sc/source/filter/xml/xmlcvali.cxx
@@ -24,7 +24,6 @@
 #include "XMLConverter.hxx"
 
 #include <xmloff/xmltkmap.hxx>
-#include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/XMLEventsImportContext.hxx>
diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx
index 25affb883ab7..cefdc779a85f 100644
--- a/sc/source/filter/xml/xmldpimp.cxx
+++ b/sc/source/filter/xml/xmldpimp.cxx
@@ -20,14 +20,11 @@
 #include "xmldpimp.hxx"
 #include "xmlimprt.hxx"
 #include "xmlfilti.hxx"
-#include "xmlsorti.hxx"
 #include <document.hxx>
-#include <docuno.hxx>
 #include <dpshttab.hxx>
 #include <dpsdbtab.hxx>
 #include <attrib.hxx>
 #include "XMLConverter.hxx"
-#include <dpgroup.hxx>
 #include <dpdimsave.hxx>
 #include <rangeutl.hxx>
 #include <dpoutputgeometry.hxx>
@@ -35,12 +32,9 @@
 
 #include "pivotsource.hxx"
 
-#include <xmloff/xmltkmap.hxx>
-#include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmluconv.hxx>
-#include <sax/tools/converter.hxx>
 
 #include <com/sun/star/sheet/DataPilotFieldReferenceType.hpp>
 #include <com/sun/star/sheet/DataPilotFieldReferenceItemType.hpp>
diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx
index e21bf273f7b6..ddd0596e0520 100644
--- a/sc/source/filter/xml/xmldrani.cxx
+++ b/sc/source/filter/xml/xmldrani.cxx
@@ -23,23 +23,17 @@
 #include "xmlsorti.hxx"
 #include <document.hxx>
 #include <globalnames.hxx>
-#include <docuno.hxx>
 #include <dbdata.hxx>
 #include <datauno.hxx>
 #include <attrib.hxx>
 #include <unonames.hxx>
-#include <convuno.hxx>
 #include "XMLConverter.hxx"
 #include <rangeutl.hxx>
-#include <queryentry.hxx>
 #include <dputil.hxx>
 #include <sortparam.hxx>
 
-#include <xmloff/xmltkmap.hxx>
-#include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnmspe.hxx>
-#include <xmloff/xmlerror.hxx>
 
 #include <sax/tools/converter.hxx>
 
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index d3d882d8c4d1..cb59fca9c129 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -20,14 +20,12 @@
 #include <sal/config.h>
 #include <sal/log.hxx>
 
-#include <appluno.hxx>
 #include "xmlexprt.hxx"
 #include "XMLConverter.hxx"
 #include "xmlstyle.hxx"
 #include <unonames.hxx>
 #include <document.hxx>
 #include <olinetab.hxx>
-#include <cellsuno.hxx>
 #include <formulacell.hxx>
 #include <rangenam.hxx>
 #include "XMLTableMasterPageExport.hxx"
@@ -49,10 +47,8 @@
 #include <scitems.hxx>
 #include <docpool.hxx>
 #include <userdat.hxx>
-#include <dociter.hxx>
 #include <chgtrack.hxx>
 #include <rangeutl.hxx>
-#include <convuno.hxx>
 #include <postit.hxx>
 #include <externalrefmgr.hxx>
 #include <editutil.hxx>
@@ -109,23 +105,15 @@
 #include <rtl/ustring.hxx>
 
 #include <tools/color.hxx>
-#include <tools/urlobj.hxx>
 #include <rtl/math.hxx>
 #include <svl/zforlist.hxx>
 #include <svx/unoshape.hxx>
 #include <comphelper/base64.hxx>
 #include <comphelper/extract.hxx>
-#include <toolkit/helper/convert.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdocapt.hxx>
-#include <editeng/outlobj.hxx>
-#include <svx/svditer.hxx>
-#include <svx/svdpage.hxx>
 #include <svtools/miscopt.hxx>
 
-#include <officecfg/Office/Common.hxx>
-
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XNamed.hpp>
@@ -139,6 +127,8 @@
 #include <com/sun/star/sheet/XUniqueCellFormatRangesSupplier.hpp>
 #include <com/sun/star/sheet/XLabelRange.hpp>
 #include <com/sun/star/sheet/NamedRangeFlag.hpp>
+#include <com/sun/star/sheet/XSheetCellCursor.hpp>
+#include <com/sun/star/sheet/XSheetCellRanges.hpp>
 #include <com/sun/star/sheet/XSheetLinkable.hpp>
 #include <com/sun/star/sheet/GlobalSheetSettings.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
@@ -161,6 +151,8 @@
 #include <vector>
 #include <vbahelper/vbaaccesshelper.hxx>
 
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+
 
 
 //! not found in unonames.hxx
diff --git a/sc/source/filter/xml/xmlexternaltabi.cxx b/sc/source/filter/xml/xmlexternaltabi.cxx
index 5cd76da70c1e..8d0a810dad09 100644
--- a/sc/source/filter/xml/xmlexternaltabi.cxx
+++ b/sc/source/filter/xml/xmlexternaltabi.cxx
@@ -22,12 +22,10 @@
 #include "xmltabi.hxx"
 #include "xmlstyli.hxx"
 
-#include <token.hxx>
 #include <document.hxx>
 #include <documentimport.hxx>
 
 #include <svl/sharedstringpool.hxx>
-#include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx
index 70994e13e283..ea051785c59d 100644
--- a/sc/source/filter/xml/xmlfilti.cxx
+++ b/sc/source/filter/xml/xmlfilti.cxx
@@ -21,17 +21,12 @@
 #include "xmlimprt.hxx"
 #include "xmldrani.hxx"
 #include "xmldpimp.hxx"
-#include <docuno.hxx>
-#include <convuno.hxx>
-#include "XMLConverter.hxx"
 #include <rangeutl.hxx>
 #include <queryentry.hxx>
 #include <document.hxx>
 
 #include <o3tl/safeint.hxx>
 #include <svl/sharedstringpool.hxx>
-#include <xmloff/xmltkmap.hxx>
-#include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnmspe.hxx>
 
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 63f86f079bbb..a572e5f8e459 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -21,17 +21,14 @@
 #include <sal/log.hxx>
 
 #include <svl/zforlist.hxx>
-#include <sal/macros.h>
 
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlnmspe.hxx>
-#include <xmloff/i18nmap.hxx>
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlmetai.hxx>
 #include <sfx2/objsh.hxx>
 #include <unotools/streamwrap.hxx>
-#include <xmloff/xmlnumfi.hxx>
 #include <xmloff/xmlscripti.hxx>
 #include <xmloff/XMLFontStylesContext.hxx>
 #include <xmloff/DocumentSettingsContext.hxx>
@@ -40,9 +37,6 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlerror.hxx>
 
-#include <sax/tools/converter.hxx>
-
-#include <svl/zformat.hxx>
 #include <svl/languageoptions.hxx>
 #include <editeng/editstat.hxx>
 #include <formula/errorcodes.hxx>
@@ -53,13 +47,11 @@
 #include <document.hxx>
 #include <docsh.hxx>
 #include <docuno.hxx>
-#include <nameuno.hxx>
 #include "xmlbodyi.hxx"
 #include "xmlstyli.hxx"
 #include <ViewSettingsSequenceDefines.hxx>
 
 #include <compiler.hxx>
-#include <patattr.hxx>
 
 #include "XMLConverter.hxx"
 #include "XMLDetectiveContext.hxx"
@@ -69,7 +61,6 @@
 #include "XMLStylesImportHelper.hxx"
 #include <sheetdata.hxx>
 #include <rangeutl.hxx>
-#include <postit.hxx>
 #include <formulaparserpool.hxx>
 #include <externalrefmgr.hxx>
 #include <editutil.hxx>
@@ -91,7 +82,6 @@
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/io/IOException.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
-#include <com/sun/star/sheet/XSheetCellRange.hpp>
 #include <com/sun/star/document/XActionLockable.hpp>
 #include <com/sun/star/util/MalformedNumberFormatException.hpp>
 #include <com/sun/star/util/NumberFormat.hpp>
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index 6adf49bee4e5..7ebe66e10458 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -22,7 +22,6 @@
 
 #include <xmloff/xmlimp.hxx>
 #include "xmlsubti.hxx"
-#include <global.hxx>
 #include <formula/grammar.hxx>
 #include <dociter.hxx>
 
diff --git a/sc/source/filter/xml/xmllabri.cxx b/sc/source/filter/xml/xmllabri.cxx
index 91ba82d26222..161a288f6242 100644
--- a/sc/source/filter/xml/xmllabri.cxx
+++ b/sc/source/filter/xml/xmllabri.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "xmllabri.hxx"
-#include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include "xmlimprt.hxx"
 #include <xmloff/xmlnmspe.hxx>
diff --git a/sc/source/filter/xml/xmlmappingi.cxx b/sc/source/filter/xml/xmlmappingi.cxx
index 12db626b7940..0ce24a568e4b 100644
--- a/sc/source/filter/xml/xmlmappingi.cxx
+++ b/sc/source/filter/xml/xmlmappingi.cxx
@@ -11,17 +11,11 @@
 #include "xmlmappingi.hxx"
 #include "xmltransformationi.hxx"
 
-#include <xmloff/xmltkmap.hxx>
-#include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnmspe.hxx>
-#include <xmloff/xmlerror.hxx>
 
 #include <datamapper.hxx>
 #include <document.hxx>
-#include <dbdata.hxx>
-
-#include <sax/tools/converter.hxx>
 
 using namespace com::sun::star;
 using namespace xmloff::token;
diff --git a/sc/source/filter/xml/xmlnexpi.cxx b/sc/source/filter/xml/xmlnexpi.cxx
index b83cda294db6..737b3cda7a62 100644
--- a/sc/source/filter/xml/xmlnexpi.cxx
+++ b/sc/source/filter/xml/xmlnexpi.cxx
@@ -17,12 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <rtl/ustrbuf.hxx>
-
 #include "xmlnexpi.hxx"
 #include "xmlimprt.hxx"
-#include "xmlcelli.hxx"
-#include <docuno.hxx>
 #include <document.hxx>
 
 #include <xmloff/xmlnmspe.hxx>
diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx
index 5436f08ea342..e2729da7c2c9 100644
--- a/sc/source/filter/xml/xmlrowi.cxx
+++ b/sc/source/filter/xml/xmlrowi.cxx
@@ -20,7 +20,6 @@
 #include "xmlrowi.hxx"
 #include "xmlimprt.hxx"
 #include "xmlcelli.hxx"
-#include <global.hxx>
 #include "xmlstyli.hxx"
 #include <document.hxx>
 #include <docuno.hxx>
@@ -29,8 +28,6 @@
 #include <documentimport.hxx>
 #include <unonames.hxx>
 
-#include <xmloff/xmltkmap.hxx>
-#include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/families.hxx>
 #include <xmloff/xmltoken.hxx>
diff --git a/sc/source/filter/xml/xmlsceni.cxx b/sc/source/filter/xml/xmlsceni.cxx
index ed3c8b0dd49b..37df2e26db52 100644
--- a/sc/source/filter/xml/xmlsceni.cxx
+++ b/sc/source/filter/xml/xmlsceni.cxx
@@ -20,13 +20,9 @@
 #include <document.hxx>
 #include "xmlimprt.hxx"
 #include "xmlsceni.hxx"
-#include <docuno.hxx>
 #include <attrib.hxx>
-#include "XMLConverter.hxx"
 #include <rangeutl.hxx>
 
-#include <xmloff/xmltkmap.hxx>
-#include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnmspe.hxx>
 
diff --git a/sc/source/filter/xml/xmlsorti.cxx b/sc/source/filter/xml/xmlsorti.cxx
index 71a6b8dc59c9..938b6e7b2cb3 100644
--- a/sc/source/filter/xml/xmlsorti.cxx
+++ b/sc/source/filter/xml/xmlsorti.cxx
@@ -20,14 +20,10 @@
 #include "xmldrani.hxx"
 #include "xmlsorti.hxx"
 #include "xmlimprt.hxx"
-#include <docuno.hxx>
 #include <convuno.hxx>
-#include "XMLConverter.hxx"
 #include <unonames.hxx>
 #include <rangeutl.hxx>
 
-#include <xmloff/xmltkmap.hxx>
-#include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnmspe.hxx>
 
diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx
index 20e38ec157f7..d92d30049f28 100644
--- a/sc/source/filter/xml/xmlstyle.cxx
+++ b/sc/source/filter/xml/xmlstyle.cxx
@@ -19,9 +19,7 @@
 
 #include "xmlstyle.hxx"
 #include "xmlexprt.hxx"
-#include "xmlimprt.hxx"
 
-#include "XMLConverter.hxx"
 #include <rangeutl.hxx>
 #include <unonames.hxx>
 
@@ -29,10 +27,6 @@
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltypes.hxx>
 #include <xmloff/families.hxx>
-#include <xmloff/xmlnumfe.hxx>
-#include <xmloff/xmlnumfi.hxx>
-#include <xmloff/nmspmap.hxx>
-#include <xmloff/attrlist.hxx>
 #include <xmloff/contextid.hxx>
 #include <xmloff/txtprmap.hxx>
 #include <sax/tools/converter.hxx>
diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx
index 5ccce36c9853..1fd83894a6d2 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -26,11 +26,9 @@
 #include <xmloff/XMLGraphicsDefaultStyle.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/table/BorderLine2.hpp>
 #include <comphelper/extract.hxx>
 #include <xmloff/xmlprcon.hxx>
-#include <xmloff/xmluconv.hxx>
 #include "XMLTableHeaderFooterContext.hxx"
 #include "XMLConverter.hxx"
 #include "XMLTableShapeImportHelper.hxx"
@@ -44,14 +42,7 @@
 #include <unonames.hxx>
 #include <document.hxx>
 #include <conditio.hxx>
-#include <svl/intitem.hxx>
 #include <rangelst.hxx>
-#include <rangeutl.hxx>
-#include <docfunc.hxx>
-#include <markdata.hxx>
-#include <docpool.hxx>
-#include <scitems.hxx>
-#include <patattr.hxx>
 
 #define XML_LINE_LEFT 0
 #define XML_LINE_RIGHT 1
diff --git a/sc/source/filter/xml/xmlsubti.cxx b/sc/source/filter/xml/xmlsubti.cxx
index 06ebc1814f64..d28a930b2030 100644
--- a/sc/source/filter/xml/xmlsubti.cxx
+++ b/sc/source/filter/xml/xmlsubti.cxx
@@ -18,29 +18,22 @@
  */
 
 #include "xmlsubti.hxx"
-#include <global.hxx>
 #include "xmlstyli.hxx"
 #include "xmlimprt.hxx"
 #include <document.hxx>
-#include <markdata.hxx>
 #include "XMLConverter.hxx"
 #include <docuno.hxx>
-#include <cellsuno.hxx>
 #include "XMLStylesImportHelper.hxx"
 #include <sheetdata.hxx>
 #include <tabprotection.hxx>
 #include <tokenarray.hxx>
-#include <convuno.hxx>
 #include <documentimport.hxx>
 
-#include <svx/svdpage.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
-#include <sax/tools/converter.hxx>
-#include <xmloff/xmltkmap.hxx>
-#include <xmloff/nmspmap.hxx>
-#include <xmloff/xmlerror.hxx>
 #include <comphelper/base64.hxx>
+#include <com/sun/star/sheet/XSpreadsheet.hpp>
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
 
diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx
index f63bffb4fd4e..d9e447699616 100644
--- a/sc/source/filter/xml/xmltabi.cxx
+++ b/sc/source/filter/xml/xmltabi.cxx
@@ -27,7 +27,6 @@
 #include <document.hxx>
 #include <docuno.hxx>
 #include <olinetab.hxx>
-#include "XMLConverter.hxx"
 #include "XMLTableShapesContext.hxx"
 #include "XMLTableSourceContext.hxx"
 #include "XMLStylesImportHelper.hxx"
@@ -37,7 +36,6 @@
 #include "xmlcondformat.hxx"
 
 #include <xmloff/xmltkmap.hxx>
-#include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/XMLEventsImportContext.hxx>
diff --git a/sc/source/filter/xml/xmltransformationi.cxx b/sc/source/filter/xml/xmltransformationi.cxx
index 576716f87140..c8e3d4768900 100644
--- a/sc/source/filter/xml/xmltransformationi.cxx
+++ b/sc/source/filter/xml/xmltransformationi.cxx
@@ -10,16 +10,11 @@
 #include "xmlimprt.hxx"
 #include "xmltransformationi.hxx"
 
-#include <xmloff/xmltkmap.hxx>
-#include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnmspe.hxx>
-#include <xmloff/xmlerror.hxx>
 
 #include <datamapper.hxx>
 #include <document.hxx>
-#include <dbdata.hxx>
-#include <sax/tools/converter.hxx>
 
 using namespace com::sun::star;
 using namespace xmloff::token;
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 36f6b7f1cf1e..5910779f9e4f 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <vcl/errinf.hxx>
-#include <svl/style.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/objsh.hxx>
 #include <sot/storage.hxx>
@@ -26,7 +25,6 @@
 #include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertysequence.hxx>
-#include <unotools/streamwrap.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
 #include <svx/xmlgrhlp.hxx>
@@ -41,7 +39,6 @@
 #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/frame/XModel.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <comphelper/propertysetinfo.hxx>
 #include <comphelper/genericpropertyset.hxx>
@@ -55,7 +52,6 @@
 #include <sfx2/DocumentMetadataAccess.hxx>
 #include <comphelper/documentconstants.hxx>
 #include <svx/xmleohlp.hxx>
-#include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
 #include <unotools/saveopt.hxx>
 
@@ -63,7 +59,6 @@
 #include <xmlwrap.hxx>
 #include "xmlimprt.hxx"
 #include "xmlexprt.hxx"
-#include <global.hxx>
 #include <globstr.hrc>
 #include <scresid.hxx>
 #include <scerrors.hxx>


More information about the Libreoffice-commits mailing list