diff options
author | Gabor Kelemen <kelemeng@ubuntu.com> | 2018-05-08 21:54:05 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-05-10 14:18:17 +0200 |
commit | 7cee480efe22d48af9e9d96b49ad4358a4010690 (patch) | |
tree | f11166eb81b31657b9979b6fd0847f226b4d8526 /sc | |
parent | 9992338fbbf46bf381501df6c7763bf117d2ee25 (diff) |
tdf#42949 Fix IWYU warnings in sc/inc/d*
Found with bin/find-unneeded-includes
Mostly removal proposals are dealt with here
and a few trivial substitutions in small headers
Change-Id: Ic4b2e48f1e55fc5d10e3dab16cfee1e358a8e917
Reviewed-on: https://gerrit.libreoffice.org/54005
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/IwyuFilter_sc.yaml | 46 | ||||
-rw-r--r-- | sc/inc/datamapper.hxx | 1 | ||||
-rw-r--r-- | sc/inc/dbdata.hxx | 1 | ||||
-rw-r--r-- | sc/inc/dbdocutl.hxx | 3 | ||||
-rw-r--r-- | sc/inc/defaultsoptions.hxx | 3 | ||||
-rw-r--r-- | sc/inc/detfunc.hxx | 3 | ||||
-rw-r--r-- | sc/inc/dociter.hxx | 2 | ||||
-rw-r--r-- | sc/inc/docparam.hxx | 3 | ||||
-rw-r--r-- | sc/inc/documentimport.hxx | 1 | ||||
-rw-r--r-- | sc/inc/documentlinkmgr.hxx | 1 | ||||
-rw-r--r-- | sc/inc/dpcache.hxx | 2 | ||||
-rw-r--r-- | sc/inc/dpfilteredcache.hxx | 6 | ||||
-rw-r--r-- | sc/inc/dpobject.hxx | 2 | ||||
-rw-r--r-- | sc/inc/dpoutput.hxx | 1 | ||||
-rw-r--r-- | sc/inc/dpoutputgeometry.hxx | 2 | ||||
-rw-r--r-- | sc/inc/dpsave.hxx | 1 | ||||
-rw-r--r-- | sc/inc/dpsdbtab.hxx | 1 | ||||
-rw-r--r-- | sc/inc/dpshttab.hxx | 1 | ||||
-rw-r--r-- | sc/inc/dptabdat.hxx | 4 | ||||
-rw-r--r-- | sc/inc/dptabres.hxx | 3 | ||||
-rw-r--r-- | sc/inc/dptabsrc.hxx | 4 | ||||
-rw-r--r-- | sc/inc/dputil.hxx | 2 | ||||
-rw-r--r-- | sc/inc/drwlayer.hxx | 3 |
23 files changed, 51 insertions, 45 deletions
diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml index 668002dbd66b..6ee741af0c80 100644 --- a/sc/IwyuFilter_sc.yaml +++ b/sc/IwyuFilter_sc.yaml @@ -77,3 +77,49 @@ blacklist: sc/inc/convuno.hxx: # base class has to be a complete type - com/sun/star/lang/Locale.hpp + sc/inc/dbdocutl.hxx: + # base class has to be a complete type + - com/sun/star/uno/Reference.hxx + sc/inc/defltuno.hxx: + # base class has to be a complete type + - com/sun/star/beans/XPropertySet.hpp + - com/sun/star/beans/XPropertyState.hpp + - com/sun/star/lang/XServiceInfo.hpp + sc/inc/dispuno.hxx: + # base class has to be a complete type + - com/sun/star/frame/XDispatchProviderInterceptor.hpp + - com/sun/star/view/XSelectionChangeListener.hpp + sc/inc/dpglobal.hxx: + # base class has to be a complete type + - o3tl/typed_flags_set.hxx + sc/inc/dpoutput.hxx: + # base class has to be a complete type + - com/sun/star/sheet/DataResult.hpp + - com/sun/star/sheet/MemberResult.hpp + - com/sun/star/sheet/XDimensionsSupplier.hpp + sc/inc/dpobject.hxx: + # base class has to be a complete type + - com/sun/star/sheet/XDimensionsSupplier.hpp + sc/inc/dpsave.hxx: + # base class has to be a complete type + - com/sun/star/sheet/XDimensionsSupplier.hpp + sc/inc/dptabres.hxx: + # base class has to be a complete type + - com/sun/star/sheet/DataResult.hpp + - com/sun/star/sheet/MemberResult.hpp + - com/sun/star/uno/Sequence.hxx + sc/inc/dptabsrc.hxx: + # base class has to be a complete type + - com/sun/star/beans/XPropertySet.hpp + - com/sun/star/container/XNamed.hpp + - com/sun/star/lang/XServiceInfo.hpp + - com/sun/star/sheet/MemberResult.hpp + - com/sun/star/sheet/XDataPilotMemberResults.hpp + - com/sun/star/sheet/XDataPilotResults.hpp + - com/sun/star/sheet/XDimensionsSupplier.hpp + - com/sun/star/sheet/XDrillDownDataSupplier.hpp + - com/sun/star/sheet/XHierarchiesSupplier.hpp + - com/sun/star/sheet/XLevelsSupplier.hpp + - com/sun/star/sheet/XMembersSupplier.hpp + - com/sun/star/util/XCloneable.hpp + - com/sun/star/util/XRefreshable.hpp diff --git a/sc/inc/datamapper.hxx b/sc/inc/datamapper.hxx index b935e2ac36cc..75b04440153e 100644 --- a/sc/inc/datamapper.hxx +++ b/sc/inc/datamapper.hxx @@ -10,7 +10,6 @@ #ifndef INCLUDED_SC_INC_EXTERNALDATAMAPPER_HXX #define INCLUDED_SC_INC_EXTERNALDATAMAPPER_HXX -#include <memory> #include <vector> #include "scdllapi.h" diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx index 7752693765a1..4523bb64c206 100644 --- a/sc/inc/dbdata.hxx +++ b/sc/inc/dbdata.hxx @@ -36,7 +36,6 @@ class ScDocument; struct ScSortParam; struct ScQueryParam; struct ScSubTotalParam; -struct ScImportParam; /** Enum used to indicate which portion of the DBArea is to be considered. */ enum class ScDBDataPortion diff --git a/sc/inc/dbdocutl.hxx b/sc/inc/dbdocutl.hxx index deddb108b4a4..c6949ab61a2e 100644 --- a/sc/inc/dbdocutl.hxx +++ b/sc/inc/dbdocutl.hxx @@ -20,8 +20,9 @@ #ifndef INCLUDED_SC_INC_DBDOCUTL_HXX #define INCLUDED_SC_INC_DBDOCUTL_HXX -#include "address.hxx" #include <com/sun/star/uno/Reference.hxx> +#include "types.hxx" +#include <sal/types.h> class ScDocument; diff --git a/sc/inc/defaultsoptions.hxx b/sc/inc/defaultsoptions.hxx index 7e9f7604f991..81c5fe2babd4 100644 --- a/sc/inc/defaultsoptions.hxx +++ b/sc/inc/defaultsoptions.hxx @@ -12,9 +12,8 @@ #include <svl/poolitem.hxx> #include <unotools/configitem.hxx> -#include <formula/grammar.hxx> #include "scdllapi.h" -#include "global.hxx" +#include "types.hxx" class SC_DLLPUBLIC ScDefaultsOptions { diff --git a/sc/inc/detfunc.hxx b/sc/inc/detfunc.hxx index 41a47effbb95..a91871560445 100644 --- a/sc/inc/detfunc.hxx +++ b/sc/inc/detfunc.hxx @@ -24,7 +24,6 @@ #include <tools/gen.hxx> #include <tools/color.hxx> #include "scdllapi.h" -#include "token.hxx" #include <vector> @@ -32,8 +31,6 @@ class SdrObject; class ScDetectiveData; class ScDocument; -class ScAddress; -class ScRange; #define SC_DET_MAXCIRCLE 1000 diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx index 915f478f4bfa..ac76f7412a9a 100644 --- a/sc/inc/dociter.hxx +++ b/sc/inc/dociter.hxx @@ -22,7 +22,6 @@ #include "address.hxx" #include "formulagroup.hxx" -#include <tools/solar.h> #include "global.hxx" #include "scdllapi.h" #include "cellvalue.hxx" @@ -37,7 +36,6 @@ class ScDocument; class ScPatternAttr; class ScAttrArray; class ScAttrIterator; -class ScRange; class ScFlatBoolRowSegments; class ScMatrix; struct ScDBQueryParamBase; diff --git a/sc/inc/docparam.hxx b/sc/inc/docparam.hxx index fc0373a9a8e9..0f29b86121f9 100644 --- a/sc/inc/docparam.hxx +++ b/sc/inc/docparam.hxx @@ -10,7 +10,8 @@ #ifndef INCLUDED_SC_INC_DOCPARAM_HXX #define INCLUDED_SC_INC_DOCPARAM_HXX -#include "address.hxx" +#include <sal/types.h> // for sal_uInt32 +#include "types.hxx" // for SCROW // Let's put here misc structures that get passed to ScDocument's methods. diff --git a/sc/inc/documentimport.hxx b/sc/inc/documentimport.hxx index 917b2398bfbb..f902e1858741 100644 --- a/sc/inc/documentimport.hxx +++ b/sc/inc/documentimport.hxx @@ -21,7 +21,6 @@ class EditTextObject; class ScDocument; class ScColumn; -class ScAddress; struct ScAttrEntry; class ScTokenArray; class ScFormulaCell; diff --git a/sc/inc/documentlinkmgr.hxx b/sc/inc/documentlinkmgr.hxx index 1fd1bc231e8d..26531245fbb8 100644 --- a/sc/inc/documentlinkmgr.hxx +++ b/sc/inc/documentlinkmgr.hxx @@ -13,7 +13,6 @@ #include <rtl/ustring.hxx> #include <memory> -class ScDocument; class SfxObjectShell; namespace weld { class Window; } diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx index 08517c167d0a..8386c1d4b3f3 100644 --- a/sc/inc/dpcache.hxx +++ b/sc/inc/dpcache.hxx @@ -22,7 +22,6 @@ #include "global.hxx" #include "dpnumgroupinfo.hxx" #include "calcmacros.hxx" -#include <tools/date.hxx> #include <mdds/flat_segment_tree.hpp> @@ -34,7 +33,6 @@ struct ScQueryParam; class ScDPObject; class ScDPItemData; -struct ScDPNumGroupInfo; enum class SvNumFormatType : sal_Int16; /** diff --git a/sc/inc/dpfilteredcache.hxx b/sc/inc/dpfilteredcache.hxx index 33205ac2dd9a..0a77d07a0705 100644 --- a/sc/inc/dpfilteredcache.hxx +++ b/sc/inc/dpfilteredcache.hxx @@ -21,21 +21,15 @@ #define INCLUDED_SC_INC_DPFILTEREDCACHE_HXX #include <sal/types.h> -#include <osl/mutex.hxx> -#include "global.hxx" #include "dpitemdata.hxx" #include "calcmacros.hxx" -#include <memory> #include <unordered_set> #include <vector> #include <mdds/flat_segment_tree.hpp> -class ScDPItemData; class ScDPCache; -class ScDocument; -class ScRange; struct ScDPValue; struct ScQueryParam; diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index 897a22a9fe47..2e02ac88eed8 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -56,10 +56,8 @@ namespace com { namespace sun { namespace star { namespace tools { class Rectangle; } class ScDPSaveData; class ScDPOutput; -struct ScPivotParam; struct ScImportSourceDesc; class ScSheetSourceDesc; -struct ScPivotField; class ScDPTableData; class ScDPDimensionSaveData; class ScRangeList; diff --git a/sc/inc/dpoutput.hxx b/sc/inc/dpoutput.hxx index defab43b4b87..0a4309ca9dcd 100644 --- a/sc/inc/dpoutput.hxx +++ b/sc/inc/dpoutput.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/sheet/DataPilotOutputRangeType.hpp> #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp> -#include "global.hxx" #include "address.hxx" #include "dpfilteredcache.hxx" diff --git a/sc/inc/dpoutputgeometry.hxx b/sc/inc/dpoutputgeometry.hxx index 872b57dd1e70..3ffb052d7454 100644 --- a/sc/inc/dpoutputgeometry.hxx +++ b/sc/inc/dpoutputgeometry.hxx @@ -23,8 +23,6 @@ #include "address.hxx" #include <vector> -class ScAddress; - class SC_DLLPUBLIC ScDPOutputGeometry { public: diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx index 5a6c20729ca7..cc8d1467fe59 100644 --- a/sc/inc/dpsave.hxx +++ b/sc/inc/dpsave.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_INC_DPSAVE_HXX #define INCLUDED_SC_INC_DPSAVE_HXX -#include <list> #include <memory> #include <vector> diff --git a/sc/inc/dpsdbtab.hxx b/sc/inc/dpsdbtab.hxx index 24658e12d21b..8c11160cf141 100644 --- a/sc/inc/dpsdbtab.hxx +++ b/sc/inc/dpsdbtab.hxx @@ -27,7 +27,6 @@ #include <unordered_set> #include <vector> -class ScDPFilteredCache; class ScDocument; class ScDPCache; class ScDPDimensionSaveData; diff --git a/sc/inc/dpshttab.hxx b/sc/inc/dpshttab.hxx index 899de85ccf13..9d2cc6e4697d 100644 --- a/sc/inc/dpshttab.hxx +++ b/sc/inc/dpshttab.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SC_INC_DPSHTTAB_HXX #include "dptabdat.hxx" -#include "global.hxx" #include "address.hxx" #include "scdllapi.h" #include "queryparam.hxx" diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx index 2c5870940b21..7b7acd022860 100644 --- a/sc/inc/dptabdat.hxx +++ b/sc/inc/dptabdat.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_INC_DPTABDAT_HXX #define INCLUDED_SC_INC_DPTABDAT_HXX -#include "address.hxx" #include "dpoutput.hxx" #include "dpfilteredcache.hxx" #include "dpcache.hxx" @@ -28,9 +27,7 @@ #include <svl/zforlist.hxx> -#include <set> #include <unordered_set> -#include <unordered_map> #include <vector> namespace com { namespace sun { namespace star { namespace sheet { @@ -56,7 +53,6 @@ class ScDPResultMember; class ScDPDimension; class ScDPLevel; class ScDPInitState; -class ScDPResultMember; class ScDocument; /** diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx index 3f2400cc9ed8..bdd64a140432 100644 --- a/sc/inc/dptabres.hxx +++ b/sc/inc/dptabres.hxx @@ -39,13 +39,10 @@ namespace com { namespace sun { namespace star { namespace sheet { struct DataPilotFieldReference; } } } } -class ScAddress; -class ScDocument; class ScDPSource; class ScDPDimension; class ScDPLevel; class ScDPMember; -class ScDPAggData; class ScDPResultMember; class ScDPResultVisibilityData; diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx index 6fe05b8a1aad..84f4513e0c09 100644 --- a/sc/inc/dptabsrc.hxx +++ b/sc/inc/dptabsrc.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_INC_DPTABSRC_HXX #define INCLUDED_SC_INC_DPTABSRC_HXX -#include "global.hxx" #include <com/sun/star/sheet/XDimensionsSupplier.hpp> #include <com/sun/star/sheet/XHierarchiesSupplier.hpp> #include <com/sun/star/sheet/XLevelsSupplier.hpp> @@ -44,10 +43,8 @@ #include <rtl/ref.hxx> #include "dptabdat.hxx" -#include "dpglobal.hxx" #include "dpresfilter.hxx" -#include <list> #include <memory> #include <unordered_map> #include <unordered_set> @@ -66,7 +63,6 @@ namespace com { namespace sun { namespace star { class ScDPResultMember; class ScDPResultData; class ScDPItemData; -class ScDPTableData; class ScDPDimensions; class ScDPDimension; class ScDPHierarchies; diff --git a/sc/inc/dputil.hxx b/sc/inc/dputil.hxx index 3f44ba57e296..b2539a159bce 100644 --- a/sc/inc/dputil.hxx +++ b/sc/inc/dputil.hxx @@ -14,8 +14,6 @@ #include "scdllapi.h" #include "global.hxx" -#include <com/sun/star/sheet/GeneralFunction.hpp> - class SvNumberFormatter; struct ScDPNumGroupInfo; enum class ScGeneralFunction; diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx index d71a408905b7..48741497ac0e 100644 --- a/sc/inc/drwlayer.hxx +++ b/sc/inc/drwlayer.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_INC_DRWLAYER_HXX #define INCLUDED_SC_INC_DRWLAYER_HXX -#include <vcl/graph.hxx> #include <svx/fmmodel.hxx> #include <svx/svdundo.hxx> #include "global.hxx" @@ -32,8 +31,6 @@ class ScIMapInfo; class ScMacroInfo; class IMapObject; class ScMarkData; -class ScRange; -class ScAddress; class ScTabDeletedHint : public SfxHint { |