[Libreoffice-commits] core.git: sc/inc sc/IwyuFilter_sc.yaml sc/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Nov 8 08:18:22 UTC 2018
sc/IwyuFilter_sc.yaml | 34 +++++++++++++++++++++++++++-
sc/inc/address.hxx | 3 +-
sc/inc/chgtrack.hxx | 1
sc/inc/colcontainer.hxx | 3 --
sc/inc/documentimport.hxx | 2 -
sc/inc/dptabres.hxx | 7 +----
sc/inc/global.hxx | 3 +-
sc/inc/listenercontext.hxx | 3 --
sc/source/core/data/attarray.cxx | 8 ------
sc/source/core/data/attrib.cxx | 8 ------
sc/source/core/data/autonamecache.cxx | 3 --
sc/source/core/data/bcaslot.cxx | 2 -
sc/source/core/data/cellvalues.cxx | 1
sc/source/core/data/colcontainer.cxx | 1
sc/source/core/data/column.cxx | 8 ------
sc/source/core/data/column2.cxx | 9 -------
sc/source/core/data/column3.cxx | 9 -------
sc/source/core/data/column4.cxx | 4 ---
sc/source/core/data/compressedarray.cxx | 3 --
sc/source/core/data/conditio.cxx | 5 ----
sc/source/core/data/dbdocutl.cxx | 1
sc/source/core/data/dociter.cxx | 2 -
sc/source/core/data/docpool.cxx | 3 --
sc/source/core/data/documen2.cxx | 24 -------------------
sc/source/core/data/documen3.cxx | 13 ----------
sc/source/core/data/documen4.cxx | 4 ---
sc/source/core/data/documen5.cxx | 4 ---
sc/source/core/data/documen6.cxx | 2 -
sc/source/core/data/documen7.cxx | 8 ------
sc/source/core/data/documen8.cxx | 11 ---------
sc/source/core/data/documen9.cxx | 10 --------
sc/source/core/data/document.cxx | 19 ---------------
sc/source/core/data/document10.cxx | 5 ----
sc/source/core/data/documentimport.cxx | 1
sc/source/core/data/dpcache.cxx | 2 -
sc/source/core/data/dpdimsave.cxx | 1
sc/source/core/data/dpfilteredcache.cxx | 7 -----
sc/source/core/data/dpgroup.cxx | 6 ----
sc/source/core/data/dpitemdata.cxx | 7 ++---
sc/source/core/data/dpobject.cxx | 4 ---
sc/source/core/data/dpoutput.cxx | 18 +++++++-------
sc/source/core/data/dpresfilter.cxx | 1
sc/source/core/data/dpsave.cxx | 8 +-----
sc/source/core/data/dpsdbtab.cxx | 2 -
sc/source/core/data/dpshttab.cxx | 3 --
sc/source/core/data/dptabdat.cxx | 6 ----
sc/source/core/data/dptabres.cxx | 1
sc/source/core/data/dptabsrc.cxx | 10 --------
sc/source/core/data/dputil.cxx | 2 -
sc/source/core/data/drawpage.cxx | 3 --
sc/source/core/data/drwlayer.cxx | 16 ++-----------
sc/source/core/data/fillinfo.cxx | 3 --
sc/source/core/data/formulacell.cxx | 4 ---
sc/source/core/data/funcdesc.cxx | 3 --
sc/source/core/data/global.cxx | 14 -----------
sc/source/core/data/global2.cxx | 8 ------
sc/source/core/data/globalx.cxx | 4 +--
sc/source/core/data/grouptokenconverter.cxx | 2 -
sc/source/core/data/markarr.cxx | 1
sc/source/core/data/mtvelements.cxx | 1
sc/source/core/data/olinetab.cxx | 6 ----
sc/source/core/data/patattr.cxx | 4 ---
sc/source/core/data/pivot2.cxx | 18 --------------
sc/source/core/data/postit.cxx | 5 ----
sc/source/core/data/stlpool.cxx | 10 --------
sc/source/core/data/stlsheet.cxx | 5 ----
sc/source/core/data/table1.cxx | 7 -----
sc/source/core/data/table2.cxx | 10 --------
sc/source/core/data/table3.cxx | 7 -----
sc/source/core/data/table4.cxx | 15 ------------
sc/source/core/data/table5.cxx | 8 ------
sc/source/core/data/table6.cxx | 2 -
sc/source/core/data/table7.cxx | 1
sc/source/core/data/userdat.cxx | 2 -
sc/source/core/data/validat.cxx | 6 ----
sc/source/core/tool/cellkeytranslator.cxx | 1
sc/source/filter/excel/xltracer.cxx | 1
77 files changed, 75 insertions(+), 394 deletions(-)
New commits:
commit dec3752eeb3bcd46fb5c4af4e0a48738440d21e7
Author: Gabor Kelemen <kelemeng at ubuntu.com>
AuthorDate: Sat Nov 3 13:14:30 2018 +0100
Commit: Miklos Vajna <vmiklos at collabora.co.uk>
CommitDate: Thu Nov 8 09:16:26 2018 +0100
tdf#42949 Fix IWYU warnings in sc/source/core/data/*cxx
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I3e3bf3160fe3627cd105d8b69ff165c0577d8c9b
Reviewed-on: https://gerrit.libreoffice.org/62807
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index 2a6dd86dd416..4af6a0c97b67 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -61,6 +61,9 @@ blacklist:
sc/inc/chgviset.hxx:
# base class has to be a complete type
- unotools/textsearch.hxx
+ sc/inc/colcontainer.hxx:
+ # Needed to silence the check on colcontainer.cxx
+ - column.hxx
sc/inc/column.hxx:
# base class has to be a complete type
- mdds/flat_segment_tree.hpp
@@ -488,4 +491,33 @@ blacklist:
sc/source/ui/inc/StatisticsTwoVariableDialog.hxx:
# base class has to be a complete type
- viewdata.hxx
-
+ sc/source/core/data/column2.cxx:
+ # Used in #if DEBUG_COLUMN_STORAGE
+ - tokenstringcontext.hxx
+ sc/source/core/data/conditio.cxx:
+ # Needed for #define
+ - attrib.hxx
+ sc/source/core/data/documen8.cxx:
+ # Needed for template
+ - docpool.hxx
+ sc/source/core/data/document.cxx:
+ # Complete type needed for method type
+ - com/sun/star/sheet/TablePageBreakData.hpp
+ sc/source/core/data/documentimport.cxx:
+ # Needed for member access in assert()
+ - stringutil.hxx
+ sc/source/core/data/dptabres.cxx:
+ # Used in #if DUMP_PIVOT_TABLE
+ - document.hxx
+ sc/source/core/data/formulacell.cxx:
+ # Used in #if DBG_UTIL
+ - com/sun/star/sheet/FormulaLanguage.hpp
+ # Used in #if HAVE_FEATURE_OPENCL
+ - opencl/openclwrapper.hxx
+ sc/source/core/data/stlsheet.cxx:
+ # Needed for #define
+ - editeng/shaditem.hxx
+ - editeng/xmlcnitm.hxx
+ sc/source/core/data/types.cxx:
+ # Complete type is needed for complex data type
+ - scmatrix.hxx
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index cc678752cdb2..66275ac6e1dd 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -32,7 +32,6 @@
#include <formula/grammar.hxx>
#include <o3tl/typed_flags_set.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
namespace com { namespace sun { namespace star {
namespace sheet {
@@ -40,6 +39,8 @@ namespace com { namespace sun { namespace star {
}
}}}
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
+
class ScDocument;
/** size_t typedef to be able to find places where code was changed from USHORT
diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index ed15612eccd3..5c5ba6b58bec 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -26,6 +26,7 @@
#include <stack>
#include <vector>
+#include <com/sun/star/uno/Sequence.hxx>
#include <tools/color.hxx>
#include <tools/datetime.hxx>
#include <tools/link.hxx>
diff --git a/sc/inc/colcontainer.hxx b/sc/inc/colcontainer.hxx
index 2cb4ae74e487..e6dbf0e22731 100644
--- a/sc/inc/colcontainer.hxx
+++ b/sc/inc/colcontainer.hxx
@@ -21,12 +21,11 @@
#define INCLUDED_SC_INC_COLCONTAINER_HXX
#include "types.hxx"
+#include "column.hxx"
#include <memory>
#include <vector>
-class ScColumn;
-
class ScColContainer
{
typedef std::vector<std::unique_ptr<ScColumn>> ScColumnVector;
diff --git a/sc/inc/documentimport.hxx b/sc/inc/documentimport.hxx
index 1a8b1cbd514f..210ee786a7ea 100644
--- a/sc/inc/documentimport.hxx
+++ b/sc/inc/documentimport.hxx
@@ -12,6 +12,7 @@
#include "scdllapi.h"
#include "address.hxx"
+#include "attarray.hxx"
#include <rtl/ustring.hxx>
@@ -21,7 +22,6 @@
class EditTextObject;
class ScDocument;
class ScColumn;
-struct ScAttrEntry;
class ScTokenArray;
class ScFormulaCell;
class ScStyleSheet;
diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index da659809280c..d28e192863c6 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -23,8 +23,10 @@
#include "global.hxx"
#include "dpfilteredcache.hxx"
#include "calcmacros.hxx"
+#include "dpitemdata.hxx"
#include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
+#include <com/sun/star/sheet/DataPilotFieldReference.hpp>
#include <map>
#include <unordered_map>
@@ -32,10 +34,6 @@
#include <memory>
#include <vector>
-namespace com { namespace sun { namespace star { namespace sheet {
- struct DataPilotFieldReference;
-} } } }
-
namespace com { namespace sun { namespace star { namespace sheet { struct DataResult; } } } }
namespace com { namespace sun { namespace star { namespace sheet { struct MemberResult; } } } }
namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
@@ -48,7 +46,6 @@ class ScDPResultMember;
class ScDPResultVisibilityData;
struct ScDPValue;
-class ScDPItemData;
struct ScDPResultFilterContext;
/**
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 4c658290cca8..c051f54a4148 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -25,7 +25,6 @@
#include <svx/svdtypes.hxx>
#include <tools/ref.hxx>
#include <sal/types.h>
-#include <com/sun/star/uno/Reference.hxx>
#include "scdllapi.h"
#include <rtl/ustring.hxx>
@@ -36,6 +35,8 @@
#include <map>
#include <memory>
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+
class SfxItemSet;
class SfxViewShell;
struct ScCalcConfig;
diff --git a/sc/inc/listenercontext.hxx b/sc/inc/listenercontext.hxx
index 26dd0eae949d..5ac2c4895951 100644
--- a/sc/inc/listenercontext.hxx
+++ b/sc/inc/listenercontext.hxx
@@ -12,6 +12,7 @@
#include "address.hxx"
#include "columnspanset.hxx"
+#include "mtvelements.hxx"
#include <memory>
@@ -20,8 +21,6 @@ class ScTokenArray;
namespace sc {
-struct ColumnBlockPosition;
-class ColumnBlockPositionSet;
class ColumnSet;
class StartListeningContext
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index 7df620731bb1..24e782bb8d39 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -20,17 +20,12 @@
#include <attarray.hxx>
#include <scitems.hxx>
#include <o3tl/make_unique.hxx>
-#include <svx/algitem.hxx>
#include <editeng/boxitem.hxx>
#include <editeng/lineitem.hxx>
-#include <editeng/frmdiritem.hxx>
#include <editeng/shaditem.hxx>
#include <editeng/editobj.hxx>
#include <editeng/justifyitem.hxx>
#include <svl/poolcach.hxx>
-#include <editeng/fontitem.hxx>
-#include <unotools/fontcvt.hxx>
-#include <sal/log.hxx>
#include <global.hxx>
#include <document.hxx>
@@ -39,15 +34,12 @@
#include <stlsheet.hxx>
#include <stlpool.hxx>
#include <markarr.hxx>
-#include <rechead.hxx>
#include <globstr.hrc>
#include <scresid.hxx>
#include <segmenttree.hxx>
#include <editdataarray.hxx>
-#include <formulacell.hxx>
#include <cellvalue.hxx>
#include <editutil.hxx>
-#include <rtl/strbuf.hxx>
#include <memory>
using ::editeng::SvxBorderLine;
diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
index 1e36bdc80177..2f96cab2ab58 100644
--- a/sc/source/core/data/attrib.cxx
+++ b/sc/source/core/data/attrib.cxx
@@ -21,21 +21,15 @@
#include <scitems.hxx>
-#include <editeng/eeitem.hxx>
-
-#include <editeng/boxitem.hxx>
-#include <editeng/editdata.hxx>
#include <editeng/editeng.hxx>
#include <editeng/editobj.hxx>
-#include <editeng/flditem.hxx>
-#include <sal/log.hxx>
+#include <editeng/borderline.hxx>
#include <libxml/xmlwriter.h>
#include <attrib.hxx>
#include <global.hxx>
#include <editutil.hxx>
-#include <sc.hrc>
#include <mid.h>
#include <globstr.hrc>
#include <scresid.hxx>
diff --git a/sc/source/core/data/autonamecache.cxx b/sc/source/core/data/autonamecache.cxx
index 5ed7bc10de6e..15e924d9fd3d 100644
--- a/sc/source/core/data/autonamecache.cxx
+++ b/sc/source/core/data/autonamecache.cxx
@@ -21,11 +21,8 @@
#include <autonamecache.hxx>
#include <dociter.hxx>
-#include <queryparam.hxx>
#include <formulacell.hxx>
-#include <cellvalue.hxx>
#include <editutil.hxx>
-#include <document.hxx>
ScAutoNameCache::ScAutoNameCache( ScDocument* pD ) :
pDoc( pD ),
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index af95ef99c288..f8f0cdfdd90c 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -25,9 +25,7 @@
#include <brdcst.hxx>
#include <bcaslot.hxx>
#include <scerrors.hxx>
-#include <docoptio.hxx>
#include <refupdat.hxx>
-#include <table.hxx>
#include <bulkdatahint.hxx>
#include <columnspanset.hxx>
diff --git a/sc/source/core/data/cellvalues.cxx b/sc/source/core/data/cellvalues.cxx
index 8854f0d8763f..7dae4497da9a 100644
--- a/sc/source/core/data/cellvalues.cxx
+++ b/sc/source/core/data/cellvalues.cxx
@@ -10,7 +10,6 @@
#include <memory>
#include <cellvalues.hxx>
#include <column.hxx>
-#include <cellvalue.hxx>
#include <o3tl/make_unique.hxx>
#include <cassert>
diff --git a/sc/source/core/data/colcontainer.cxx b/sc/source/core/data/colcontainer.cxx
index 79386bd805b2..74a3ca46ecfb 100644
--- a/sc/source/core/data/colcontainer.cxx
+++ b/sc/source/core/data/colcontainer.cxx
@@ -20,7 +20,6 @@
#include <colcontainer.hxx>
#include <column.hxx>
-#include <document.hxx>
ScColContainer::ScColContainer( const size_t nSize )
{
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 40afd6974861..bfd11e038bf0 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -28,12 +28,9 @@
#include <compiler.hxx>
#include <brdcst.hxx>
#include <markdata.hxx>
-#include <detfunc.hxx>
#include <postit.hxx>
-#include <globalnames.hxx>
#include <cellvalue.hxx>
#include <tokenarray.hxx>
-#include <cellform.hxx>
#include <clipcontext.hxx>
#include <types.hxx>
#include <editutil.hxx>
@@ -43,21 +40,16 @@
#include <sharedformula.hxx>
#include <refupdatecontext.hxx>
#include <listenercontext.hxx>
-#include <refhint.hxx>
-#include <stlalgorithm.hxx>
#include <formulagroup.hxx>
-#include <userdat.hxx>
#include <drwlayer.hxx>
#include <svl/poolcach.hxx>
#include <svl/zforlist.hxx>
#include <svl/sharedstringpool.hxx>
-#include <editeng/scripttypeitem.hxx>
#include <editeng/fieldupdater.hxx>
#include <formula/errorcodes.hxx>
#include <osl/diagnose.h>
-#include <cstring>
#include <map>
#include <cstdio>
#include <memory>
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 111cc0aece2e..93bcf9bd6531 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -22,25 +22,18 @@
#include <scitems.hxx>
#include <formulacell.hxx>
#include <document.hxx>
-#include <docpool.hxx>
#include <drwlayer.hxx>
#include <attarray.hxx>
#include <patattr.hxx>
#include <cellform.hxx>
-#include <stlsheet.hxx>
-#include <rechead.hxx>
-#include <brdcst.hxx>
#include <editutil.hxx>
#include <subtotal.hxx>
#include <markdata.hxx>
-#include <compiler.hxx>
-#include <dbdata.hxx>
#include <fillinfo.hxx>
#include <segmenttree.hxx>
#include <docparam.hxx>
#include <cellvalue.hxx>
#include <tokenarray.hxx>
-#include <globalnames.hxx>
#include <formulagroup.hxx>
#include <listenercontext.hxx>
#include <mtvcellfunc.hxx>
@@ -57,9 +50,7 @@
#include <editeng/editstat.hxx>
#include <editeng/emphasismarkitem.hxx>
#include <editeng/fhgtitem.hxx>
-#include <editeng/forbiddencharacterstable.hxx>
#include <svx/rotmodit.hxx>
-#include <editeng/scripttypeitem.hxx>
#include <editeng/unolingu.hxx>
#include <editeng/justifyitem.hxx>
#include <svl/zforlist.hxx>
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 29ee998ebc35..295c93d03c8a 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -32,14 +32,10 @@
#include <docoptio.hxx>
#include <subtotal.hxx>
#include <markdata.hxx>
-#include <detfunc.hxx>
-#include <postit.hxx>
#include <stringutil.hxx>
#include <docpool.hxx>
-#include <globalnames.hxx>
#include <cellvalue.hxx>
#include <tokenarray.hxx>
-#include <stlalgorithm.hxx>
#include <clipcontext.hxx>
#include <columnspanset.hxx>
#include <mtvcellfunc.hxx>
@@ -50,18 +46,15 @@
#include <filterentries.hxx>
#include <com/sun/star/i18n/LocaleDataItem2.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <memory>
#include <rtl/tencinfo.h>
-#include <mdds/flat_segment_tree.hpp>
-#include <sfx2/objsh.hxx>
#include <svl/zforlist.hxx>
#include <svl/zformat.hxx>
-#include <svl/broadcast.hxx>
#include <svl/sharedstringpool.hxx>
-#include <editeng/editstat.hxx>
#include <cstdio>
#include <refdata.hxx>
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index a37aa9274f2d..b324b2a2d928 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -15,8 +15,6 @@
#include <cellvalues.hxx>
#include <columnspanset.hxx>
#include <columniterator.hxx>
-#include <listenercontext.hxx>
-#include <tokenstringcontext.hxx>
#include <mtvcellfunc.hxx>
#include <clipcontext.hxx>
#include <attrib.hxx>
@@ -25,11 +23,11 @@
#include <conditio.hxx>
#include <formulagroup.hxx>
#include <tokenarray.hxx>
-#include <globalnames.hxx>
#include <scitems.hxx>
#include <cellform.hxx>
#include <sharedformula.hxx>
#include <drwlayer.hxx>
+#include <compiler.hxx>
#include <svl/sharedstringpool.hxx>
#include <o3tl/make_unique.hxx>
diff --git a/sc/source/core/data/compressedarray.cxx b/sc/source/core/data/compressedarray.cxx
index fd3867c3e863..f02956b6a27d 100644
--- a/sc/source/core/data/compressedarray.cxx
+++ b/sc/source/core/data/compressedarray.cxx
@@ -18,11 +18,8 @@
*/
#include <compressedarray.hxx>
-#include <address.hxx>
#include <global.hxx>
-#include <algorithm>
-
static const size_t nScCompressedArrayDelta = 4;
template< typename A, typename D >
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 937bb1b830d5..92d5041c2b33 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -18,8 +18,6 @@
*/
#include <scitems.hxx>
-#include <sfx2/objsh.hxx>
-#include <svl/itemset.hxx>
#include <svl/zforlist.hxx>
#include <rtl/math.hxx>
#include <sal/log.hxx>
@@ -31,11 +29,8 @@
#include <conditio.hxx>
#include <formulacell.hxx>
#include <document.hxx>
-#include <hints.hxx>
#include <compiler.hxx>
-#include <rechead.hxx>
#include <rangelst.hxx>
-#include <stlpool.hxx>
#include <rangenam.hxx>
#include <rangeutl.hxx>
#include <colorscale.hxx>
diff --git a/sc/source/core/data/dbdocutl.cxx b/sc/source/core/data/dbdocutl.cxx
index 8c18a347f48f..32165dc5f653 100644
--- a/sc/source/core/data/dbdocutl.cxx
+++ b/sc/source/core/data/dbdocutl.cxx
@@ -26,7 +26,6 @@
#include <document.hxx>
#include <formula/errorcodes.hxx>
#include <stringutil.hxx>
-#include <globalnames.hxx>
using namespace ::com::sun::star;
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 7e1630258430..16e272ab0b71 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -19,7 +19,6 @@
#include <svl/zforlist.hxx>
-#include <scitems.hxx>
#include <global.hxx>
#include <dociter.hxx>
#include <document.hxx>
@@ -36,7 +35,6 @@
#include <queryentry.hxx>
#include <globstr.hrc>
#include <scresid.hxx>
-#include <editutil.hxx>
#include <cellvalue.hxx>
#include <scmatrix.hxx>
#include <rowheightcontext.hxx>
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 965d3cf27d0b..530c79e11d92 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -29,7 +29,6 @@
#include <vcl/outdev.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
-#include <svl/aeitem.hxx>
#include <svl/itemiter.hxx>
#include <svl/stritem.hxx>
#include <svx/algitem.hxx>
@@ -59,7 +58,6 @@
#include <editeng/shaditem.hxx>
#include <editeng/shdditem.hxx>
#include <editeng/sizeitem.hxx>
-#include <svx/svxitems.hrc>
#include <editeng/udlnitem.hxx>
#include <editeng/ulspitem.hxx>
#include <editeng/wghtitem.hxx>
@@ -73,7 +71,6 @@
#include <patattr.hxx>
#include <globstr.hrc>
#include <scresid.hxx>
-#include <document.hxx>
#include <scmod.hxx>
#include <sc.hrc>
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 32b3f15b6a35..9d8d8c5115bf 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -17,29 +17,18 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <scitems.hxx>
#include <scextopt.hxx>
#include <autonamecache.hxx>
-#include <editeng/eeitem.hxx>
-#include <editeng/editeng.hxx>
-#include <editeng/forbiddencharacterstable.hxx>
#include <osl/thread.h>
#include <svx/xtable.hxx>
-#include <sfx2/linkmgr.hxx>
-#include <svx/svdpool.hxx>
-#include <svx/svdobj.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/printer.hxx>
#include <svl/asiancfg.hxx>
-#include <svl/zforlist.hxx>
-#include <svl/zformat.hxx>
#include <vcl/virdev.hxx>
-#include <svl/PasswordHelper.hxx>
#include <svl/sharedstringpool.hxx>
-#include <tools/tenccvt.hxx>
#include <tools/urlobj.hxx>
#include <rtl/crc.h>
#include <basic/basmgr.hxx>
@@ -47,28 +36,18 @@
#include <document.hxx>
#include <table.hxx>
-#include <attrib.hxx>
#include <patattr.hxx>
#include <rangenam.hxx>
#include <dbdata.hxx>
-#include <pivot.hxx>
-#include <docpool.hxx>
-#include <stlpool.hxx>
-#include <stlsheet.hxx>
-#include <chartarr.hxx>
#include <chartlock.hxx>
#include <rechead.hxx>
#include <global.hxx>
-#include <brdcst.hxx>
#include <bcaslot.hxx>
#include <adiasync.hxx>
#include <addinlis.hxx>
#include <chartlis.hxx>
#include <markdata.hxx>
-#include <conditio.hxx>
-#include <colorscale.hxx>
#include <validat.hxx>
-#include <progress.hxx>
#include <detdata.hxx>
#include <sc.hrc>
#include <ddelink.hxx>
@@ -84,8 +63,6 @@
#include <recursionhelper.hxx>
#include <lookupcache.hxx>
#include <externalrefmgr.hxx>
-#include <appoptio.hxx>
-#include <scmod.hxx>
#include <viewdata.hxx>
#include <viewutil.hxx>
#include <tabprotection.hxx>
@@ -97,7 +74,6 @@
#include <refupdatecontext.hxx>
#include <refreshtimerprotector.hxx>
#include <scopetools.hxx>
-#include <formulagroup.hxx>
#include <documentlinkmgr.hxx>
#include <interpre.hxx>
#include <tokenstringcontext.hxx>
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index a83c413ebca1..e9dcf697e10d 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -26,20 +26,15 @@
#include <sfx2/bindings.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/viewsh.hxx>
-#include <svl/zforlist.hxx>
-#include <svl/PasswordHelper.hxx>
#include <vcl/svapp.hxx>
#include <document.hxx>
#include <attrib.hxx>
#include <table.hxx>
#include <rangenam.hxx>
#include <dbdata.hxx>
-#include <pivot.hxx>
#include <docpool.hxx>
#include <poolhelp.hxx>
-#include <autoform.hxx>
#include <rangelst.hxx>
-#include <chartarr.hxx>
#include <chartlock.hxx>
#include <refupdat.hxx>
#include <docoptio.hxx>
@@ -47,15 +42,12 @@
#include <clipoptions.hxx>
#include <viewopti.hxx>
#include <scextopt.hxx>
-#include <brdcst.hxx>
-#include <bcaslot.hxx>
#include <tablink.hxx>
#include <externalrefmgr.hxx>
#include <markdata.hxx>
#include <validat.hxx>
#include <dociter.hxx>
#include <detdata.hxx>
-#include <detfunc.hxx>
#include <inputopt.hxx>
#include <chartlis.hxx>
#include <sc.hrc>
@@ -64,24 +56,21 @@
#include <drwlayer.hxx>
#include <unoreflist.hxx>
#include <listenercalls.hxx>
-#include <dpshttab.hxx>
-#include <dpcache.hxx>
#include <tabprotection.hxx>
#include <formulaparserpool.hxx>
#include <clipparam.hxx>
#include <sheetevents.hxx>
-#include <colorscale.hxx>
#include <queryentry.hxx>
#include <formulacell.hxx>
#include <refupdatecontext.hxx>
#include <scopetools.hxx>
#include <filterentries.hxx>
#include <docsh.hxx>
+#include <queryparam.hxx>
#include <globalnames.hxx>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
#include <comphelper/lok.hxx>
-#include <o3tl/make_unique.hxx>
#include <memory>
using namespace com::sun::star;
diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index 5741264955e6..9e4cc23cb85d 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <svl/intitem.hxx>
#include <svl/zforlist.hxx>
#include <svl/zformat.hxx>
#include <formula/token.hxx>
@@ -30,7 +29,6 @@
#include <scresid.hxx>
#include <subtotal.hxx>
#include <docoptio.hxx>
-#include <interpre.hxx>
#include <markdata.hxx>
#include <validat.hxx>
#include <scitems.hxx>
@@ -43,11 +41,9 @@
#include <paramisc.hxx>
#include <compiler.hxx>
#include <externalrefmgr.hxx>
-#include <colorscale.hxx>
#include <attrib.hxx>
#include <formulacell.hxx>
#include <tokenarray.hxx>
-#include <scmatrix.hxx>
#include <tokenstringcontext.hxx>
#include <memory>
diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx
index ccd20606a95e..0bb9379ea99a 100644
--- a/sc/source/core/data/documen5.cxx
+++ b/sc/source/core/data/documen5.cxx
@@ -27,18 +27,14 @@
#include <sfx2/objsh.hxx>
#include <svx/svditer.hxx>
#include <svx/svdoole2.hxx>
-#include <svx/svdpage.hxx>
#include <svtools/embedhlp.hxx>
#include <document.hxx>
#include <table.hxx>
#include <drwlayer.hxx>
-#include <chartarr.hxx>
#include <chartlis.hxx>
#include <chartlock.hxx>
#include <refupdat.hxx>
-#include <tools/globname.hxx>
-#include <sot/exchange.hxx>
#include <miscuno.hxx>
#include <chart2uno.hxx>
diff --git a/sc/source/core/data/documen6.cxx b/sc/source/core/data/documen6.cxx
index fe414517b429..4076cef8a2f4 100644
--- a/sc/source/core/data/documen6.cxx
+++ b/sc/source/core/data/documen6.cxx
@@ -18,7 +18,6 @@
*/
#include <scitems.hxx>
-#include <editeng/scripttypeitem.hxx>
#include <com/sun/star/i18n/BreakIterator.hpp>
#include <com/sun/star/i18n/ScriptType.hpp>
@@ -30,7 +29,6 @@
#include <scrdata.hxx>
#include <poolhelp.hxx>
#include <attrib.hxx>
-#include <globalnames.hxx>
#include <columnspanset.hxx>
#include <table.hxx>
diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index f5111b16c043..abd4ec3f762d 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -17,27 +17,19 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <vcl/svapp.hxx>
#include <sal/log.hxx>
#include <document.hxx>
#include <brdcst.hxx>
#include <bcaslot.hxx>
#include <formulacell.hxx>
-#include <formula/errorcodes.hxx>
-#include <scerrors.hxx>
-#include <docoptio.hxx>
-#include <refupdat.hxx>
#include <table.hxx>
#include <progress.hxx>
#include <scmod.hxx>
#include <inputopt.hxx>
-#include <conditio.hxx>
-#include <colorscale.hxx>
#include <sheetevents.hxx>
#include <tokenarray.hxx>
#include <listenercontext.hxx>
-#include <formulagroup.hxx>
#include <refhint.hxx>
void ScDocument::StartListeningArea(
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index 2e4ccbc28e1a..84df9ff48195 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -18,17 +18,13 @@
*/
#include <scitems.hxx>
-#include <editeng/eeitem.hxx>
#include <o3tl/make_unique.hxx>
#include <comphelper/fileformat.h>
#include <tools/urlobj.hxx>
#include <editeng/editobj.hxx>
-#include <editeng/editstat.hxx>
#include <editeng/frmdiritem.hxx>
#include <editeng/langitem.hxx>
#include <sfx2/linkmgr.hxx>
-#include <editeng/scripttypeitem.hxx>
-#include <editeng/unolingu.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/printer.hxx>
@@ -39,9 +35,7 @@
#include <svl/zforlist.hxx>
#include <svl/zformat.hxx>
#include <unotools/misccfg.hxx>
-#include <sfx2/app.hxx>
#include <unotools/transliterationwrapper.hxx>
-#include <unotools/securityoptions.hxx>
#include <sal/log.hxx>
#include <vcl/virdev.hxx>
@@ -62,26 +56,21 @@
#include <ddelink.hxx>
#include <scmatrix.hxx>
#include <arealink.hxx>
-#include <dociter.hxx>
#include <patattr.hxx>
-#include <hints.hxx>
#include <editutil.hxx>
#include <progress.hxx>
#include <document.hxx>
#include <chartlis.hxx>
#include <chartlock.hxx>
#include <refupdat.hxx>
-#include <validat.hxx>
#include <markdata.hxx>
#include <scmod.hxx>
-#include <printopt.hxx>
#include <externalrefmgr.hxx>
#include <globstr.hrc>
#include <strings.hrc>
#include <sc.hrc>
#include <charthelper.hxx>
#include <macromgr.hxx>
-#include <dpobject.hxx>
#include <docuno.hxx>
#include <scresid.hxx>
#include <columniterator.hxx>
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index a1447d6ba49f..2b57c2d71dbd 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -20,26 +20,19 @@
#include <scitems.hxx>
#include <editeng/eeitem.hxx>
-#include <sot/exchange.hxx>
#include <editeng/autokernitem.hxx>
#include <editeng/fontitem.hxx>
-#include <editeng/forbiddencharacterstable.hxx>
#include <editeng/langitem.hxx>
#include <osl/thread.h>
#include <svl/asiancfg.hxx>
-#include <svx/svdetc.hxx>
#include <svx/svditer.hxx>
-#include <svx/svdocapt.hxx>
#include <svx/svdograf.hxx>
#include <svx/svdoole2.hxx>
-#include <svx/svdouno.hxx>
#include <svx/svdpage.hxx>
#include <svx/svdundo.hxx>
#include <svx/xtable.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/printer.hxx>
-#include <unotools/saveopt.hxx>
-#include <unotools/pathoptions.hxx>
#include <o3tl/make_unique.hxx>
#include <document.hxx>
@@ -51,11 +44,8 @@
#include <rechead.hxx>
#include <poolhelp.hxx>
#include <docpool.hxx>
-#include <detfunc.hxx>
#include <editutil.hxx>
-#include <postit.hxx>
#include <charthelper.hxx>
-#include <interpre.hxx>
#include <conditio.hxx>
#include <documentlinkmgr.hxx>
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 79f4e484d838..7dc5998643f3 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -18,27 +18,18 @@
*/
#include <scitems.hxx>
-#include <editeng/eeitem.hxx>
#include <editeng/boxitem.hxx>
-#include <editeng/frmdiritem.hxx>
#include <editeng/editobj.hxx>
-#include <svx/pageitem.hxx>
-#include <editeng/editeng.hxx>
#include <svx/sdrundomanager.hxx>
#include <svx/svditer.hxx>
-#include <svx/svdpage.hxx>
-#include <svx/svdocapt.hxx>
-#include <sfx2/app.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/viewsh.hxx>
#include <sfx2/docfile.hxx>
#include <svl/poolcach.hxx>
-#include <unotools/saveopt.hxx>
#include <svl/zforlist.hxx>
#include <unotools/charclass.hxx>
#include <unotools/transliterationwrapper.hxx>
-#include <tools/tenccvt.hxx>
#include <tools/urlobj.hxx>
#include <sal/log.hxx>
@@ -52,7 +43,6 @@
#include <column.hxx>
#include <attrib.hxx>
#include <attarray.hxx>
-#include <markarr.hxx>
#include <patattr.hxx>
#include <rangenam.hxx>
#include <poolhelp.hxx>
@@ -61,19 +51,14 @@
#include <stlsheet.hxx>
#include <globstr.hrc>
#include <scresid.hxx>
-#include <rechead.hxx>
#include <dbdata.hxx>
-#include <pivot.hxx>
#include <chartlis.hxx>
#include <rangelst.hxx>
#include <markdata.hxx>
#include <drwlayer.hxx>
-#include <conditio.hxx>
-#include <colorscale.hxx>
#include <validat.hxx>
#include <prnsave.hxx>
#include <chgtrack.hxx>
-#include <sc.hrc>
#include <hints.hxx>
#include <detdata.hxx>
#include <dpobject.hxx>
@@ -84,8 +69,6 @@
#include <autonamecache.hxx>
#include <bcaslot.hxx>
#include <postit.hxx>
-#include <externalrefmgr.hxx>
-#include <tabprotection.hxx>
#include <clipparam.hxx>
#include <defaultsoptions.hxx>
#include <editutil.hxx>
@@ -97,7 +80,6 @@
#include <scopetools.hxx>
#include <refupdatecontext.hxx>
#include <formulagroup.hxx>
-#include <tokenarray.hxx>
#include <tokenstringcontext.hxx>
#include <compressedarray.hxx>
#include <docsh.hxx>
@@ -106,7 +88,6 @@
#include <formula/vectortoken.hxx>
#include <limits>
-#include <map>
#include <memory>
#include <utility>
diff --git a/sc/source/core/data/document10.cxx b/sc/source/core/data/document10.cxx
index c0f255cf0a76..0f49dc63c756 100644
--- a/sc/source/core/data/document10.cxx
+++ b/sc/source/core/data/document10.cxx
@@ -10,11 +10,9 @@
#include <memory>
#include <document.hxx>
#include <clipcontext.hxx>
-#include <formulacell.hxx>
#include <clipparam.hxx>
#include <table.hxx>
#include <tokenarray.hxx>
-#include <editutil.hxx>
#include <listenercontext.hxx>
#include <tokenstringcontext.hxx>
#include <poolhelp.hxx>
@@ -23,10 +21,7 @@
#include <docpool.hxx>
#include <columniterator.hxx>
-#include <dociter.hxx>
-#include <patattr.hxx>
#include <refupdatecontext.hxx>
-#include <svl/whiter.hxx>
#include <sal/log.hxx>
#include <editeng/colritem.hxx>
#include <scitems.hxx>
diff --git a/sc/source/core/data/documentimport.cxx b/sc/source/core/data/documentimport.cxx
index 3c14a4bd5342..41f004107a8d 100644
--- a/sc/source/core/data/documentimport.cxx
+++ b/sc/source/core/data/documentimport.cxx
@@ -13,7 +13,6 @@
#include <column.hxx>
#include <formulacell.hxx>
#include <docoptio.hxx>
-#include <globalnames.hxx>
#include <mtvelements.hxx>
#include <tokenarray.hxx>
#include <stringutil.hxx>
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 0bb970dac78b..99995fb3a0d9 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -22,7 +22,6 @@
#include <document.hxx>
#include <queryentry.hxx>
#include <queryparam.hxx>
-#include <dpglobal.hxx>
#include <dpobject.hxx>
#include <globstr.hrc>
#include <scresid.hxx>
@@ -36,7 +35,6 @@
#include <rtl/math.hxx>
#include <unotools/textsearch.hxx>
#include <unotools/localedatawrapper.hxx>
-#include <formula/errorcodes.hxx>
#include <svl/zforlist.hxx>
#include <o3tl/make_unique.hxx>
#include <osl/diagnose.h>
diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx
index 9893729b3a0c..2319294b49c5 100644
--- a/sc/source/core/data/dpdimsave.cxx
+++ b/sc/source/core/data/dpdimsave.cxx
@@ -31,7 +31,6 @@
#include <rtl/math.hxx>
#include <algorithm>
-#include <global.hxx>
#include <globstr.hrc>
#include <scresid.hxx>
diff --git a/sc/source/core/data/dpfilteredcache.cxx b/sc/source/core/data/dpfilteredcache.cxx
index a026a8ca6220..e3f47ffd7fcb 100644
--- a/sc/source/core/data/dpfilteredcache.cxx
+++ b/sc/source/core/data/dpfilteredcache.cxx
@@ -19,15 +19,10 @@
#include <dpcache.hxx>
#include <dpfilteredcache.hxx>
-#include <document.hxx>
#include <address.hxx>
-#include <formulacell.hxx>
-#include <dptabdat.hxx>
-#include <dptabsrc.hxx>
-#include <dpobject.hxx>
#include <queryparam.hxx>
-#include <queryentry.hxx>
#include <dpitemdata.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
#include <osl/diagnose.h>
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index b3f48124dfed..a834efc7cdc2 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -20,15 +20,9 @@
#include <dpgroup.hxx>
#include <dpcache.hxx>
-#include <global.hxx>
#include <document.hxx>
#include <dpfilteredcache.hxx>
-#include <dptabsrc.hxx>
-#include <dptabres.hxx>
-#include <dpobject.hxx>
-#include <dpglobal.hxx>
#include <dputil.hxx>
-#include <globalnames.hxx>
#include <osl/diagnose.h>
#include <rtl/math.hxx>
diff --git a/sc/source/core/data/dpitemdata.cxx b/sc/source/core/data/dpitemdata.cxx
index 155a2c2dc899..f6d2e9812f9e 100644
--- a/sc/source/core/data/dpitemdata.cxx
+++ b/sc/source/core/data/dpitemdata.cxx
@@ -18,11 +18,10 @@
*/
#include <dpitemdata.hxx>
+#include <global.hxx>
-#include <document.hxx>
-#include <dpobject.hxx>
-#include <formulacell.hxx>
-#include <dptabdat.hxx>
+#include <unotools/collatorwrapper.hxx>
+#include <unotools/transliterationwrapper.hxx>
#include <rtl/math.hxx>
const sal_Int32 ScDPItemData::DateFirst = -1;
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 7a86668ad39a..ac243511b5f4 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -27,13 +27,10 @@
#include <dpsdbtab.hxx>
#include <dpgroup.hxx>
#include <document.hxx>
-#include <rechead.hxx>
#include <pivot.hxx>
#include <dapiuno.hxx>
#include <miscuno.hxx>
-#include <scerrors.hxx>
#include <refupdat.hxx>
-#include <sc.hrc>
#include <attrib.hxx>
#include <scitems.hxx>
#include <unonames.hxx>
@@ -71,7 +68,6 @@
#include <comphelper/string.hxx>
#include <comphelper/types.hxx>
#include <sal/macros.h>
-#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <svl/zforlist.hxx>
#include <vcl/svapp.hxx>
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index 5d7a7a4aebfb..534d90cf3ef6 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -18,20 +18,13 @@
*/
#include <scitems.hxx>
-#include <svx/algitem.hxx>
#include <editeng/boxitem.hxx>
-#include <editeng/brushitem.hxx>
#include <editeng/wghtitem.hxx>
#include <editeng/justifyitem.hxx>
-#include <unotools/transliterationwrapper.hxx>
+#include <svl/itemset.hxx>
#include <dpoutput.hxx>
-#include <dptabsrc.hxx>
-#include <dpfilteredcache.hxx>
#include <document.hxx>
-#include <patattr.hxx>
-#include <docpool.hxx>
-#include <markdata.hxx>
#include <attrib.hxx>
#include <formula/errorcodes.hxx>
#include <miscuno.hxx>
@@ -53,7 +46,14 @@
#include <com/sun/star/sheet/DataResultFlags.hpp>
#include <com/sun/star/sheet/DataPilotTablePositionType.hpp>
#include <com/sun/star/sheet/GeneralFunction2.hpp>
-
+#include <com/sun/star/sheet/MemberResult.hpp>
+#include <com/sun/star/sheet/XDataPilotMemberResults.hpp>
+#include <com/sun/star/sheet/XDataPilotResults.hpp>
+#include <com/sun/star/sheet/XDimensionsSupplier.hpp>
+#include <com/sun/star/sheet/XHierarchiesSupplier.hpp>
+#include <com/sun/star/sheet/XLevelsSupplier.hpp>
+#include <com/sun/star/sheet/XMembersAccess.hpp>
+#include <com/sun/star/sheet/XMembersSupplier.hpp>
#include <vector>
using namespace com::sun::star;
diff --git a/sc/source/core/data/dpresfilter.cxx b/sc/source/core/data/dpresfilter.cxx
index 2544d2f8f8b1..5201ad908b82 100644
--- a/sc/source/core/data/dpresfilter.cxx
+++ b/sc/source/core/data/dpresfilter.cxx
@@ -16,6 +16,7 @@
#include <o3tl/make_unique.hxx>
#include <com/sun/star/sheet/DataPilotFieldFilter.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
using namespace com::sun::star;
using namespace std;
diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index d086f76d32c0..1a0a31b73ef3 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -21,12 +21,10 @@
#include <dpsave.hxx>
#include <dpdimsave.hxx>
#include <miscuno.hxx>
-#include <scerrors.hxx>
#include <unonames.hxx>
-#include <global.hxx>
-#include <dptabsrc.hxx>
#include <dputil.hxx>
#include <generalfunction.hxx>
+#include <dptabdat.hxx>
#include <sal/types.h>
#include <sal/log.hxx>
@@ -34,8 +32,7 @@
#include <o3tl/make_unique.hxx>
#include <comphelper/stl_types.hxx>
-#include <com/sun/star/sheet/GeneralFunction.hpp>
-#include <com/sun/star/sheet/GeneralFunction2.hpp>
+#include <com/sun/star/sheet/XDimensionsSupplier.hpp>
#include <com/sun/star/sheet/DataPilotFieldAutoShowInfo.hpp>
#include <com/sun/star/sheet/DataPilotFieldLayoutInfo.hpp>
#include <com/sun/star/sheet/DataPilotFieldReference.hpp>
@@ -49,7 +46,6 @@
#include <unordered_map>
-#include <unordered_set>
#include <algorithm>
using namespace com::sun::star;
diff --git a/sc/source/core/data/dpsdbtab.cxx b/sc/source/core/data/dpsdbtab.cxx
index 30fc1c6ca609..00a478579fda 100644
--- a/sc/source/core/data/dpsdbtab.cxx
+++ b/sc/source/core/data/dpsdbtab.cxx
@@ -18,11 +18,9 @@
*/
#include <dpsdbtab.hxx>
-#include <global.hxx>
#include <globstr.hrc>
#include <scresid.hxx>
#include <dpfilteredcache.hxx>
-#include <dptabres.hxx>
#include <document.hxx>
#include <dpobject.hxx>
diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx
index a79f5e68ff73..673a1301cac1 100644
--- a/sc/source/core/data/dpshttab.cxx
+++ b/sc/source/core/data/dpshttab.cxx
@@ -22,9 +22,7 @@
#include <dpcache.hxx>
#include <dpshttab.hxx>
-#include <dptabres.hxx>
#include <document.hxx>
-#include <formulacell.hxx>
#include <dpfilteredcache.hxx>
#include <dpobject.hxx>
#include <globstr.hrc>
@@ -35,7 +33,6 @@
#include <osl/diagnose.h>
#include <vector>
-#include <set>
using namespace ::com::sun::star;
using ::com::sun::star::uno::Any;
diff --git a/sc/source/core/data/dptabdat.cxx b/sc/source/core/data/dptabdat.cxx
index ebe1e490994f..88677ea7217d 100644
--- a/sc/source/core/data/dptabdat.cxx
+++ b/sc/source/core/data/dptabdat.cxx
@@ -19,17 +19,11 @@
#include <dptabdat.hxx>
#include <dpcache.hxx>
-#include <global.hxx>
#include <dpfilteredcache.hxx>
#include <dptabres.hxx>
-#include <document.hxx>
-#include <dpobject.hxx>
-#include <rtl/math.hxx>
#include <osl/diagnose.h>
#include <tools/date.hxx>
-#include <unotools/transliterationwrapper.hxx>
-#include <unotools/collatorwrapper.hxx>
using namespace ::com::sun::star;
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index f930b245b063..305f6d8ac711 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -34,7 +34,6 @@
#include <osl/diagnose.h>
#include <rtl/math.hxx>
-#include <rtl/strbuf.hxx>
#include <sal/log.hxx>
#include <math.h>
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 1dec7ca8b50e..4acd3720274c 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -29,20 +29,12 @@
#include <rtl/math.hxx>
#include <sal/log.hxx>
#include <svl/itemprop.hxx>
-#include <svl/intitem.hxx>
#include <vcl/svapp.hxx>
-#include <scitems.hxx>
-#include <document.hxx>
-#include <docpool.hxx>
-#include <patattr.hxx>
-#include <formulacell.hxx>
-
#include <dpcache.hxx>
#include <dptabres.hxx>
#include <dptabdat.hxx>
#include <global.hxx>
-#include <datauno.hxx>
#include <miscuno.hxx>
#include <unonames.hxx>
#include <dpitemdata.hxx>
@@ -58,8 +50,8 @@
#include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp>
#include <com/sun/star/sheet/DataPilotFieldAutoShowInfo.hpp>
#include <com/sun/star/sheet/GeneralFunction2.hpp>
+#include <com/sun/star/sheet/TableFilterField.hpp>
-#include <unotools/collatorwrapper.hxx>
#include <unotools/calendarwrapper.hxx>
#include <com/sun/star/i18n/CalendarDisplayIndex.hpp>
diff --git a/sc/source/core/data/dputil.cxx b/sc/source/core/data/dputil.cxx
index aefa1e143bcb..d19f2a6adde1 100644
--- a/sc/source/core/data/dputil.cxx
+++ b/sc/source/core/data/dputil.cxx
@@ -10,7 +10,6 @@
#include <dputil.hxx>
#include <dpitemdata.hxx>
#include <dpnumgroupinfo.hxx>
-#include <globalnames.hxx>
#include <globstr.hrc>
#include <scresid.hxx>
#include <generalfunction.hxx>
@@ -24,7 +23,6 @@
#include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp>
#include <com/sun/star/i18n/CalendarDisplayIndex.hpp>
-#include <com/sun/star/sheet/GeneralFunction2.hpp>
using namespace com::sun::star;
diff --git a/sc/source/core/data/drawpage.cxx b/sc/source/core/data/drawpage.cxx
index ec1208e669f7..9eff30d87ac2 100644
--- a/sc/source/core/data/drawpage.cxx
+++ b/sc/source/core/data/drawpage.cxx
@@ -17,11 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <sfx2/objsh.hxx>
-
#include <drawpage.hxx>
#include <drwlayer.hxx>
-#include <document.hxx>
#include <pageuno.hxx>
ScDrawPage::ScDrawPage(ScDrawLayer& rNewModel, bool bMasterPage)
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 3ca29c0e69d8..ecc766a11de8 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -20,9 +20,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/chart/XChartDocument.hpp>
#include <com/sun/star/chart2/XChartDocument.hpp>
-#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <com/sun/star/embed/XClassifiedObject.hpp>
-#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <scitems.hxx>
#include <editeng/eeitem.hxx>
@@ -34,8 +32,6 @@
#include <svx/svditer.hxx>
#include <svx/svdlayer.hxx>
#include <svx/svdocapt.hxx>
-#include <svx/svdocirc.hxx>
-#include <svx/svdoedge.hxx>
#include <svx/svdograf.hxx>
#include <svx/svdoole2.hxx>
#include <svx/svdundo.hxx>
@@ -45,17 +41,11 @@
#include <svx/drawitem.hxx>
#include <editeng/fhgtitem.hxx>
#include <editeng/scriptspaceitem.hxx>
-#include <svx/shapepropertynotifier.hxx>
-#include <sfx2/viewsh.hxx>
-#include <sfx2/docfile.hxx>
#include <sfx2/objsh.hxx>
-#include <sot/storage.hxx>
#include <svl/itempool.hxx>
-#include <vcl/virdev.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
-#include <unotools/configmgr.hxx>
-#include <unotools/pathoptions.hxx>
+#include <tools/globname.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
@@ -64,13 +54,11 @@
#include <drawpage.hxx>
#include <global.hxx>
#include <document.hxx>
-#include <rechead.hxx>
#include <userdat.hxx>
#include <markdata.hxx>
#include <globstr.hrc>
#include <scresid.hxx>
#include <scmod.hxx>
-#include <chartarr.hxx>
#include <postit.hxx>
#include <attrib.hxx>
#include <charthelper.hxx>
@@ -80,6 +68,8 @@
#include <vcl/field.hxx>
#include <memory>
+namespace com { namespace sun { namespace star { namespace embed { class XEmbeddedObject; } } } }
+
#define DET_ARROW_OFFSET 1000
using namespace ::com::sun::star;
diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index a390101b12e7..3d4c2f3b279c 100644
--- a/sc/source/core/data/fillinfo.cxx
+++ b/sc/source/core/data/fillinfo.cxx
@@ -21,13 +21,11 @@
#include <scitems.hxx>
#include <editeng/boxitem.hxx>
#include <editeng/lineitem.hxx>
-#include <editeng/editdata.hxx>
#include <editeng/shaditem.hxx>
#include <editeng/brushitem.hxx>
#include <fillinfo.hxx>
#include <document.hxx>
-#include <formulacell.hxx>
#include <table.hxx>
#include <attrib.hxx>
#include <attarray.hxx>
@@ -37,7 +35,6 @@
#include <poolhelp.hxx>
#include <docpool.hxx>
#include <conditio.hxx>
-#include <colorscale.hxx>
#include <stlpool.hxx>
#include <cellvalue.hxx>
#include <mtvcellfunc.hxx>
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 2b97c2048b34..07bf79af884b 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -30,7 +30,6 @@
#include <compiler.hxx>
#include <document.hxx>
-#include <globalnames.hxx>
#include <cellvalue.hxx>
#include <interpre.hxx>
#include <macromgr.hxx>
@@ -53,11 +52,8 @@
#include <editeng/editobj.hxx>
#include <tools/cpuid.hxx>
#include <formula/errorcodes.hxx>
-#include <formula/vectortoken.hxx>
#include <svl/intitem.hxx>
#include <o3tl/make_unique.hxx>
-#include <rtl/strbuf.hxx>
-#include <officecfg/Office/Calc.hxx>
#include <formulagroup.hxx>
#include <listenercontext.hxx>
#include <types.hxx>
diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx
index 5caf7a558344..6edd7fe23576 100644
--- a/sc/source/core/data/funcdesc.cxx
+++ b/sc/source/core/data/funcdesc.cxx
@@ -25,7 +25,6 @@
#include <compiler.hxx>
#include <compiler.hrc>
#include <global.hxx>
-#include <sc.hrc>
#include <scfuncs.hrc>
#include <scmod.hxx>
#include <scresid.hxx>
@@ -33,12 +32,10 @@
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
-#include <unotools/resmgr.hxx>
#include <unotools/collatorwrapper.hxx>
#include <formula/funcvarargs.h>
#include <memory>
-#include <numeric>
struct ScFuncDescCore
{
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 441c95ef8412..a40820c014e1 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -22,7 +22,6 @@
#include <svx/algitem.hxx>
#include <editeng/brushitem.hxx>
#include <editeng/editobj.hxx>
-#include <editeng/scripttypeitem.hxx>
#include <svl/srchitem.hxx>
#include <editeng/langitem.hxx>
#include <sfx2/docfile.hxx>
@@ -33,42 +32,30 @@
#include <svl/stritem.hxx>
#include <svl/zforlist.hxx>
#include <svl/zformat.hxx>
-#include <vcl/image.hxx>
#include <vcl/virdev.hxx>
#include <vcl/settings.hxx>
-#include <sal/macros.h>
#include <unotools/charclass.hxx>
#include <unotools/securityoptions.hxx>
-#include <stdlib.h>
-#include <time.h>
-#include <numeric>
-#include <svx/svdmodel.hxx>
-#include <svtools/colorcfg.hxx>
#include <i18nlangtag/mslangid.hxx>
-#include <com/sun/star/lang/Locale.hpp>
#include <comphelper/doublecheckedinit.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx>
#include <unotools/calendarwrapper.hxx>
#include <unotools/collatorwrapper.hxx>
-#include <unotools/intlwrapper.hxx>
#include <unotools/syslocale.hxx>
#include <unotools/transliterationwrapper.hxx>
-#include <LibreOfficeKit/LibreOfficeKitEnums.h>
#include <comphelper/lok.hxx>
#include <global.hxx>
#include <scresid.hxx>
#include <autoform.hxx>
-#include <document.hxx>
#include <patattr.hxx>
#include <addincol.hxx>
#include <adiasync.hxx>
#include <userlist.hxx>
#include <interpre.hxx>
-#include <docpool.hxx>
#include <unitconv.hxx>
#include <compiler.hxx>
#include <parclass.hxx>
@@ -76,7 +63,6 @@
#include <globstr.hrc>
#include <strings.hrc>
#include <scmod.hxx>
-#include <appoptio.hxx>
#include <editutil.hxx>
#include <docsh.hxx>
diff --git a/sc/source/core/data/global2.cxx b/sc/source/core/data/global2.cxx
index ffbc62913781..6ae017c103e9 100644
--- a/sc/source/core/data/global2.cxx
+++ b/sc/source/core/data/global2.cxx
@@ -21,11 +21,7 @@
#include <sfx2/objsh.hxx>
#include <unotools/configmgr.hxx>
#include <unotools/pathoptions.hxx>
-#include <unotools/useroptions.hxx>
#include <tools/urlobj.hxx>
-#include <unotools/charclass.hxx>
-#include <stdlib.h>
-#include <unotools/syslocale.hxx>
#include <svl/zforlist.hxx>
#include <formula/errorcodes.hxx>
#include <sal/log.hxx>
@@ -33,14 +29,10 @@
#include <global.hxx>
#include <rangeutl.hxx>
-#include <rechead.hxx>
#include <compiler.hxx>
#include <paramisc.hxx>
#include <calcconfig.hxx>
-#include <sc.hrc>
-
-
// struct ScImportParam:
ScImportParam::ScImportParam() :
diff --git a/sc/source/core/data/globalx.cxx b/sc/source/core/data/globalx.cxx
index 81bd7bf1804a..7408cf4ab7a8 100644
--- a/sc/source/core/data/globalx.cxx
+++ b/sc/source/core/data/globalx.cxx
@@ -27,8 +27,6 @@
#include <unotools/pathoptions.hxx>
#include <com/sun/star/sdbc/XResultSet.hpp>
-#include <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <com/sun/star/ucb/XContentAccess.hpp>
#include <com/sun/star/i18n/OrdinalSuffix.hpp>
@@ -36,6 +34,8 @@
#include <unotools/configmgr.hxx>
#include <unotools/localedatawrapper.hxx>
+namespace com { namespace sun { namespace star { namespace ucb { class XCommandEnvironment; } } } }
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ucb;
diff --git a/sc/source/core/data/grouptokenconverter.cxx b/sc/source/core/data/grouptokenconverter.cxx
index a0df06a90f33..1e9f5e5aa8c9 100644
--- a/sc/source/core/data/grouptokenconverter.cxx
+++ b/sc/source/core/data/grouptokenconverter.cxx
@@ -8,10 +8,10 @@
*/
#include <grouptokenconverter.hxx>
-#include <compiler.hxx>
#include <document.hxx>
#include <formulacell.hxx>
#include <tokenarray.hxx>
+#include <refdata.hxx>
#include <formula/token.hxx>
#include <formula/vectortoken.hxx>
diff --git a/sc/source/core/data/markarr.cxx b/sc/source/core/data/markarr.cxx
index 7bdff0fcf989..727b5637f134 100644
--- a/sc/source/core/data/markarr.cxx
+++ b/sc/source/core/data/markarr.cxx
@@ -18,7 +18,6 @@
*/
#include <markarr.hxx>
-#include <global.hxx>
#include <address.hxx>
#include <vector>
diff --git a/sc/source/core/data/mtvelements.cxx b/sc/source/core/data/mtvelements.cxx
index e34010af54d8..a7c92fbb61d2 100644
--- a/sc/source/core/data/mtvelements.cxx
+++ b/sc/source/core/data/mtvelements.cxx
@@ -8,7 +8,6 @@
*/
#include <mtvelements.hxx>
-#include <globalnames.hxx>
#include <document.hxx>
#include <cellvalue.hxx>
#include <column.hxx>
diff --git a/sc/source/core/data/olinetab.cxx b/sc/source/core/data/olinetab.cxx
index cdb80c22bdad..a8d5146a6a23 100644
--- a/sc/source/core/data/olinetab.cxx
+++ b/sc/source/core/data/olinetab.cxx
@@ -17,16 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <limits.h>
-
#include <olinetab.hxx>
-#include <global.hxx>
-#include <rechead.hxx>
#include <address.hxx>
#include <table.hxx>
-#include <o3tl/make_unique.hxx>
-
#include <osl/diagnose.h>
ScOutlineEntry::ScOutlineEntry( SCCOLROW nNewStart, SCCOLROW nNewSize, bool bNewHidden ) :
diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx
index 27a8d8ba2787..ebe8dbd11852 100644
--- a/sc/source/core/data/patattr.cxx
+++ b/sc/source/core/data/patattr.cxx
@@ -22,7 +22,6 @@
#include <scitems.hxx>
#include <editeng/adjustitem.hxx>
#include <o3tl/make_unique.hxx>
-#include <svx/algitem.hxx>
#include <editeng/boxitem.hxx>
#include <editeng/lineitem.hxx>
#include <editeng/brushitem.hxx>
@@ -40,7 +39,6 @@
#include <editeng/postitem.hxx>
#include <svx/rotmodit.hxx>
#include <editeng/scriptspaceitem.hxx>
-#include <editeng/scripttypeitem.hxx>
#include <editeng/shaditem.hxx>
#include <editeng/shdditem.hxx>
#include <editeng/udlnitem.hxx>
@@ -50,7 +48,6 @@
#include <svl/intitem.hxx>
#include <svl/zforlist.hxx>
#include <vcl/outdev.hxx>
-#include <vcl/svapp.hxx>
#include <tools/fract.hxx>
#include <patattr.hxx>
@@ -61,7 +58,6 @@
#include <global.hxx>
#include <globstr.hrc>
#include <scresid.hxx>
-#include <conditio.hxx>
#include <validat.hxx>
#include <scmod.hxx>
#include <fillinfo.hxx>
diff --git a/sc/source/core/data/pivot2.cxx b/sc/source/core/data/pivot2.cxx
index 70e6d5a1aba4..8c9ba9a2388a 100644
--- a/sc/source/core/data/pivot2.cxx
+++ b/sc/source/core/data/pivot2.cxx
@@ -17,25 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <scitems.hxx>
-#include <editeng/boxitem.hxx>
-#include <editeng/wghtitem.hxx>
-#include <svx/algitem.hxx>
-#include <unotools/transliterationwrapper.hxx>
-
-#include <subtotal.hxx>
-#include <rangeutl.hxx>
-#include <attrib.hxx>
-#include <patattr.hxx>
-#include <docpool.hxx>
-#include <document.hxx>
-#include <userlist.hxx>
#include <pivot.hxx>
-#include <rechead.hxx>
-#include <formula/errorcodes.hxx>
-#include <refupdat.hxx>
-#include <stlpool.hxx>
-#include <stlsheet.hxx>
#include <o3tl/make_unique.hxx>
#if DEBUG_PIVOT_TABLE
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index acc77eb882f6..581dfb5207a6 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -39,21 +39,16 @@
#include <svx/sdsxyitm.hxx>
#include <tools/gen.hxx>
-#include <table.hxx>
#include <document.hxx>
#include <docpool.hxx>
#include <patattr.hxx>
-#include <formulacell.hxx>
#include <drwlayer.hxx>
#include <undocell.hxx>
#include <userdat.hxx>
-#include <detdata.hxx>
#include <detfunc.hxx>
#include <editutil.hxx>
#include <o3tl/make_unique.hxx>
-#include <utility>
-
using namespace com::sun::star;
namespace {
diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx
index 029e96c72f2f..353f4dca9029 100644
--- a/sc/source/core/data/stlpool.cxx
+++ b/sc/source/core/data/stlpool.cxx
@@ -21,31 +21,23 @@
#include <scitems.hxx>
#include <editeng/eeitem.hxx>
#include <i18nlangtag/mslangid.hxx>
-#include <svx/algitem.hxx>
#include <editeng/boxitem.hxx>
#include <editeng/brushitem.hxx>
#include <editeng/editdata.hxx>
#include <editeng/editeng.hxx>
#include <editeng/editobj.hxx>
-#include <editeng/fhgtitem.hxx>
#include <editeng/flditem.hxx>
#include <editeng/fontitem.hxx>
#include <svx/pageitem.hxx>
-#include <editeng/postitem.hxx>
-#include <editeng/udlnitem.hxx>
-#include <editeng/wghtitem.hxx>
-#include <editeng/justifyitem.hxx>
#include <svl/itemset.hxx>
#include <svl/zforlist.hxx>
#include <svl/IndexedStyleSheets.hxx>
#include <unotools/charclass.hxx>
-#include <unotools/fontcvt.hxx>
#include <vcl/outdev.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <sc.hrc>
-#include <helpids.h>
#include <attrib.hxx>
#include <global.hxx>
#include <globstr.hrc>
@@ -54,9 +46,7 @@
#include <docpool.hxx>
#include <stlpool.hxx>
#include <stlsheet.hxx>
-#include <rechead.hxx>
#include <editutil.hxx>
-#include <patattr.hxx>
ScStyleSheetPool::ScStyleSheetPool( const SfxItemPool& rPoolP,
ScDocument* pDocument )
diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx
index 3597205aa829..bda09b05e0ba 100644
--- a/sc/source/core/data/stlsheet.cxx
+++ b/sc/source/core/data/stlsheet.cxx
@@ -27,23 +27,18 @@
#include <editeng/lrspitem.hxx>
#include <svx/pageitem.hxx>
#include <editeng/paperinf.hxx>
-#include <editeng/pbinitem.hxx>
#include <editeng/shaditem.hxx>
#include <editeng/sizeitem.hxx>
#include <editeng/ulspitem.hxx>
#include <editeng/xmlcnitm.hxx>
-#include <sfx2/printer.hxx>
#include <svl/itempool.hxx>
#include <svl/itemset.hxx>
#include <svl/hint.hxx>
#include <attrib.hxx>
-#include <vcl/svapp.hxx>
-
#include <globstr.hrc>
#include <scresid.hxx>
#include <sc.hrc>
-#include <helpids.h>
#define TWO_CM 1134
#define HFDIST_CM 142
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 9b3466f26a8a..48a9ec2d4f36 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -18,33 +18,26 @@
*/
#include <scitems.hxx>
-#include <svx/algitem.hxx>
#include <editeng/justifyitem.hxx>
#include <unotools/textsearch.hxx>
#include <unotools/charclass.hxx>
-#include <sfx2/objsh.hxx>
-#include <attrib.hxx>
#include <patattr.hxx>
-#include <formulacell.hxx>
#include <table.hxx>
#include <document.hxx>
#include <drwlayer.hxx>
#include <olinetab.hxx>
-#include <stlsheet.hxx>
#include <global.hxx>
#include <globstr.hrc>
#include <scresid.hxx>
#include <refupdat.hxx>
#include <markdata.hxx>
#include <progress.hxx>
-#include <hints.hxx>
#include <prnsave.hxx>
#include <tabprotection.hxx>
#include <sheetevents.hxx>
#include <segmenttree.hxx>
#include <dbdata.hxx>
-#include <colorscale.hxx>
#include <conditio.hxx>
#include <globalnames.hxx>
#include <cellvalue.hxx>
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index e7e8b972d83e..41cf8caf0d18 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -26,11 +26,9 @@
#include <document.hxx>
#include <drwlayer.hxx>
#include <olinetab.hxx>
-#include <rechead.hxx>
#include <stlpool.hxx>
#include <attarray.hxx>
#include <markdata.hxx>
-#include <progress.hxx>
#include <dociter.hxx>
#include <conditio.hxx>
#include <chartlis.hxx>
@@ -39,10 +37,7 @@
#include <postit.hxx>
#include <sheetevents.hxx>
#include <segmenttree.hxx>
-#include <queryparam.hxx>
-#include <queryentry.hxx>
#include <dbdata.hxx>
-#include <colorscale.hxx>
#include <tokenarray.hxx>
#include <clipcontext.hxx>
#include <types.hxx>
@@ -53,11 +48,10 @@
#include <tabprotection.hxx>
#include <columnspanset.hxx>
#include <rowheightcontext.hxx>
-#include <refhint.hxx>
#include <listenercontext.hxx>
-#include <token.hxx>
#include <compressedarray.hxx>
#include <brdcst.hxx>
+#include <refdata.hxx>
#include <scitems.hxx>
#include <editeng/boxitem.hxx>
@@ -65,8 +59,6 @@
#include <svl/poolcach.hxx>
#include <unotools/charclass.hxx>
#include <math.h>
-#include <svl/PasswordHelper.hxx>
-#include <unotools/transliterationwrapper.hxx>
namespace {
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index bb3f1cab4e4e..7ffd5dfec926 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -23,7 +23,6 @@
#include <unotools/textsearch.hxx>
#include <svl/zforlist.hxx>
#include <svl/zformat.hxx>
-#include <svx/svdobj.hxx>
#include <unotools/charclass.hxx>
#include <unotools/collatorwrapper.hxx>
#include <stdlib.h>
@@ -32,29 +31,25 @@
#include <com/sun/star/i18n/KParseType.hpp>
#include <sal/log.hxx>
+#include <refdata.hxx>
#include <table.hxx>
#include <scitems.hxx>
-#include <attrib.hxx>
#include <formulacell.hxx>
#include <document.hxx>
#include <globstr.hrc>
#include <scresid.hxx>
#include <global.hxx>
#include <stlpool.hxx>
-#include <compiler.hxx>
#include <patattr.hxx>
#include <subtotal.hxx>
#include <docoptio.hxx>
#include <markdata.hxx>
#include <rangelst.hxx>
-#include <attarray.hxx>
#include <userlist.hxx>
#include <progress.hxx>
#include <cellform.hxx>
-#include <postit.hxx>
#include <queryparam.hxx>
#include <queryentry.hxx>
-#include <segmenttree.hxx>
#include <subtotalparam.hxx>
#include <docpool.hxx>
#include <cellvalue.hxx>
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 860f8a51bd41..300770309447 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -19,20 +19,7 @@
#include <scitems.hxx>
#include <comphelper/string.hxx>
-#include <svx/algitem.hxx>
#include <editeng/boxitem.hxx>
-#include <editeng/brushitem.hxx>
-#include <editeng/contouritem.hxx>
-#include <editeng/colritem.hxx>
-#include <editeng/crossedoutitem.hxx>
-#include <editeng/fhgtitem.hxx>
-#include <editeng/fontitem.hxx>
-#include <editeng/langitem.hxx>
-#include <editeng/postitem.hxx>
-#include <editeng/shdditem.hxx>
-#include <editeng/udlnitem.hxx>
-#include <editeng/wghtitem.hxx>
-#include <svx/rotmodit.hxx>
#include <editeng/editobj.hxx>
#include <editeng/editeng.hxx>
#include <editeng/eeitem.hxx>
@@ -53,10 +40,8 @@
#include <zforauto.hxx>
#include <subtotal.hxx>
#include <formula/errorcodes.hxx>
-#include <rangenam.hxx>
#include <docpool.hxx>
#include <progress.hxx>
-#include <segmenttree.hxx>
#include <conditio.hxx>
#include <editutil.hxx>
#include <listenercontext.hxx>
diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx
index b910a70f984d..ab908712f108 100644
--- a/sc/source/core/data/table5.cxx
+++ b/sc/source/core/data/table5.cxx
@@ -19,20 +19,13 @@
#include <scitems.hxx>
#include <attrib.hxx>
-#include <patattr.hxx>
-#include <docpool.hxx>
#include <formulacell.hxx>
#include <table.hxx>
#include <column.hxx>
#include <document.hxx>
#include <drwlayer.hxx>
-#include <olinetab.hxx>
-#include <userlist.hxx>
-#include <stlsheet.hxx>
#include <global.hxx>
-#include <rechead.hxx>
#include <stlpool.hxx>
-#include <brdcst.hxx>
#include <tabprotection.hxx>
#include <globstr.hrc>
#include <scresid.hxx>
@@ -48,7 +41,6 @@
#include <algorithm>
#include <limits>
-#include <iostream>
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::sheet::TablePageBreakData;
diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index e1cbc6715f38..53e74aba6d20 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -31,9 +31,7 @@
#include <stlsheet.hxx>
#include <markdata.hxx>
#include <editutil.hxx>
-#include <detfunc.hxx>
#include <postit.hxx>
-#include <stringutil.hxx>
namespace {
diff --git a/sc/source/core/data/table7.cxx b/sc/source/core/data/table7.cxx
index 9bf03be16002..cbc3949d47b6 100644
--- a/sc/source/core/data/table7.cxx
+++ b/sc/source/core/data/table7.cxx
@@ -11,7 +11,6 @@
#include <clipcontext.hxx>
#include <document.hxx>
#include <clipparam.hxx>
-#include <bcaslot.hxx>
#include <segmenttree.hxx>
#include <sharedformula.hxx>
#include <cellvalues.hxx>
diff --git a/sc/source/core/data/userdat.cxx b/sc/source/core/data/userdat.cxx
index ebf7f6dc70b6..387d433e3374 100644
--- a/sc/source/core/data/userdat.cxx
+++ b/sc/source/core/data/userdat.cxx
@@ -18,8 +18,6 @@
*/
#include <userdat.hxx>
-#include <drwlayer.hxx>
-#include <rechead.hxx>
ScDrawObjData::ScDrawObjData() :
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index 52ed148664ca..fc873b431c8f 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -23,12 +23,10 @@
#include <com/sun/star/sheet/TableValidationVisibility.hpp>
#include <sfx2/app.hxx>
-#include <sfx2/docfile.hxx>
#include <sfx2/objsh.hxx>
#include <basic/sbmeth.hxx>
#include <basic/sbmod.hxx>
#include <basic/sbstar.hxx>
-#include <basic/basmgr.hxx>
#include <basic/sbx.hxx>
#include <svl/zforlist.hxx>
@@ -36,20 +34,18 @@
#include <vcl/weld.hxx>
#include <rtl/math.hxx>
-#include <scitems.hxx>
#include <document.hxx>
#include <formulacell.hxx>
#include <patattr.hxx>
-#include <rechead.hxx>
#include <globstr.hrc>
#include <scresid.hxx>
#include <rangenam.hxx>
#include <dbdata.hxx>
#include <typedstrdata.hxx>
-#include <dociter.hxx>
#include <editutil.hxx>
#include <tokenarray.hxx>
#include <scmatrix.hxx>
+#include <cellvalue.hxx>
#include <math.h>
#include <memory>
diff --git a/sc/source/core/tool/cellkeytranslator.cxx b/sc/source/core/tool/cellkeytranslator.cxx
index 0b563804e58f..5999204b83bb 100644
--- a/sc/source/core/tool/cellkeytranslator.cxx
+++ b/sc/source/core/tool/cellkeytranslator.cxx
@@ -26,6 +26,7 @@
#include <i18nutil/transliteration.hxx>
#include <rtl/ustring.hxx>
#include <unotools/syslocale.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
using ::com::sun::star::uno::Sequence;
diff --git a/sc/source/filter/excel/xltracer.cxx b/sc/source/filter/excel/xltracer.cxx
index 37af223d7a4c..3e11dd193d7e 100644
--- a/sc/source/filter/excel/xltracer.cxx
+++ b/sc/source/filter/excel/xltracer.cxx
@@ -19,6 +19,7 @@
#include <xltracer.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
#include <address.hxx>
using ::com::sun::star::uno::Sequence;
More information about the Libreoffice-commits
mailing list