sc/IwyuFilter_sc.yaml | 23 +++++++++++++++++++++++
sc/inc/scitems.hxx | 5 +++++
sc/source/filter/dif/difexp.cxx | 3 ---
sc/source/filter/dif/difimp.cxx | 4 ----
sc/source/filter/ftools/fapihelper.cxx | 3 ---
sc/source/filter/ftools/fprogressbar.cxx | 1 -
sc/source/filter/ftools/ftools.cxx | 2 --
sc/source/filter/html/htmlexp.cxx | 7 -------
sc/source/filter/html/htmlexp2.cxx | 4 ----
sc/source/filter/html/htmlimp.cxx | 4 +---
sc/source/filter/html/htmlpars.cxx | 4 ----
sc/source/filter/inc/dif.hxx | 1 +
sc/source/filter/inc/fprogressbar.hxx | 2 +-
sc/source/filter/lotus/filter.cxx | 6 ------
sc/source/filter/lotus/lotattr.cxx | 2 --
sc/source/filter/lotus/lotform.cxx | 2 --
sc/source/filter/lotus/lotimpop.cxx | 6 ------
sc/source/filter/lotus/lotread.cxx | 3 ---
sc/source/filter/lotus/lotus.cxx | 1 -
sc/source/filter/lotus/memory.cxx | 2 --
sc/source/filter/lotus/op.cxx | 5 -----
sc/source/filter/lotus/tool.cxx | 5 -----
sc/source/filter/orcus/filterdetect.cxx | 3 ++-
sc/source/filter/orcus/interface.cxx | 8 --------
sc/source/filter/orcus/orcusfiltersimpl.cxx | 5 -----
sc/source/filter/orcus/xmlcontext.cxx | 5 ++---
sc/source/filter/qpro/qpro.cxx | 5 -----
sc/source/filter/qpro/qproform.cxx | 3 ---
sc/source/filter/qpro/qprostyle.cxx | 8 --------
sc/source/filter/rtf/eeimpars.cxx | 8 --------
sc/source/filter/rtf/rtfexp.cxx | 7 -------
sc/source/filter/rtf/rtfimp.cxx | 2 --
sc/source/filter/rtf/rtfparse.cxx | 5 +----
sc/source/filter/xcl97/XclExpChangeTrack.cxx | 2 --
sc/source/filter/xcl97/xcl97esc.cxx | 8 --------
sc/source/filter/xcl97/xcl97rec.cxx | 19 -------------------
36 files changed, 36 insertions(+), 147 deletions(-)
New commits:
commit 8f7c35072a6bbb33f6582c8c9a37a275c8d3cb14
Author: Gabor Kelemen <kelemen.gab...@nisz.hu>
AuthorDate: Sun Jan 20 23:42:25 2019 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Wed Jan 23 09:10:06 2019 +0100
tdf#42949 Fix IWYU warnings in sc/source/filter/*cxx
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Clean remaining cxx files in directories:
dif/ ftools/ html/ lotus/ orcus/ qpro/ rtf/ xcl97/
Change-Id: I219b61c087c07b0538b4525bf53d79f413d409c5
Reviewed-on: https://gerrit.libreoffice.org/66657
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index 68f62a5773ae..571bcd22258a 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -387,6 +387,9 @@ blacklist:
sc/source/filter/inc/formulabase.hxx:
# Needed for typedef
- com/sun/star/table/CellAddress.hpp
+ sc/source/filter/inc/fprogressbar.hxx:
+ # Avoid collision with fprogressbar.cxx checking
+ - progress.hxx
sc/source/filter/inc/ooxformulaparser.hxx:
# base class has to be a complete type
- com/sun/star/lang/XInitialization.hpp
@@ -665,6 +668,9 @@ blacklist:
sc/source/filter/xml/xmldrani.hxx:
# Complex type needs complete type
- com/sun/star/beans/PropertyValue.hpp
+ sc/source/filter/ftools/sharedformulagroups.cxx:
+ # Needed for implicit dtor
+ - tokenarray.hxx
sc/source/filter/excel/excimp8.cxx:
# base class has to be a complete type
- com/sun/star/container/XIndexContainer.hpp
@@ -688,6 +694,15 @@ blacklist:
sc/source/filter/excel/xistyle.cxx:
# Needed for direct member access
- xladdress.hxx
+ sc/source/filter/lotus/filter.cxx:
+ # Needed to avoid loplugin:unreffun error
+ - filter.hxx
+ sc/source/filter/lotus/memory.cxx
+ # Needed to avoid loplugin:unreffun error
+ - scmem.h
+ sc/source/filter/lotus/op.cxx:
+ # Needed to avoid loplugin:unreffun error
+ - op.h
sc/source/filter/oox/ooxformulaparser.cxx:
# Needed for direct member access
- com/sun/star/lang/XComponent.hpp
@@ -697,6 +712,14 @@ blacklist:
sc/source/filter/oox/worksheethelper.cxx:
# Needed for implicit dtor
- editeng/editobj.hxx
+ sc/source/filter/orcus/orcusfiltersimpl.cxx:
+ # Needed for implicit dtor
+ - tokenarray.hxx
+ # Needed for direct member access
+ - com/sun/star/task/XStatusIndicator.hpp
+ sc/source/filter/orcus/xmlcontext.cxx:
+ # Needed for implicit dtor
+ - tokenarray.hxx
sc/source/filter/xml/XMLExportIterator.cxx:
# Needed for direct member access
- com/sun/star/table/XCellRange.hpp
diff --git a/sc/inc/scitems.hxx b/sc/inc/scitems.hxx
index bd78bda629d0..d2e982d82083 100644
--- a/sc/inc/scitems.hxx
+++ b/sc/inc/scitems.hxx
@@ -44,6 +44,11 @@ class SvxULSpaceItem;
class SvxUnderlineItem;
class SvxWeightItem;
class SvxWordLineModeItem;
+class SvxShadowItem;
+class SvxHorJustifyItem;
+class SvxVerJustifyItem;
+class SvxBrushItem;
+class SvxBoxItem;
// EditEngine is not allowed to define its own ITEMID's
#define INCLUDED_EDITENG_EEITEMID_HXX
diff --git a/sc/source/filter/dif/difexp.cxx b/sc/source/filter/dif/difexp.cxx
index d7c348590d57..f4628f8f11ea 100644
--- a/sc/source/filter/dif/difexp.cxx
+++ b/sc/source/filter/dif/difexp.cxx
@@ -17,10 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <rtl/math.hxx>
-
#include <dif.hxx>
-#include <filter.hxx>
#include <document.hxx>
#include <formulacell.hxx>
#include <globstr.hrc>
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index 86036728258e..ed71c759b184 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -17,15 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <math.h>
-
#include <svl/zforlist.hxx>
#include <osl/diagnose.h>
-#include <attrib.hxx>
#include <dif.hxx>
#include <docpool.hxx>
#include <document.hxx>
-#include <filter.hxx>
#include <fprogressbar.hxx>
#include <ftools.hxx>
#include <patattr.hxx>
diff --git a/sc/source/filter/ftools/fapihelper.cxx
b/sc/source/filter/ftools/fapihelper.cxx
index 91b8678f4ebc..91e1730c7665 100644
--- a/sc/source/filter/ftools/fapihelper.cxx
+++ b/sc/source/filter/ftools/fapihelper.cxx
@@ -27,12 +27,9 @@
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <comphelper/docpasswordhelper.hxx>
#include <comphelper/processfactory.hxx>
-#include <tools/urlobj.hxx>
-#include <rtl/strbuf.hxx>
#include <sal/log.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/docfile.hxx>
-#include <sfx2/request.hxx>
#include <sfx2/frame.hxx>
#include <sfx2/sfxsids.hrc>
#include <svl/stritem.hxx>
diff --git a/sc/source/filter/ftools/fprogressbar.cxx
b/sc/source/filter/ftools/fprogressbar.cxx
index 77bc4cf2a331..3c9f7219f8c7 100644
--- a/sc/source/filter/ftools/fprogressbar.cxx
+++ b/sc/source/filter/ftools/fprogressbar.cxx
@@ -18,7 +18,6 @@
*/
#include <fprogressbar.hxx>
-#include <global.hxx>
#include <globstr.hrc>
#include <scresid.hxx>
#include <progress.hxx>
diff --git a/sc/source/filter/ftools/ftools.cxx
b/sc/source/filter/ftools/ftools.cxx
index 1a2da9949a0d..8f9eaed44279 100644
--- a/sc/source/filter/ftools/ftools.cxx
+++ b/sc/source/filter/ftools/ftools.cxx
@@ -21,7 +21,6 @@
#include <ftools.hxx>
#include <osl/diagnose.h>
#include <osl/thread.h>
-#include <rtl/strbuf.hxx>
#include <tools/color.hxx>
#include <unotools/charclass.hxx>
#include <svl/itempool.hxx>
@@ -31,7 +30,6 @@
#include <math.h>
#include <global.hxx>
-#include <document.hxx>
#include <stlpool.hxx>
#include <stlsheet.hxx>
#include <compiler.hxx>
diff --git a/sc/source/filter/html/htmlexp.cxx
b/sc/source/filter/html/htmlexp.cxx
index ce6fd53b399e..f669074ba372 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -20,10 +20,7 @@
#include <scitems.hxx>
#include <editeng/eeitem.hxx>
-#include <rtl/tencinfo.h>
-
#include <vcl/svapp.hxx>
-#include <svx/algitem.hxx>
#include <editeng/boxitem.hxx>
#include <editeng/brushitem.hxx>
#include <editeng/colritem.hxx>
@@ -40,9 +37,7 @@
#include <sfx2/docfile.hxx>
#include <sfx2/frmhtmlw.hxx>
#include <sfx2/objsh.hxx>
-#include <svl/stritem.hxx>
#include <svl/urihelper.hxx>
-#include <svl/zforlist.hxx>
#include <svtools/htmlkywd.hxx>
#include <svtools/htmlout.hxx>
#include <svtools/parhtml.hxx>
@@ -51,7 +46,6 @@
#include <osl/diagnose.h>
#include <htmlexp.hxx>
-#include <filter.hxx>
#include <global.hxx>
#include <postit.hxx>
#include <document.hxx>
@@ -68,7 +62,6 @@
#include <editeng/flditem.hxx>
#include <editeng/borderline.hxx>
-#include <unotools/syslocale.hxx>
// Without strings.hrc: error C2679: binary '=' : no operator defined which
takes a
// right-hand operand of type 'const class String (__stdcall *)(class ScResId)'
diff --git a/sc/source/filter/html/htmlexp2.cxx
b/sc/source/filter/html/htmlexp2.cxx
index d8cc0e371e1e..85299789c6f5 100644
--- a/sc/source/filter/html/htmlexp2.cxx
+++ b/sc/source/filter/html/htmlexp2.cxx
@@ -23,11 +23,8 @@
#include <svx/svdpage.hxx>
#include <svx/xoutbmp.hxx>
#include <svx/svdxcgv.hxx>
-#include <sot/exchange.hxx>
#include <svtools/htmlkywd.hxx>
#include <svtools/htmlout.hxx>
-#include <vcl/transfer.hxx>
-#include <svtools/embedtransfer.hxx>
#include <svl/urihelper.hxx>
#include <tools/urlobj.hxx>
@@ -35,7 +32,6 @@
#include <global.hxx>
#include <document.hxx>
#include <drwlayer.hxx>
-#include <ftools.hxx>
#include <rtl/strbuf.hxx>
using namespace com::sun::star;
diff --git a/sc/source/filter/html/htmlimp.cxx
b/sc/source/filter/html/htmlimp.cxx
index b3a7bcdc7913..99ec1308bf04 100644
--- a/sc/source/filter/html/htmlimp.cxx
+++ b/sc/source/filter/html/htmlimp.cxx
@@ -19,8 +19,6 @@
#include <scitems.hxx>
#include <osl/diagnose.h>
-#include <comphelper/string.hxx>
-#include <editeng/eeitem.hxx>
#include <unotools/charclass.hxx>
#include <editeng/lrspitem.hxx>
@@ -39,7 +37,7 @@
#include <editutil.hxx>
#include <stlpool.hxx>
#include <stlsheet.hxx>
-#include <compiler.hxx>
+#include <refdata.hxx>
#include <rangenam.hxx>
#include <attrib.hxx>
#include <ftools.hxx>
diff --git a/sc/source/filter/html/htmlpars.cxx
b/sc/source/filter/html/htmlpars.cxx
index a7d14a5fdb85..eb6136b89cbd 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -23,10 +23,8 @@
#include <comphelper/string.hxx>
#include <scitems.hxx>
-#include <editeng/eeitem.hxx>
#include <svtools/htmlcfg.hxx>
-#include <svx/algitem.hxx>
#include <editeng/colritem.hxx>
#include <editeng/brushitem.hxx>
#include <editeng/editeng.hxx>
@@ -44,11 +42,9 @@
#include <svtools/parhtml.hxx>
#include <svtools/htmlkywd.hxx>
#include <svtools/htmltokn.h>
-#include <sfx2/docfile.hxx>
#include <vcl/svapp.hxx>
#include <tools/urlobj.hxx>
-#include <tools/tenccvt.hxx>
#include <osl/diagnose.h>
#include <rtl/tencinfo.h>
diff --git a/sc/source/filter/inc/dif.hxx b/sc/source/filter/inc/dif.hxx
index d01e281a46f7..33524d1a4067 100644
--- a/sc/source/filter/inc/dif.hxx
+++ b/sc/source/filter/inc/dif.hxx
@@ -25,6 +25,7 @@
#include <vector>
#include <rtl/ustring.hxx>
+#include <rtl/ustrbuf.hxx>
#include <types.hxx>
diff --git a/sc/source/filter/inc/fprogressbar.hxx
b/sc/source/filter/inc/fprogressbar.hxx
index 42a4b50a1482..0d80b3f686fc 100644
--- a/sc/source/filter/inc/fprogressbar.hxx
+++ b/sc/source/filter/inc/fprogressbar.hxx
@@ -23,9 +23,9 @@
#include <vector>
#include <memory>
#include <rtl/ustring.hxx>
+#include <progress.hxx>
class SfxObjectShell;
-class ScProgress;
class SvStream;
const sal_Int32 SCF_INV_SEGMENT = -1;
diff --git a/sc/source/filter/lotus/filter.cxx
b/sc/source/filter/lotus/filter.cxx
index b769931e8aa9..9746a6807a93 100644
--- a/sc/source/filter/lotus/filter.cxx
+++ b/sc/source/filter/lotus/filter.cxx
@@ -19,23 +19,17 @@
// Discover WKS, WK1 and WK3; s.a op.cpp
-#include <string.h>
#include <map>
#include <filter.hxx>
#include <document.hxx>
-#include <compiler.hxx>
#include <scerrors.hxx>
-#include <root.hxx>
-#include <lotrange.hxx>
#include <optab.h>
#include <op.h>
#include <scmem.h>
#include <decl.h>
-#include <tool.h>
#include <fprogressbar.hxx>
-#include <patattr.hxx>
#include "lotfilter.hxx"
#include <tools/stream.hxx>
diff --git a/sc/source/filter/lotus/lotattr.cxx
b/sc/source/filter/lotus/lotattr.cxx
index e07fe8a72292..8c04bfe18ff3 100644
--- a/sc/source/filter/lotus/lotattr.cxx
+++ b/sc/source/filter/lotus/lotattr.cxx
@@ -24,10 +24,8 @@
#include <editeng/brushitem.hxx>
#include <editeng/colritem.hxx>
#include <editeng/justifyitem.hxx>
-#include <svx/algitem.hxx>
#include <sal/log.hxx>
-#include <attrib.hxx>
#include <docpool.hxx>
#include <document.hxx>
#include <lotfntbf.hxx>
diff --git a/sc/source/filter/lotus/lotform.cxx
b/sc/source/filter/lotus/lotform.cxx
index 981a72ce272a..1da11ec9305f 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -19,7 +19,6 @@
#include <decl.h>
#include <lotform.hxx>
-#include <compiler.hxx>
#include "lotfilter.hxx"
#include <lotrange.hxx>
#include <namebuff.hxx>
@@ -27,7 +26,6 @@
#include <ftools.hxx>
#include <tool.h>
-#include <math.h>
#include <comphelper/string.hxx>
#include <sal/log.hxx>
#include <memory>
diff --git a/sc/source/filter/lotus/lotimpop.cxx
b/sc/source/filter/lotus/lotimpop.cxx
index 89885e7678d7..266dc881d317 100644
--- a/sc/source/filter/lotus/lotimpop.cxx
+++ b/sc/source/filter/lotus/lotimpop.cxx
@@ -22,13 +22,8 @@
#include <osl/mutex.hxx>
#include <sal/log.hxx>
-#include <attrib.hxx>
#include <document.hxx>
-#include <rangenam.hxx>
#include <formulacell.hxx>
-#include <patattr.hxx>
-#include <docpool.hxx>
-#include <compiler.hxx>
#include <global.hxx>
#include <root.hxx>
@@ -36,7 +31,6 @@
#include <lotform.hxx>
#include <tool.h>
#include <namebuff.hxx>
-#include <lotrange.hxx>
#include <lotattr.hxx>
#include <stringutil.hxx>
diff --git a/sc/source/filter/lotus/lotread.cxx
b/sc/source/filter/lotus/lotread.cxx
index 155e265a6f4b..dab87db2866b 100644
--- a/sc/source/filter/lotus/lotread.cxx
+++ b/sc/source/filter/lotus/lotread.cxx
@@ -26,13 +26,10 @@
#include "lotfilter.hxx"
#include <lotimpop.hxx>
#include <lotattr.hxx>
-#include <testlotus.hxx>
#include <fprogressbar.hxx>
#include <sal/log.hxx>
-class ScFormulaCell;
-
ErrCode ImportLotus::parse()
{
enum STATE
diff --git a/sc/source/filter/lotus/lotus.cxx b/sc/source/filter/lotus/lotus.cxx
index ccaf439abcf7..5b7260434343 100644
--- a/sc/source/filter/lotus/lotus.cxx
+++ b/sc/source/filter/lotus/lotus.cxx
@@ -27,7 +27,6 @@
#include <root.hxx>
#include <filtopt.hxx>
#include <ftools.hxx>
-#include <patattr.hxx>
ErrCode ScFormatFilterPluginImpl::ScImportLotus123( SfxMedium& rMedium,
ScDocument* pDocument, rtl_TextEncoding eSrc )
{
diff --git a/sc/source/filter/lotus/memory.cxx
b/sc/source/filter/lotus/memory.cxx
index b9fee11d8349..83851d93c4ba 100644
--- a/sc/source/filter/lotus/memory.cxx
+++ b/sc/source/filter/lotus/memory.cxx
@@ -22,9 +22,7 @@
#include <scitems.hxx>
#include <scmem.h>
-#include <svx/algitem.hxx>
#include <editeng/justifyitem.hxx>
-#include <attrib.hxx>
#include "lotfilter.hxx"
#include <tool.h>
#include <editeng/svxenum.hxx>
diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx
index 63a408eb0644..1cd43ef1b376 100644
--- a/sc/source/filter/lotus/op.cxx
+++ b/sc/source/filter/lotus/op.cxx
@@ -21,13 +21,10 @@
#include <rtl/character.hxx>
#include <string.h>
-#include <math.h>
-#include <stdlib.h>
#include <scitems.hxx>
#include <patattr.hxx>
#include <docpool.hxx>
-#include <svx/algitem.hxx>
#include <editeng/postitem.hxx>
#include <editeng/udlnitem.hxx>
#include <editeng/wghtitem.hxx>
@@ -35,14 +32,12 @@
#include <unotools/configmgr.hxx>
#include <formulacell.hxx>
-#include <rangenam.hxx>
#include <document.hxx>
#include <postit.hxx>
#include <op.h>
#include <optab.h>
#include <tool.h>
-#include <decl.h>
#include "lotfilter.hxx"
#include <lotform.hxx>
#include <lotrange.hxx>
diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx
index 1d9b84ab86a0..b7082fcff900 100644
--- a/sc/source/filter/lotus/tool.cxx
+++ b/sc/source/filter/lotus/tool.cxx
@@ -18,22 +18,17 @@
*/
#include <scitems.hxx>
-#include <svx/algitem.hxx>
#include <editeng/justifyitem.hxx>
#include <svl/zforlist.hxx>
#include <sal/log.hxx>
#include <attrib.hxx>
-#include <rangenam.hxx>
-#include <compiler.hxx>
#include <document.hxx>
#include <tool.h>
-#include <decl.h>
#include <root.hxx>
#include <lotrange.hxx>
#include <namebuff.hxx>
-#include <ftools.hxx>
#include <stringutil.hxx>
#include <tokenarray.hxx>
#include "lotfilter.hxx"
diff --git a/sc/source/filter/orcus/filterdetect.cxx
b/sc/source/filter/orcus/filterdetect.cxx
index 32bac167063f..a9b064b01fbb 100644
--- a/sc/source/filter/orcus/filterdetect.cxx
+++ b/sc/source/filter/orcus/filterdetect.cxx
@@ -9,7 +9,6 @@
#include <com/sun/star/document/XExtendedFilterDetection.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/io/XInputStream.hpp>
#include <cppuhelper/implbase.hxx>
@@ -19,6 +18,8 @@
#include <orcus/format_detection.hpp>
+namespace com { namespace sun { namespace star { namespace uno { class
XComponentContext; } } } }
+
namespace {
class OrcusFormatDetect : public ::cppu::WeakImplHelper<
diff --git a/sc/source/filter/orcus/interface.cxx
b/sc/source/filter/orcus/interface.cxx
index e484666ee768..58208643b2f8 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -15,11 +15,9 @@
#include <rangenam.hxx>
#include <tokenarray.hxx>
#include <globalnames.hxx>
-#include <docoptio.hxx>
#include <globstr.hrc>
#include <scresid.hxx>
#include <compiler.hxx>
-#include <dbdata.hxx>
#include <stlpool.hxx>
#include <scitems.hxx>
#include <patattr.hxx>
@@ -33,24 +31,18 @@
#include <editeng/udlnitem.hxx>
#include <editeng/boxitem.hxx>
#include <editeng/borderline.hxx>
-#include <editeng/charhiddenitem.hxx>
-#include <editeng/protitem.hxx>
-#include <editeng/prntitem.hxx>
#include <editeng/fontitem.hxx>
#include <editeng/fhgtitem.hxx>
#include <editeng/lineitem.hxx>
#include <editeng/crossedoutitem.hxx>
#include <editeng/justifyitem.hxx>
-#include <formula/token.hxx>
-#include <tools/datetime.hxx>
#include <svl/sharedstringpool.hxx>
#include <o3tl/make_unique.hxx>
#include <svl/zforlist.hxx>
#include <svl/intitem.hxx>
#include <com/sun/star/task/XStatusIndicator.hpp>
#include <i18nlangtag/lang.h>
-#include <vcl/outdev.hxx>
#include <tools/fontenum.hxx>
#include <sal/log.hxx>
diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx
b/sc/source/filter/orcus/orcusfiltersimpl.cxx
index b3451b1352e4..cdfb70d71c1b 100644
--- a/sc/source/filter/orcus/orcusfiltersimpl.cxx
+++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx
@@ -11,25 +11,20 @@
#include <orcusinterface.hxx>
#include <tokenarray.hxx>
-#include <document.hxx>
-
#include <tools/urlobj.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/frame.hxx>
#include <sfx2/sfxsids.hrc>
#include <svl/itemset.hxx>
-#include <rtl/bootstrap.hxx>
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
-#include <orcus/spreadsheet/import_interface.hpp>
#include <orcus/orcus_csv.hpp>
#include <orcus/orcus_gnumeric.hpp>
#include <orcus/orcus_xlsx.hpp>
#include <orcus/orcus_xls_xml.hpp>
#include <orcus/orcus_ods.hpp>
#include <orcus/orcus_import_ods.hpp>
-#include <orcus/global.hpp>
#include <orcus/stream.hpp>
#include <com/sun/star/task/XStatusIndicator.hpp>
diff --git a/sc/source/filter/orcus/xmlcontext.cxx
b/sc/source/filter/orcus/xmlcontext.cxx
index 62ac11817a57..c9fa56f516a4 100644
--- a/sc/source/filter/orcus/xmlcontext.cxx
+++ b/sc/source/filter/orcus/xmlcontext.cxx
@@ -19,21 +19,20 @@
#include <o3tl/make_unique.hxx>
#include <sal/log.hxx>
-#include <orcus/spreadsheet/import_interface.hpp>
#include <orcus/xml_structure_tree.hpp>
#include <orcus/xml_namespace.hpp>
#include <orcus/orcus_xml.hpp>
-#include <orcus/global.hpp>
#include <orcus/sax_parser_base.hpp>
#include <orcus/stream.hpp>
#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <comphelper/processfactory.hxx>
#include <string>
#include <sstream>
+namespace com { namespace sun { namespace star { namespace ucb { class
XCommandEnvironment; } } } }
+
#define BUFFER_SIZE 4096
using namespace com::sun::star;
diff --git a/sc/source/filter/qpro/qpro.cxx b/sc/source/filter/qpro/qpro.cxx
index 27bde38f9d51..936d83e75047 100644
--- a/sc/source/filter/qpro/qpro.cxx
+++ b/sc/source/filter/qpro/qpro.cxx
@@ -19,17 +19,12 @@
#include <sal/config.h>
#include <sal/log.hxx>
-#include <sfx2/docfile.hxx>
#include <qproform.hxx>
#include <qpro.hxx>
#include <qprostyle.hxx>
-#include <global.hxx>
#include <scerrors.hxx>
-#include <docpool.hxx>
-#include <patattr.hxx>
-#include <filter.hxx>
#include <ftools.hxx>
#include <document.hxx>
#include <formulacell.hxx>
diff --git a/sc/source/filter/qpro/qproform.cxx
b/sc/source/filter/qpro/qproform.cxx
index 73a51c2db404..bd1ea7fc092a 100644
--- a/sc/source/filter/qpro/qproform.cxx
+++ b/sc/source/filter/qpro/qproform.cxx
@@ -21,13 +21,10 @@
#include <sal/config.h>
#include <sal/macros.h>
#include <sal/log.hxx>
-#include <qpro.hxx>
#include <qproform.hxx>
#include <formel.hxx>
-#include <compiler.hxx>
#include <tokstack.hxx>
-#include <ftools.hxx>
void QProToSc::ReadSRD( ScSingleRefData& rSRD, sal_Int8 nPage, sal_Int8 nCol,
sal_uInt16 nRelBit )
{
diff --git a/sc/source/filter/qpro/qprostyle.cxx
b/sc/source/filter/qpro/qprostyle.cxx
index f77aa9f38ef3..4a309b9eec54 100644
--- a/sc/source/filter/qpro/qprostyle.cxx
+++ b/sc/source/filter/qpro/qprostyle.cxx
@@ -18,10 +18,7 @@
*/
#include <sal/config.h>
-#include <sfx2/docfile.hxx>
-#include <qproform.hxx>
-#include <qpro.hxx>
#include <qprostyle.hxx>
#include <scitems.hxx>
@@ -29,19 +26,14 @@
#include <editeng/udlnitem.hxx>
#include <editeng/wghtitem.hxx>
#include <editeng/postitem.hxx>
-#include <editeng/crossedoutitem.hxx>
#include <editeng/fhgtitem.hxx>
#include <editeng/fontitem.hxx>
#include <editeng/justifyitem.hxx>
-#include <map>
#include <global.hxx>
-#include <scerrors.hxx>
#include <docpool.hxx>
#include <patattr.hxx>
-#include <filter.hxx>
#include <document.hxx>
-#include <formulacell.hxx>
ScQProStyle::ScQProStyle()
{
diff --git a/sc/source/filter/rtf/eeimpars.cxx
b/sc/source/filter/rtf/eeimpars.cxx
index 0cfc8456cd97..c579b8956bcf 100644
--- a/sc/source/filter/rtf/eeimpars.cxx
+++ b/sc/source/filter/rtf/eeimpars.cxx
@@ -22,22 +22,15 @@
#include <editeng/adjustitem.hxx>
#include <editeng/editobj.hxx>
-#include <editeng/editview.hxx>
#include <editeng/escapementitem.hxx>
-#include <editeng/justifyitem.hxx>
#include <editeng/langitem.hxx>
-#include <editeng/shaditem.hxx>
#include <svx/svdograf.hxx>
#include <svx/svdpage.hxx>
-#include <editeng/scripttypeitem.hxx>
#include <svtools/htmlcfg.hxx>
#include <sfx2/sfxhtml.hxx>
-#include <svtools/parhtml.hxx>
-#include <svtools/htmltokn.h>
#include <svl/zforlist.hxx>
#include <vcl/virdev.hxx>
#include <vcl/svapp.hxx>
-#include <unotools/syslocale.hxx>
#include <unotools/charclass.hxx>
#include <comphelper/string.hxx>
@@ -45,7 +38,6 @@
#include <global.hxx>
#include <document.hxx>
#include <editutil.hxx>
-#include <stlsheet.hxx>
#include <docpool.hxx>
#include <attrib.hxx>
#include <patattr.hxx>
diff --git a/sc/source/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx
index 22cd382bd593..22570bb1d10b 100644
--- a/sc/source/filter/rtf/rtfexp.cxx
+++ b/sc/source/filter/rtf/rtfexp.cxx
@@ -18,28 +18,21 @@
*/
#include <scitems.hxx>
-#include <editeng/eeitem.hxx>
-#include <svx/algitem.hxx>
#include <editeng/wghtitem.hxx>
#include <editeng/postitem.hxx>
#include <editeng/udlnitem.hxx>
-#include <editeng/fontitem.hxx>
-#include <editeng/fhgtitem.hxx>
#include <editeng/justifyitem.hxx>
-#include <svl/style.hxx>
#include <svtools/rtfout.hxx>
#include <svtools/rtfkeywd.hxx>
#include <rtfexp.hxx>
-#include <filter.hxx>
#include <cellvalue.hxx>
#include <document.hxx>
#include <patattr.hxx>
#include <attrib.hxx>
#include <cellform.hxx>
#include <editutil.hxx>
-#include <stlpool.hxx>
#include <ftools.hxx>
void ScFormatFilterPluginImpl::ScExportRTF( SvStream& rStrm, ScDocument* pDoc,
diff --git a/sc/source/filter/rtf/rtfimp.cxx b/sc/source/filter/rtf/rtfimp.cxx
index ebe1a1cf9d50..e48c87da020f 100644
--- a/sc/source/filter/rtf/rtfimp.cxx
+++ b/sc/source/filter/rtf/rtfimp.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <global.hxx>
-#include <document.hxx>
#include <filter.hxx>
#include <editutil.hxx>
#include <rtfimp.hxx>
diff --git a/sc/source/filter/rtf/rtfparse.cxx
b/sc/source/filter/rtf/rtfparse.cxx
index 47be06d9d8ed..7579f50c4624 100644
--- a/sc/source/filter/rtf/rtfparse.cxx
+++ b/sc/source/filter/rtf/rtfparse.cxx
@@ -23,15 +23,12 @@
#include <editeng/editeng.hxx>
#include <editeng/fhgtitem.hxx>
#include <editeng/svxrtf.hxx>
-#include <editeng/shaditem.hxx>
#include <vcl/outdev.hxx>
#include <svtools/rtftoken.h>
#include <osl/diagnose.h>
+#include <svl/itempool.hxx>
#include <rtfparse.hxx>
-#include <global.hxx>
-#include <document.hxx>
-#include <docpool.hxx>
#define SC_RTFTWIPTOL 10 // 10 Twips tolerance when determining columns
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index 5affec70ed40..d5c4ef0e421b 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -26,7 +26,6 @@
#include <xehelper.hxx>
#include <xltools.hxx>
#include <formulacell.hxx>
-#include <xcl97rec.hxx>
#include <document.hxx>
#include <editutil.hxx>
#include <root.hxx>
@@ -34,7 +33,6 @@
#include <oox/export/utils.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
-#include <rtl/strbuf.hxx>
#include <rtl/uuid.h>
#include <svl/sharedstring.hxx>
diff --git a/sc/source/filter/xcl97/xcl97esc.cxx
b/sc/source/filter/xcl97/xcl97esc.cxx
index 028b338bd1d5..9844e7bc72d6 100644
--- a/sc/source/filter/xcl97/xcl97esc.cxx
+++ b/sc/source/filter/xcl97/xcl97esc.cxx
@@ -21,19 +21,15 @@
#include <com/sun/star/awt/XControlModel.hpp>
#include <com/sun/star/embed/XClassifiedObject.hpp>
#include <com/sun/star/form/XFormsSupplier.hpp>
-#include <com/sun/star/script/ScriptEventDescriptor.hpp>
#include <com/sun/star/script/XEventAttacherManager.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <svx/svdpage.hxx>
-#include <editeng/outlobj.hxx>
#include <o3tl/make_unique.hxx>
#include <svx/svdotext.hxx>
#include <svx/svdobj.hxx>
#include <svx/svdoole2.hxx>
#include <svx/unoapi.hxx>
-#include <svx/fmglob.hxx>
-#include <vcl/outdev.hxx>
#include <unotools/tempfile.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <svx/sdasitm.hxx>
@@ -44,15 +40,11 @@
#include <sot/storage.hxx>
#include <xeescher.hxx>
-#include <global.hxx>
-#include <document.hxx>
#include <drwlayer.hxx>
#include <xecontent.hxx>
#include <editeng/flditem.hxx>
#include <userdat.hxx>
#include <xcl97rec.hxx>
-#include <xehelper.hxx>
-#include <xechart.hxx>
#include <xcl97esc.hxx>
#include <unotools/streamwrap.hxx>
#include <oox/ole/olehelper.hxx>
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx
b/sc/source/filter/xcl97/xcl97rec.cxx
index 6623f44d0791..6f44099f08e9 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -17,45 +17,31 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <svx/svdpool.hxx>
#include <svx/sdtaitm.hxx>
#include <svx/svdotext.hxx>
#include <editeng/editobj.hxx>
#include <svx/svdoole2.hxx>
#include <sot/storage.hxx>
#include <svl/itemset.hxx>
-#include <svx/svdpage.hxx>
#include <svx/svdocapt.hxx>
#include <svx/unoapi.hxx>
#include <editeng/writingmodeitem.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
#include <tools/urlobj.hxx>
#include <rtl/math.hxx>
#include <rtl/uuid.h>
#include <sal/log.hxx>
-#include <svl/zformat.hxx>
-#include <formulacell.hxx>
#include <drwlayer.hxx>
#include <root.hxx>
#include <xcl97rec.hxx>
#include <xcl97esc.hxx>
-#include <editutil.hxx>
-#include <xecontent.hxx>
#include <xeescher.hxx>
-#include <xestyle.hxx>
#include <xehelper.hxx>
#include <xelink.hxx>
#include <xlcontent.hxx>
-#include <scitems.hxx>
-
#include <unotools/fltrcfg.hxx>
-#include <editeng/brushitem.hxx>
-#include <editeng/boxitem.hxx>
-#include <editeng/frmdiritem.hxx>
#include <editeng/adjustitem.hxx>
#include <editeng/eeitem.hxx>
#include <filter/msfilter/msoleexp.hxx>
@@ -65,13 +51,8 @@
#include <stdio.h>
#include <document.hxx>
-#include <conditio.hxx>
#include <rangelst.hxx>
-#include <stlpool.hxx>
-#include <viewopti.hxx>
-#include <scextopt.hxx>
#include <docoptio.hxx>
-#include <patattr.hxx>
#include <tabprotection.hxx>
#include <com/sun/star/embed/Aspects.hpp>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
