tdf#42949 Fix IWYU warnings in sc/source/filter/oox/*cxx
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: Ibf5b7a813910f2ab37d8705b99bd8a9a19706c43
Reviewed-on: https://gerrit.libreoffice.org/65061
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index 59f5f167..3cb5464 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -384,11 +384,17 @@
- class XclExpChangeTrack
# Needed for typedef
- excrecds.hxx
sc/source/filter/inc/formulabase.hxx:
# Needed for typedef
- com/sun/star/table/CellAddress.hpp
sc/source/filter/inc/ooxformulaparser.hxx:
# base class has to be a complete type
- com/sun/star/lang/XInitialization.hpp
- com/sun/star/lang/XServiceInfo.hpp
- com/sun/star/sheet/XFilterFormulaParser.hpp
sc/source/filter/inc/themebuffer.hxx:
# Needed for typedef
- stylesbuffer.hxx
sc/source/filter/inc/xerecord.hxx:
# Needed for member access
- xestream.hxx
@@ -682,3 +688,12 @@
sc/source/filter/excel/xistyle.cxx:
# Needed for direct member access
- xladdress.hxx
sc/source/filter/oox/ooxformulaparser.cxx:
# Needed for direct member access
- com/sun/star/lang/XComponent.hpp
sc/source/filter/oox/richstring.cxx:
# Complete type needed for unique_ptr
- editeng/editobj.hxx
sc/source/filter/oox/worksheethelper.cxx:
# Needed for implicit dtor
- editeng/editobj.hxx
diff --git a/sc/source/filter/inc/autofilterbuffer.hxx b/sc/source/filter/inc/autofilterbuffer.hxx
index 785dc55..c6387e5 100644
--- a/sc/source/filter/inc/autofilterbuffer.hxx
+++ b/sc/source/filter/inc/autofilterbuffer.hxx
@@ -23,9 +23,9 @@
#include <oox/helper/helper.hxx>
#include <oox/helper/refvector.hxx>
#include "workbookhelper.hxx"
#include <com/sun/star/sheet/TableFilterField3.hpp>
namespace com { namespace sun { namespace star {
namespace sheet { struct TableFilterField3; }
namespace sheet { class XDatabaseRange; }
namespace sheet { class XSheetFilterDescriptor3; }
} } }
diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx
index 90bc516..3d3a014 100644
--- a/sc/source/filter/inc/formulabase.hxx
+++ b/sc/source/filter/inc/formulabase.hxx
@@ -22,6 +22,7 @@
#include <com/sun/star/beans/Pair.hpp>
#include <com/sun/star/sheet/FormulaToken.hpp>
#include <com/sun/star/table/CellAddress.hpp>
#include <oox/helper/propertyset.hxx>
#include <oox/helper/refvector.hxx>
#include "workbookhelper.hxx"
@@ -33,7 +34,6 @@
namespace oox { template< typename Type > class Matrix; }
namespace com { namespace sun { namespace star { namespace sheet { struct FormulaOpCodeMapEntry; } } } }
namespace com { namespace sun { namespace star { namespace table { struct CellAddress; } } } }
namespace oox { class SequenceInputStream; }
namespace oox { namespace xls { struct BinAddress; } }
class ScRangeList;
diff --git a/sc/source/filter/inc/themebuffer.hxx b/sc/source/filter/inc/themebuffer.hxx
index c54b08b..9977154 100644
--- a/sc/source/filter/inc/themebuffer.hxx
+++ b/sc/source/filter/inc/themebuffer.hxx
@@ -23,12 +23,11 @@
#include <memory>
#include <oox/drawingml/theme.hxx>
#include "workbookhelper.hxx"
#include "stylesbuffer.hxx"
namespace oox {
namespace xls {
struct FontModel;
class ThemeBuffer : public ::oox::drawingml::Theme, public WorkbookHelper
{
public:
diff --git a/sc/source/filter/oox/addressconverter.cxx b/sc/source/filter/oox/addressconverter.cxx
index 552bd04..196c6ad 100644
--- a/sc/source/filter/oox/addressconverter.cxx
+++ b/sc/source/filter/oox/addressconverter.cxx
@@ -24,10 +24,7 @@
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <convuno.hxx>
#include <osl/diagnose.h>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
#include <oox/core/filterbase.hxx>
#include <oox/helper/containerhelper.hxx>
#include <oox/helper/binaryinputstream.hxx>
namespace oox {
diff --git a/sc/source/filter/oox/autofiltercontext.cxx b/sc/source/filter/oox/autofiltercontext.cxx
index 48add9c..1ec7b71 100644
--- a/sc/source/filter/oox/autofiltercontext.cxx
+++ b/sc/source/filter/oox/autofiltercontext.cxx
@@ -22,7 +22,6 @@
#include <autofilterbuffer.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
namespace oox {
namespace xls {
diff --git a/sc/source/filter/oox/biffhelper.cxx b/sc/source/filter/oox/biffhelper.cxx
index 3dbe1cd..ce48e93 100644
--- a/sc/source/filter/oox/biffhelper.cxx
+++ b/sc/source/filter/oox/biffhelper.cxx
@@ -20,10 +20,7 @@
#include <biffhelper.hxx>
#include <rtl/math.hxx>
#include <rtl/tencinfo.h>
#include <osl/diagnose.h>
#include <worksheethelper.hxx>
#include <oox/helper/binaryoutputstream.hxx>
#include <oox/helper/binaryinputstream.hxx>
namespace oox {
diff --git a/sc/source/filter/oox/chartsheetfragment.cxx b/sc/source/filter/oox/chartsheetfragment.cxx
index cca6a3a..03dfde6 100644
--- a/sc/source/filter/oox/chartsheetfragment.cxx
+++ b/sc/source/filter/oox/chartsheetfragment.cxx
@@ -21,10 +21,8 @@
#include <oox/helper/attributelist.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
#include <pagesettings.hxx>
#include <viewsettings.hxx>
#include <workbooksettings.hxx>
#include <worksheetsettings.hxx>
#include <biffhelper.hxx>
diff --git a/sc/source/filter/oox/commentsbuffer.cxx b/sc/source/filter/oox/commentsbuffer.cxx
index 453ebed..aab70b07 100644
--- a/sc/source/filter/oox/commentsbuffer.cxx
+++ b/sc/source/filter/oox/commentsbuffer.cxx
@@ -34,7 +34,6 @@
#include <addressconverter.hxx>
#include <drawingfragment.hxx>
#include <svx/sdtaitm.hxx>
#include <unitconverter.hxx>
namespace oox {
namespace xls {
diff --git a/sc/source/filter/oox/commentsfragment.cxx b/sc/source/filter/oox/commentsfragment.cxx
index 8aba582..8a4fe85 100644
--- a/sc/source/filter/oox/commentsfragment.cxx
+++ b/sc/source/filter/oox/commentsfragment.cxx
@@ -22,7 +22,6 @@
#include <biffhelper.hxx>
#include <richstringcontext.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
namespace oox {
namespace xls {
diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx
index 82c9202..3b8bb65 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -22,17 +22,12 @@
#include <formulaparser.hxx>
#include <com/sun/star/sheet/ConditionOperator2.hpp>
#include <rtl/ustrbuf.hxx>
#include <sal/log.hxx>
#include <osl/diagnose.h>
#include <svl/intitem.hxx>
#include <svl/sharedstringpool.hxx>
#include <oox/core/filterbase.hxx>
#include <oox/helper/binaryinputstream.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/helper/containerhelper.hxx>
#include <oox/helper/propertyset.hxx>
#include <oox/token/properties.hxx>
#include <oox/token/tokens.hxx>
#include <addressconverter.hxx>
#include <biffhelper.hxx>
@@ -42,12 +37,9 @@
#include <colorscale.hxx>
#include <conditio.hxx>
#include <document.hxx>
#include <docfunc.hxx>
#include <tokenarray.hxx>
#include <tokenuno.hxx>
namespace oox { class AttributeList; }
namespace oox {
namespace xls {
diff --git a/sc/source/filter/oox/condformatcontext.cxx b/sc/source/filter/oox/condformatcontext.cxx
index a76ee19..dd3afa5 100644
--- a/sc/source/filter/oox/condformatcontext.cxx
+++ b/sc/source/filter/oox/condformatcontext.cxx
@@ -23,7 +23,6 @@
#include <biffhelper.hxx>
#include <condformatbuffer.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
namespace oox {
namespace xls {
diff --git a/sc/source/filter/oox/connectionsfragment.cxx b/sc/source/filter/oox/connectionsfragment.cxx
index 9901d91..3774f73 100644
--- a/sc/source/filter/oox/connectionsfragment.cxx
+++ b/sc/source/filter/oox/connectionsfragment.cxx
@@ -19,9 +19,7 @@
#include <connectionsfragment.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
#include <biffhelper.hxx>
#include <connectionsbuffer.hxx>
diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx
index 82cb436..1fd80b4 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -20,17 +20,12 @@
#include <memory>
#include <defnamesbuffer.hxx>
#include <com/sun/star/sheet/ComplexReference.hpp>
#include <com/sun/star/sheet/ExternalReference.hpp>
#include <com/sun/star/sheet/NamedRangeFlag.hpp>
#include <com/sun/star/sheet/ReferenceFlags.hpp>
#include <com/sun/star/sheet/SingleReference.hpp>
#include <com/sun/star/sheet/XPrintAreas.hpp>
#include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
#include <oox/helper/binaryinputstream.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/helper/propertyset.hxx>
#include <oox/token/tokens.hxx>
#include <addressconverter.hxx>
#include <biffhelper.hxx>
diff --git a/sc/source/filter/oox/drawingbase.cxx b/sc/source/filter/oox/drawingbase.cxx
index 9b6e0ab..d3ea89d 100644
--- a/sc/source/filter/oox/drawingbase.cxx
+++ b/sc/source/filter/oox/drawingbase.cxx
@@ -23,11 +23,8 @@
#include <com/sun/star/awt/Rectangle.hpp>
#include <osl/diagnose.h>
#include <oox/helper/attributelist.hxx>
#include <oox/helper/binaryinputstream.hxx>
#include <unitconverter.hxx>
#include <oox/helper/propertyset.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/properties.hxx>
#include <oox/token/tokens.hxx>
namespace oox {
diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx
index c5fda17..2546bf9 100644
--- a/sc/source/filter/oox/excelfilter.cxx
+++ b/sc/source/filter/oox/excelfilter.cxx
@@ -23,14 +23,11 @@
#include <osl/diagnose.h>
#include <sal/log.hxx>
#include <oox/helper/binaryinputstream.hxx>
#include <excelchartconverter.hxx>
#include <excelvbaproject.hxx>
#include <stylesbuffer.hxx>
#include <themebuffer.hxx>
#include <workbookfragment.hxx>
#include <xestream.hxx>
#include <xlstream.hxx>
#include <addressconverter.hxx>
#include <document.hxx>
@@ -39,6 +36,7 @@
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <svtools/sfxecode.hxx>
#include <svtools/ehdl.hxx>
#include <tools/urlobj.hxx>
namespace oox {
diff --git a/sc/source/filter/oox/excelhandlers.cxx b/sc/source/filter/oox/excelhandlers.cxx
index 3b22704..e22a3b2 100644
--- a/sc/source/filter/oox/excelhandlers.cxx
+++ b/sc/source/filter/oox/excelhandlers.cxx
@@ -19,8 +19,6 @@
#include <excelhandlers.hxx>
#include <oox/core/filterbase.hxx>
namespace oox {
namespace xls {
diff --git a/sc/source/filter/oox/excelvbaproject.cxx b/sc/source/filter/oox/excelvbaproject.cxx
index 959097b..c77a52d 100644
--- a/sc/source/filter/oox/excelvbaproject.cxx
+++ b/sc/source/filter/oox/excelvbaproject.cxx
@@ -27,8 +27,6 @@
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/script/ModuleType.hpp>
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <rtl/ustrbuf.hxx>
#include <oox/helper/helper.hxx>
#include <oox/helper/propertyset.hxx>
#include <oox/token/properties.hxx>
diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx
index 204b62e..6be609e 100644
--- a/sc/source/filter/oox/externallinkbuffer.cxx
+++ b/sc/source/filter/oox/externallinkbuffer.cxx
@@ -26,19 +26,16 @@
#include <com/sun/star/sheet/XDDELinkResults.hpp>
#include <com/sun/star/sheet/XExternalDocLinks.hpp>
#include <osl/diagnose.h>
#include <rtl/strbuf.hxx>
#include <sal/log.hxx>
#include <oox/core/filterbase.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/helper/binaryinputstream.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/properties.hxx>
#include <oox/core/relations.hxx>
#include <oox/token/tokens.hxx>
#include <addressconverter.hxx>
#include <biffhelper.hxx>
#include <excelhandlers.hxx>
#include <formulaparser.hxx>
#include <worksheetbuffer.hxx>
namespace oox {
namespace xls {
diff --git a/sc/source/filter/oox/externallinkfragment.cxx b/sc/source/filter/oox/externallinkfragment.cxx
index a280add..7c29458 100644
--- a/sc/source/filter/oox/externallinkfragment.cxx
+++ b/sc/source/filter/oox/externallinkfragment.cxx
@@ -25,8 +25,7 @@
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
#include <osl/diagnose.h>
#include <defnamesbuffer.hxx>
#include <sheetdatacontext.hxx>
#include <addressconverter.hxx>
#include <unitconverter.hxx>
#include <biffhelper.hxx>
diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx
index d9e9448..1ce45b0 100644
--- a/sc/source/filter/oox/formulabuffer.cxx
+++ b/sc/source/filter/oox/formulabuffer.cxx
@@ -8,15 +8,12 @@
*/
#include <formulabuffer.hxx>
#include <formulaparser.hxx>
#include <externallinkbuffer.hxx>
#include <formulacell.hxx>
#include <document.hxx>
#include <documentimport.hxx>
#include <rangelst.hxx>
#include <autonamecache.hxx>
#include <tokenuno.hxx>
#include <tokenarray.hxx>
#include <sharedformulagroups.hxx>
#include <externalrefmgr.hxx>
diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx
index 765881c..14c4281 100644
--- a/sc/source/filter/oox/formulaparser.cxx
+++ b/sc/source/filter/oox/formulaparser.cxx
@@ -34,7 +34,6 @@
#include <defnamesbuffer.hxx>
#include <externallinkbuffer.hxx>
#include <tablebuffer.hxx>
#include <worksheethelper.hxx>
namespace oox {
namespace xls {
diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx
index a40fbfa..906bfdb 100644
--- a/sc/source/filter/oox/numberformatsbuffer.cxx
+++ b/sc/source/filter/oox/numberformatsbuffer.cxx
@@ -33,11 +33,8 @@
#include <rtl/ustrbuf.hxx>
#include <svl/intitem.hxx>
#include <svl/itemset.hxx>
#include <oox/core/filterbase.hxx>
#include <oox/helper/binaryinputstream.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/helper/propertymap.hxx>
#include <oox/token/properties.hxx>
#include <oox/token/tokens.hxx>
#include <scitems.hxx>
#include <document.hxx>
diff --git a/sc/source/filter/oox/ooxformulaparser.cxx b/sc/source/filter/oox/ooxformulaparser.cxx
index c3de7a4..eb94e35 100644
--- a/sc/source/filter/oox/ooxformulaparser.cxx
+++ b/sc/source/filter/oox/ooxformulaparser.cxx
@@ -21,11 +21,12 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <osl/diagnose.h>
#include <cppuhelper/supportsservice.hxx>
#include <formulaparser.hxx>
namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
namespace oox {
namespace xls {
diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx
index c650a53..32d6ddc 100644
--- a/sc/source/filter/oox/pagesettings.cxx
+++ b/sc/source/filter/oox/pagesettings.cxx
@@ -27,14 +27,12 @@
#include <com/sun/star/style/GraphicLocation.hpp>
#include <com/sun/star/text/FilenameDisplayFormat.hpp>
#include <com/sun/star/text/XText.hpp>
#include <com/sun/star/text/XTextContent.hpp>
#include <com/sun/star/text/XTextCursor.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <osl/diagnose.h>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
#include <sax/tools/converter.hxx>
#include <oox/core/xmlfilterbase.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/helper/binaryinputstream.hxx>
#include <oox/helper/graphichelper.hxx>
@@ -43,15 +41,14 @@
#include <oox/token/namespaces.hxx>
#include <oox/token/properties.hxx>
#include <oox/token/tokens.hxx>
#include <excelhandlers.hxx>
#include <oox/core/filterbase.hxx>
#include <oox/core/relations.hxx>
#include <stylesbuffer.hxx>
#include <unitconverter.hxx>
#include <document.hxx>
#include <biffhelper.hxx>
#include <filter/msfilter/util.hxx>
namespace oox { class AttributeList; }
namespace oox {
namespace xls {
diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx
index bb4adfb..dc8366c 100644
--- a/sc/source/filter/oox/pivotcachebuffer.cxx
+++ b/sc/source/filter/oox/pivotcachebuffer.cxx
@@ -19,7 +19,6 @@
#include <pivotcachebuffer.hxx>
#include <set>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
@@ -28,9 +27,7 @@
#include <com/sun/star/sheet/DataPilotFieldGroupInfo.hpp>
#include <com/sun/star/sheet/XDataPilotFieldGrouping.hpp>
#include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
#include <sal/log.hxx>
#include <oox/core/filterbase.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/helper/binaryinputstream.hxx>
#include <oox/helper/containerhelper.hxx>
@@ -39,7 +36,6 @@
#include <oox/token/properties.hxx>
#include <oox/token/tokens.hxx>
#include <defnamesbuffer.hxx>
#include <excelhandlers.hxx>
#include <pivotcachefragment.hxx>
#include <sheetdatabuffer.hxx>
#include <tablebuffer.hxx>
@@ -47,7 +43,6 @@
#include <worksheetbuffer.hxx>
#include <dpobject.hxx>
#include <dpsave.hxx>
#include <dpdimsave.hxx>
#include <tools/datetime.hxx>
#include <addressconverter.hxx>
#include <biffhelper.hxx>
diff --git a/sc/source/filter/oox/pivotcachefragment.cxx b/sc/source/filter/oox/pivotcachefragment.cxx
index 60df4fd..c42316e 100644
--- a/sc/source/filter/oox/pivotcachefragment.cxx
+++ b/sc/source/filter/oox/pivotcachefragment.cxx
@@ -20,10 +20,7 @@
#include <pivotcachefragment.hxx>
#include <osl/diagnose.h>
#include <oox/helper/attributelist.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
#include <addressconverter.hxx>
#include <biffhelper.hxx>
#include <formulabuffer.hxx>
#include <pivotcachebuffer.hxx>
diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx
index 3363068..569a112 100644
--- a/sc/source/filter/oox/pivottablebuffer.cxx
+++ b/sc/source/filter/oox/pivottablebuffer.cxx
@@ -35,10 +35,9 @@
#include <com/sun/star/sheet/DataPilotFieldSortMode.hpp>
#include <com/sun/star/sheet/GeneralFunction.hpp>
#include <com/sun/star/sheet/XDataPilotDataLayoutFieldSupplier.hpp>
#include <com/sun/star/sheet/XDataPilotField.hpp>
#include <com/sun/star/sheet/XDataPilotTablesSupplier.hpp>
#include <com/sun/star/sheet/XSheetOperation.hpp>
#include <osl/diagnose.hxx>
#include <osl/diagnose.h>
#include <sal/log.hxx>
#include <oox/helper/binaryinputstream.hxx>
#include <oox/helper/attributelist.hxx>
diff --git a/sc/source/filter/oox/pivottablefragment.cxx b/sc/source/filter/oox/pivottablefragment.cxx
index 5bac8f3..59800b0 100644
--- a/sc/source/filter/oox/pivottablefragment.cxx
+++ b/sc/source/filter/oox/pivottablefragment.cxx
@@ -21,7 +21,6 @@
#include <pivottablebuffer.hxx>
#include <biffhelper.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
namespace oox {
namespace xls {
diff --git a/sc/source/filter/oox/querytablefragment.cxx b/sc/source/filter/oox/querytablefragment.cxx
index 67f9f7f..f485cb2 100644
--- a/sc/source/filter/oox/querytablefragment.cxx
+++ b/sc/source/filter/oox/querytablefragment.cxx
@@ -21,7 +21,6 @@
#include <querytablebuffer.hxx>
#include <biffhelper.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
namespace oox {
namespace xls {
diff --git a/sc/source/filter/oox/richstringcontext.cxx b/sc/source/filter/oox/richstringcontext.cxx
index 2be02ed..d2a4899 100644
--- a/sc/source/filter/oox/richstringcontext.cxx
+++ b/sc/source/filter/oox/richstringcontext.cxx
@@ -21,7 +21,6 @@
#include <stylesfragment.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
namespace oox {
namespace xls {
diff --git a/sc/source/filter/oox/scenariobuffer.cxx b/sc/source/filter/oox/scenariobuffer.cxx
index 3ad1cf1..cb8a4ab 100644
--- a/sc/source/filter/oox/scenariobuffer.cxx
+++ b/sc/source/filter/oox/scenariobuffer.cxx
@@ -20,7 +20,6 @@
#include <scenariobuffer.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sheet/XScenario.hpp>
#include <com/sun/star/sheet/XScenarios.hpp>
#include <com/sun/star/sheet/XScenariosSupplier.hpp>
#include <com/sun/star/sheet/XSpreadsheet.hpp>
diff --git a/sc/source/filter/oox/scenariocontext.cxx b/sc/source/filter/oox/scenariocontext.cxx
index ddb61d9..8c2bc90 100644
--- a/sc/source/filter/oox/scenariocontext.cxx
+++ b/sc/source/filter/oox/scenariocontext.cxx
@@ -22,7 +22,6 @@
#include <scenariobuffer.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
namespace oox {
namespace xls {
diff --git a/sc/source/filter/oox/sharedstringsfragment.cxx b/sc/source/filter/oox/sharedstringsfragment.cxx
index a24b287..f938eaf 100644
--- a/sc/source/filter/oox/sharedstringsfragment.cxx
+++ b/sc/source/filter/oox/sharedstringsfragment.cxx
@@ -23,7 +23,6 @@
#include <richstringcontext.hxx>
#include <sharedstringsbuffer.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
namespace oox {
namespace xls {
diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx
index 115b71b..1051399 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -25,14 +25,10 @@
#include <com/sun/star/util/NumberFormat.hpp>
#include <com/sun/star/util/XNumberFormatTypes.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <rtl/ustrbuf.hxx>
#include <sal/log.hxx>
#include <osl/diagnose.h>
#include <editeng/boxitem.hxx>
#include <editeng/editobj.hxx>
#include <svl/eitem.hxx>
#include <oox/helper/containerhelper.hxx>
#include <oox/helper/propertymap.hxx>
#include <oox/helper/propertyset.hxx>
#include <oox/token/properties.hxx>
#include <oox/token/tokens.hxx>
@@ -40,11 +36,9 @@
#include <formulaparser.hxx>
#include <sharedstringsbuffer.hxx>
#include <unitconverter.hxx>
#include <markdata.hxx>
#include <rangelst.hxx>
#include <document.hxx>
#include <scitems.hxx>
#include <formulacell.hxx>
#include <docpool.hxx>
#include <paramisc.hxx>
#include <patattr.hxx>
diff --git a/sc/source/filter/oox/sheetdatacontext.cxx b/sc/source/filter/oox/sheetdatacontext.cxx
index 4206cde..0a4892f 100644
--- a/sc/source/filter/oox/sheetdatacontext.cxx
+++ b/sc/source/filter/oox/sheetdatacontext.cxx
@@ -21,14 +21,12 @@
#include <oox/helper/attributelist.hxx>
#include <oox/helper/binaryinputstream.hxx>
#include <oox/helper/propertyset.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
#include <addressconverter.hxx>
#include <biffhelper.hxx>
#include <formulaparser.hxx>
#include <richstringcontext.hxx>
#include <unitconverter.hxx>
#include <sal/log.hxx>
namespace oox {
diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx
index 9a21ff4..eac4900 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -67,8 +67,6 @@
#include <oox/token/namespaces.hxx>
#include <oox/token/properties.hxx>
#include <oox/token/tokens.hxx>
#include <condformatbuffer.hxx>
#include <excelhandlers.hxx>
#include <themebuffer.hxx>
#include <unitconverter.hxx>
#include <document.hxx>
diff --git a/sc/source/filter/oox/tablecolumnsbuffer.cxx b/sc/source/filter/oox/tablecolumnsbuffer.cxx
index 9d039ef..bb35f3b 100644
--- a/sc/source/filter/oox/tablecolumnsbuffer.cxx
+++ b/sc/source/filter/oox/tablecolumnsbuffer.cxx
@@ -19,15 +19,9 @@
#include <tablecolumnsbuffer.hxx>
#include <rtl/ustrbuf.hxx>
#include <sal/log.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/helper/containerhelper.hxx>
#include <oox/helper/propertyset.hxx>
#include <oox/token/properties.hxx>
#include <oox/token/tokens.hxx>
#include <addressconverter.hxx>
#include <defnamesbuffer.hxx>
#include <dbdata.hxx>
namespace oox {
diff --git a/sc/source/filter/oox/tablecolumnscontext.cxx b/sc/source/filter/oox/tablecolumnscontext.cxx
index 25470af..ce1c3f3 100644
--- a/sc/source/filter/oox/tablecolumnscontext.cxx
+++ b/sc/source/filter/oox/tablecolumnscontext.cxx
@@ -21,7 +21,6 @@
#include <tablecolumnsbuffer.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
namespace oox {
namespace xls {
diff --git a/sc/source/filter/oox/tablefragment.cxx b/sc/source/filter/oox/tablefragment.cxx
index 5aa35b1..c4eabf2 100644
--- a/sc/source/filter/oox/tablefragment.cxx
+++ b/sc/source/filter/oox/tablefragment.cxx
@@ -20,13 +20,10 @@
#include <tablefragment.hxx>
#include <biffhelper.hxx>
#include <autofilterbuffer.hxx>
#include <autofiltercontext.hxx>
#include <tablecolumnsbuffer.hxx>
#include <tablecolumnscontext.hxx>
#include <tablebuffer.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
namespace oox {
namespace xls {
diff --git a/sc/source/filter/oox/unitconverter.cxx b/sc/source/filter/oox/unitconverter.cxx
index 4baee2d..9d7d12f 100644
--- a/sc/source/filter/oox/unitconverter.cxx
+++ b/sc/source/filter/oox/unitconverter.cxx
@@ -20,20 +20,20 @@
#include <unitconverter.hxx>
#include <com/sun/star/awt/DeviceInfo.hpp>
#include <com/sun/star/awt/FontDescriptor.hpp>
#include <com/sun/star/awt/XDevice.hpp>
#include <com/sun/star/awt/XFont.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/util/Date.hpp>
#include <com/sun/star/util/DateTime.hpp>
#include <osl/diagnose.h>
#include <rtl/math.hxx>
#include <oox/core/filterbase.hxx>
#include <oox/helper/propertyset.hxx>
#include <oox/token/properties.hxx>
#include <stylesbuffer.hxx>
#include <biffhelper.hxx>
namespace com { namespace sun { namespace star { namespace awt { struct FontDescriptor; } } } }
namespace oox {
namespace xls {
diff --git a/sc/source/filter/oox/viewsettings.cxx b/sc/source/filter/oox/viewsettings.cxx
index 92a3cfb..e090a7b 100644
--- a/sc/source/filter/oox/viewsettings.cxx
+++ b/sc/source/filter/oox/viewsettings.cxx
@@ -23,7 +23,6 @@
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XIndexContainer.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/document/IndexedPropertyValues.hpp>
#include <com/sun/star/document/XViewDataSupplier.hpp>
#include <com/sun/star/document/NamedPropertyValues.hpp>
@@ -38,10 +37,11 @@
#include <oox/token/properties.hxx>
#include <oox/token/tokens.hxx>
#include <addressconverter.hxx>
#include <unitconverter.hxx>
#include <workbooksettings.hxx>
#include <worksheetbuffer.hxx>
namespace com { namespace sun { namespace star { namespace container { class XNameContainer; } } } }
namespace oox {
namespace xls {
diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx
index 93295a6..a00d7bd 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -25,7 +25,6 @@
#include <oox/helper/attributelist.hxx>
#include <oox/helper/binaryinputstream.hxx>
#include <oox/helper/progressbar.hxx>
#include <oox/helper/propertyset.hxx>
#include <oox/ole/olestorage.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
@@ -36,7 +35,6 @@
#include <externallinkfragment.hxx>
#include <formulabuffer.hxx>
#include <pivotcachebuffer.hxx>
#include <sharedstringsbuffer.hxx>
#include <sharedstringsfragment.hxx>
#include <revisionfragment.hxx>
#include <stylesfragment.hxx>
@@ -47,9 +45,7 @@
#include <worksheetbuffer.hxx>
#include <worksheethelper.hxx>
#include <worksheetfragment.hxx>
#include <sheetdatacontext.hxx>
#include <extlstcontext.hxx>
#include <officecfg/Office/Common.hxx>
#include <documentimport.hxx>
#include <biffhelper.hxx>
@@ -66,15 +62,10 @@
#include <vcl/weld.hxx>
#include <oox/core/fastparser.hxx>
#include <salhelper/thread.hxx>
#include <comphelper/threadpool.hxx>
#include <osl/conditn.hxx>
#include <o3tl/make_unique.hxx>
#include <sal/log.hxx>
#include <algorithm>
#include <queue>
#include <thread>
#include <memory>
#include <oox/ole/vbaproject.hxx>
diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx
index 3bed2cf..798e24a 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -22,12 +22,10 @@
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <com/sun/star/sheet/XDatabaseRange.hpp>
#include <com/sun/star/sheet/XDatabaseRanges.hpp>
#include <com/sun/star/sheet/XSpreadsheet.hpp>
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/sheet/NamedRangeFlag.hpp>
#include <com/sun/star/style/XStyle.hpp>
#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
#include <com/sun/star/document/XDocumentProperties.hpp>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
diff --git a/sc/source/filter/oox/worksheetbuffer.cxx b/sc/source/filter/oox/worksheetbuffer.cxx
index 2363040..97a5db2 100644
--- a/sc/source/filter/oox/worksheetbuffer.cxx
+++ b/sc/source/filter/oox/worksheetbuffer.cxx
@@ -24,15 +24,11 @@
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
#include <oox/core/filterbase.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/helper/binaryinputstream.hxx>
#include <oox/helper/containerhelper.hxx>
#include <oox/helper/propertyset.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/properties.hxx>
#include <oox/token/tokens.hxx>
#include <excelhandlers.hxx>
#include <document.hxx>
#include <documentimport.hxx>
#include <biffhelper.hxx>
diff --git a/sc/source/filter/oox/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx
index 944affa..d542679 100644
--- a/sc/source/filter/oox/worksheetfragment.cxx
+++ b/sc/source/filter/oox/worksheetfragment.cxx
@@ -33,18 +33,15 @@
#include <commentsfragment.hxx>
#include <condformatcontext.hxx>
#include <drawingfragment.hxx>
#include <externallinkbuffer.hxx>
#include <pagesettings.hxx>
#include <pivottablefragment.hxx>
#include <querytablefragment.hxx>
#include <scenariobuffer.hxx>
#include <scenariocontext.hxx>
#include <sheetdatabuffer.hxx>
#include <sheetdatacontext.hxx>
#include <tablefragment.hxx>
#include <extlstcontext.hxx>
#include <viewsettings.hxx>
#include <workbooksettings.hxx>
#include <worksheetsettings.hxx>
namespace oox {
diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx
index a9fcf45..42bc0a3 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -48,19 +48,15 @@
#include <autofilterbuffer.hxx>
#include <commentsbuffer.hxx>
#include <condformatbuffer.hxx>
#include <convuno.hxx>
#include <document.hxx>
#include <drawingfragment.hxx>
#include <formulaparser.hxx>
#include <pagesettings.hxx>
#include <querytablebuffer.hxx>
#include <sharedstringsbuffer.hxx>
#include <sheetdatabuffer.hxx>
#include <stylesbuffer.hxx>
#include <tokenuno.hxx>
#include <unitconverter.hxx>
#include <viewsettings.hxx>
#include <workbooksettings.hxx>
#include <worksheetbuffer.hxx>
#include <worksheetsettings.hxx>
#include <formulabuffer.hxx>
@@ -76,7 +72,6 @@
#include <svl/stritem.hxx>
#include <editeng/editobj.hxx>
#include <editeng/flditem.hxx>
#include <vcl/virdev.hxx>
namespace oox {
namespace xls {
