diff options
author | Gabor Kelemen <kelemeng@ubuntu.com> | 2018-05-19 07:29:47 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-06-18 15:11:50 +0200 |
commit | cb9414f59eca713e1aebac0a2894e8c9412612b7 (patch) | |
tree | e5933dcf0f1fb34d5bb47c93e142e284cfd80f98 | |
parent | 80e9f9f8d8cc3e1073f98b1413bc0b80b93ec4f9 (diff) |
tdf#42949 Fix IWYU warnings in sc/inc/[Tt]*
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here
and a bit of fallout management.
Change-Id: I347377d7bb2a0cf8acda1ad28b5cc79bb954ab7d
Reviewed-on: https://gerrit.libreoffice.org/55726
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r-- | sc/IwyuFilter_sc.yaml | 33 | ||||
-rw-r--r-- | sc/inc/TablePivotChart.hxx | 1 | ||||
-rw-r--r-- | sc/inc/TablePivotCharts.hxx | 3 | ||||
-rw-r--r-- | sc/inc/tabbgcolor.hxx | 2 | ||||
-rw-r--r-- | sc/inc/table.hxx | 16 | ||||
-rw-r--r-- | sc/inc/tabopparams.hxx | 1 | ||||
-rw-r--r-- | sc/inc/tabprotection.hxx | 1 | ||||
-rw-r--r-- | sc/inc/targuno.hxx | 27 | ||||
-rw-r--r-- | sc/inc/textuno.hxx | 3 | ||||
-rw-r--r-- | sc/inc/token.hxx | 2 | ||||
-rw-r--r-- | sc/inc/tokenuno.hxx | 7 | ||||
-rw-r--r-- | sc/inc/typedstrdata.hxx | 1 | ||||
-rw-r--r-- | sc/source/core/data/document.cxx | 1 | ||||
-rw-r--r-- | sc/source/core/data/table1.cxx | 1 | ||||
-rw-r--r-- | sc/source/core/data/table2.cxx | 1 | ||||
-rw-r--r-- | sc/source/core/data/table5.cxx | 1 | ||||
-rw-r--r-- | sc/source/ui/unoobj/docuno.cxx | 1 | ||||
-rw-r--r-- | sc/source/ui/unoobj/targuno.cxx | 1 |
18 files changed, 52 insertions, 51 deletions
diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml index 03aafba301b6..166b76fbd66b 100644 --- a/sc/IwyuFilter_sc.yaml +++ b/sc/IwyuFilter_sc.yaml @@ -254,3 +254,36 @@ blacklist: - com/sun/star/lang/XUnoTunnel.hpp - com/sun/star/style/XStyle.hpp - com/sun/star/style/XStyleLoader2.hpp + sc/inc/TablePivotChart.hxx: + # base class has to be a complete type + - com/sun/star/container/XNamed.hpp + - com/sun/star/document/XEmbeddedObjectSupplier.hpp + - com/sun/star/lang/XServiceInfo.hpp + - com/sun/star/table/XTablePivotChart.hpp + sc/inc/TablePivotCharts.hxx: + # base class has to be a complete type + - com/sun/star/container/XIndexAccess.hpp + - com/sun/star/lang/XServiceInfo.hpp + - com/sun/star/table/XTablePivotCharts.hpp + sc/inc/targuno.hxx: + # base class has to be a complete type + - com/sun/star/beans/XPropertySet.hpp + - com/sun/star/container/XNameAccess.hpp + - com/sun/star/document/XLinkTargetSupplier.hpp + - com/sun/star/lang/XServiceInfo.hpp + sc/inc/textuno.hxx: + # base class has to be a complete type + - com/sun/star/lang/XServiceInfo.hpp + - com/sun/star/lang/XUnoTunnel.hpp + - com/sun/star/text/XTextFieldsSupplier.hpp + sc/inc/token.hxx: + # needed for std::shared_ptr + - memory + sc/inc/tokenuno.hxx: + # base class has to be a complete type + - com/sun/star/beans/XPropertySet.hpp + - com/sun/star/lang/XServiceInfo.hpp + - com/sun/star/sheet/XFormulaParser.hpp + sc/inc/types.hxx: + # base class has to be a complete type + - o3tl/typed_flags_set.hxx diff --git a/sc/inc/TablePivotChart.hxx b/sc/inc/TablePivotChart.hxx index dce05e711f86..b94886bcf96f 100644 --- a/sc/inc/TablePivotChart.hxx +++ b/sc/inc/TablePivotChart.hxx @@ -17,7 +17,6 @@ #include <svl/lstner.hxx> #include <cppuhelper/compbase.hxx> -#include <cppuhelper/implbase.hxx> #include "types.hxx" diff --git a/sc/inc/TablePivotCharts.hxx b/sc/inc/TablePivotCharts.hxx index f60726ee2650..b5c9deab92d6 100644 --- a/sc/inc/TablePivotCharts.hxx +++ b/sc/inc/TablePivotCharts.hxx @@ -11,13 +11,10 @@ #define INCLUDED_SC_INC_TABLEPIVOTCHARTS_HXX #include <com/sun/star/table/XTablePivotCharts.hpp> -#include <com/sun/star/document/XEmbeddedObjectSupplier.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <svl/lstner.hxx> -#include <cppuhelper/compbase.hxx> #include <cppuhelper/implbase.hxx> #include "types.hxx" diff --git a/sc/inc/tabbgcolor.hxx b/sc/inc/tabbgcolor.hxx index e93385bd2b73..872d81285201 100644 --- a/sc/inc/tabbgcolor.hxx +++ b/sc/inc/tabbgcolor.hxx @@ -21,7 +21,7 @@ #define INCLUDED_SC_INC_TABBGCOLOR_HXX #include <tools/color.hxx> -#include "address.hxx" +#include "types.hxx" #include <vector> diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index d310d998abc7..a2aa4c911b57 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -21,16 +21,12 @@ #define INCLUDED_SC_INC_TABLE_HXX #include <vector> -#include <utility> #include <tools/gen.hxx> #include <tools/color.hxx> -#include <com/sun/star/uno/Sequence.hxx> #include "attarray.hxx" #include "column.hxx" #include "colcontainer.hxx" #include "sortparam.hxx" -#include "compressedarray.hxx" -#include "postit.hxx" #include "types.hxx" #include "cellvalue.hxx" #include <formula/types.hxx> @@ -39,9 +35,11 @@ #include "document.hxx" #include <set> -#include <map> #include <memory> +template <typename A, typename D> class ScBitMaskCompressedArray; +template <typename A, typename D> class ScCompressedArray; + namespace utl { class TextSearch; } @@ -55,7 +53,6 @@ namespace com { namespace sun { namespace star { namespace formula { struct VectorRefArray; } namespace sc { -struct FormulaGroupContext; class StartListeningContext; class EndListeningContext; class CopyFromClipContext; @@ -76,8 +73,6 @@ class TableValues; class RowHeightContext; class CompileFormulaContext; struct SetFormulaDirtyContext; -class RefMovedHint; -struct ReorderParam; class ColumnIterator; } @@ -89,7 +84,6 @@ class SvxBoxItem; class SvxSearchItem; class ScAutoFormatData; -class ScDocument; class ScEditDataArray; class ScFormulaCell; class ScOutlineTable; @@ -105,7 +99,6 @@ class ScTableProtection; class ScUserListData; struct RowInfo; struct ScFunctionData; -struct ScLineFlags; class CollatorWrapper; class ScFlatUInt16RowSegments; class ScFlatBoolRowSegments; @@ -114,10 +107,11 @@ struct ScSetStringParam; struct ScColWidthParam; class ScRangeName; class ScDBData; -class ScDocumentImport; class ScHint; +class ScPostIt; struct ScInterpreterContext; + class ScColumnsRange final { public: diff --git a/sc/inc/tabopparams.hxx b/sc/inc/tabopparams.hxx index 3f475de7aaed..a2e7823bf70c 100644 --- a/sc/inc/tabopparams.hxx +++ b/sc/inc/tabopparams.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_INC_TABOPPARAMS_HXX #define INCLUDED_SC_INC_TABOPPARAMS_HXX -#include "global.hxx" #include "address.hxx" #include <vector> diff --git a/sc/inc/tabprotection.hxx b/sc/inc/tabprotection.hxx index c174957f1e18..b834d841c2a2 100644 --- a/sc/inc/tabprotection.hxx +++ b/sc/inc/tabprotection.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SC_INC_TABPROTECTION_HXX #include <sal/types.h> -#include <com/sun/star/uno/Sequence.hxx> #include "global.hxx" #include "rangelst.hxx" diff --git a/sc/inc/targuno.hxx b/sc/inc/targuno.hxx index 547d61df89d9..387a76160364 100644 --- a/sc/inc/targuno.hxx +++ b/sc/inc/targuno.hxx @@ -22,34 +22,15 @@ #include <svl/lstner.hxx> #include <com/sun/star/document/XLinkTargetSupplier.hpp> -#include <com/sun/star/lang/XServiceName.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/beans/PropertyValues.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/beans/PropertyState.hpp> -#include <com/sun/star/beans/XPropertySetInfo.hpp> -#include <com/sun/star/beans/XMultiPropertySet.hpp> -#include <com/sun/star/beans/XFastPropertySet.hpp> -#include <com/sun/star/beans/XVetoableChangeListener.hpp> -#include <com/sun/star/beans/XPropertyState.hpp> -#include <com/sun/star/beans/XPropertyStateChangeListener.hpp> -#include <com/sun/star/beans/PropertyAttribute.hpp> -#include <com/sun/star/beans/XPropertiesChangeListener.hpp> -#include <com/sun/star/beans/XPropertyChangeListener.hpp> -#include <com/sun/star/beans/XPropertyAccess.hpp> -#include <com/sun/star/beans/XPropertyContainer.hpp> -#include <com/sun/star/beans/PropertyStateChangeEvent.hpp> -#include <com/sun/star/beans/PropertyChangeEvent.hpp> -#include <com/sun/star/container/XEnumerationAccess.hpp> -#include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/container/XContentEnumerationAccess.hpp> -#include <com/sun/star/container/XEnumeration.hpp> -#include <com/sun/star/container/XElementAccess.hpp> -#include <com/sun/star/container/XIndexAccess.hpp> #include <cppuhelper/implbase.hxx> +namespace com { namespace sun { namespace star { namespace beans { class XPropertyChangeListener; } } } } +namespace com { namespace sun { namespace star { namespace beans { class XPropertySetInfo; } } } } +namespace com { namespace sun { namespace star { namespace beans { class XVetoableChangeListener; } } } } + class ScDocShell; #define SC_LINKTARGETTYPE_SHEET 0 diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx index b31894c253f4..0d3919727436 100644 --- a/sc/inc/textuno.hxx +++ b/sc/inc/textuno.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_INC_TEXTUNO_HXX #define INCLUDED_SC_INC_TEXTUNO_HXX -#include "global.hxx" #include "address.hxx" #include <editeng/unotext.hxx> #include <svl/lstner.hxx> @@ -32,7 +31,6 @@ #include <cppuhelper/weakref.hxx> #include <rtl/ref.hxx> -#include "scdllapi.h" #include <memory> @@ -40,7 +38,6 @@ class EditEngine; class EditTextObject; class SvxEditEngineForwarder; class ScDocShell; -class ScAddress; class ScCellObj; class ScSimpleEditSource; class ScCellEditSource; diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx index 5658dd0889ce..8e756a93a54f 100644 --- a/sc/inc/token.hxx +++ b/sc/inc/token.hxx @@ -22,13 +22,11 @@ #include <memory> #include <vector> -#include <boost/intrusive_ptr.hpp> #include <formula/opcode.hxx> #include "refdata.hxx" #include <tools/mempool.hxx> #include "scdllapi.h" -#include <formula/IFunctionDescription.hxx> #include <formula/token.hxx> #include "calcmacros.hxx" #include "types.hxx" diff --git a/sc/inc/tokenuno.hxx b/sc/inc/tokenuno.hxx index 4b5ddab038a1..2eab2a816f02 100644 --- a/sc/inc/tokenuno.hxx +++ b/sc/inc/tokenuno.hxx @@ -21,18 +21,17 @@ #define INCLUDED_SC_INC_TOKENUNO_HXX #include <memory> -#include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/sheet/FormulaOpCodeMapEntry.hpp> -#include <com/sun/star/sheet/FormulaToken.hpp> #include <com/sun/star/sheet/XFormulaParser.hpp> #include <cppuhelper/implbase.hxx> #include <svl/lstner.hxx> #include <formula/FormulaOpCodeMapperObj.hxx> -#include "address.hxx" #include "compiler.hxx" +namespace com { namespace sun { namespace star { namespace sheet { struct FormulaOpCodeMapEntry; } } } } +namespace com { namespace sun { namespace star { namespace sheet { struct FormulaToken; } } } } + class ScTokenArray; class ScDocShell; diff --git a/sc/inc/typedstrdata.hxx b/sc/inc/typedstrdata.hxx index 1572f2eb3dd2..56414f10c267 100644 --- a/sc/inc/typedstrdata.hxx +++ b/sc/inc/typedstrdata.hxx @@ -11,7 +11,6 @@ #define INCLUDED_SC_INC_TYPEDSTRDATA_HXX #include <rtl/ustring.hxx> -#include "scdllapi.h" #include <set> diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index fb9ec32f3649..29b46fef75a1 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -98,6 +98,7 @@ #include <formulagroup.hxx> #include <tokenarray.hxx> #include <tokenstringcontext.hxx> +#include <compressedarray.hxx> #include <formula/vectortoken.hxx> diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index c6627ab126d0..3129eff669a0 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -50,6 +50,7 @@ #include <scmatrix.hxx> #include <refupdatecontext.hxx> #include <rowheightcontext.hxx> +#include <compressedarray.hxx> #include <formula/vectortoken.hxx> #include <token.hxx> diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index 1260370602c4..a30ca6fe5527 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -56,6 +56,7 @@ #include <refhint.hxx> #include <listenercontext.hxx> #include <token.hxx> +#include <compressedarray.hxx> #include <scitems.hxx> #include <editeng/boxitem.hxx> diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx index 7f5c3f678fa9..b910a70f984d 100644 --- a/sc/source/core/data/table5.cxx +++ b/sc/source/core/data/table5.cxx @@ -42,6 +42,7 @@ #include <scmod.hxx> #include <printopt.hxx> #include <bcaslot.hxx> +#include <compressedarray.hxx> #include <com/sun/star/sheet/TablePageBreakData.hpp> diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 968439bfdcf0..a6b9d5497395 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -67,6 +67,7 @@ #include <com/sun/star/document/IndexedPropertyValues.hpp> #include <com/sun/star/script/XInvocation.hpp> #include <com/sun/star/script/vba/XVBAEventProcessor.hpp> +#include <com/sun/star/beans/XFastPropertySet.hpp> #include <comphelper/processfactory.hxx> #include <comphelper/profilezone.hxx> #include <comphelper/servicehelper.hxx> diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx index 96ba5208ebb9..2dee47293af0 100644 --- a/sc/source/ui/unoobj/targuno.cxx +++ b/sc/source/ui/unoobj/targuno.cxx @@ -25,6 +25,7 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <com/sun/star/awt/XBitmap.hpp> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <targuno.hxx> #include <miscuno.hxx> |