summaryrefslogtreecommitdiff
path: root/sc/inc
diff options
context:
space:
mode:
authorGabor Kelemen <kelemeng@ubuntu.com>2018-06-04 23:55:49 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2018-06-06 09:46:06 +0200
commit18a8cac57d5450fef9111fa356839f07c7593ad0 (patch)
tree3888d36641e4c9caf7b6e8e9286091c881946c90 /sc/inc
parent6c68e52532d45c97a83b2396bd40c98ade9b5bb4 (diff)
tdf#42949 Fix IWYU warnings in sc/inc/[a,c]*
Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Quite a bit of fallout management was necessary. Several files were not checked earlier because of IWYU problems. Also a few mistaken entries from the yaml file are corrected. Change-Id: I943dfb955e096896961ac487d26ce57a6cb76cc2 Reviewed-on: https://gerrit.libreoffice.org/55303 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sc/inc')
-rw-r--r--sc/inc/addincol.hxx18
-rw-r--r--sc/inc/afmtuno.hxx5
-rw-r--r--sc/inc/appluno.hxx3
-rw-r--r--sc/inc/appoptio.hxx7
-rw-r--r--sc/inc/cellsuno.hxx21
-rw-r--r--sc/inc/chart2uno.hxx4
-rw-r--r--sc/inc/charthelper.hxx5
-rw-r--r--sc/inc/chartlis.hxx8
-rw-r--r--sc/inc/chartlock.hxx4
-rw-r--r--sc/inc/clipoptions.hxx5
-rw-r--r--sc/inc/clipparam.hxx3
-rw-r--r--sc/inc/colorscale.hxx2
-rw-r--r--sc/inc/columnset.hxx2
-rw-r--r--sc/inc/compiler.hxx7
-rw-r--r--sc/inc/convuno.hxx3
15 files changed, 53 insertions, 44 deletions
diff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxx
index 6b2f1b29f535..e22a6c056f9d 100644
--- a/sc/inc/addincol.hxx
+++ b/sc/inc/addincol.hxx
@@ -21,23 +21,23 @@
#define INCLUDED_SC_INC_ADDINCOL_HXX
#include <memory>
-#include "global.hxx"
-#include <com/sun/star/sheet/XVolatileResult.hpp>
-#include <com/sun/star/sheet/XAddIn.hpp>
-#include <com/sun/star/sheet/XResultListener.hpp>
-#include <com/sun/star/sheet/ResultEvent.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/reflection/XIdlMethod.hpp>
+#include <com/sun/star/uno/Any.h>
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/Sequence.h>
+#include <formula/errorcodes.hxx>
#include <i18nlangtag/lang.h>
-#include <rtl/ustring.h>
#include "scdllapi.h"
#include <rtl/ustring.hxx>
-#include "scmatrix.hxx"
#include "types.hxx"
+#include <vector>
#include <unordered_map>
+namespace com { namespace sun { namespace star { namespace reflection { class XIdlMethod; } } } }
+namespace com { namespace sun { namespace star { namespace sheet { class XVolatileResult; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } }
+
class SfxObjectShell;
class ScUnoAddInFuncData;
class ScFuncDesc;
diff --git a/sc/inc/afmtuno.hxx b/sc/inc/afmtuno.hxx
index 09172e84fa63..cb0ed438b70b 100644
--- a/sc/inc/afmtuno.hxx
+++ b/sc/inc/afmtuno.hxx
@@ -22,9 +22,8 @@
#include <svl/itemprop.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/container/XNameReplace.hpp>
-#include <com/sun/star/container/XSet.hpp>
-#include <com/sun/star/container/XIndexReplace.hpp>
+#include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/container/XEnumerationAccess.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/container/XNamed.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxx
index 36b6e9ac92d3..15bb4d987920 100644
--- a/sc/inc/appluno.hxx
+++ b/sc/inc/appluno.hxx
@@ -22,7 +22,6 @@
#include <svl/itemprop.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sheet/XRecentFunctions.hpp>
#include <com/sun/star/sheet/XFunctionDescriptions.hpp>
@@ -33,6 +32,8 @@
#include <rtl/ustring.hxx>
#include <sfx2/sfxmodelfactory.hxx>
+namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
+
css::uno::Reference<css::uno::XInterface>
ScSpreadsheetSettings_CreateInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory>& rSMgr );
diff --git a/sc/inc/appoptio.hxx b/sc/inc/appoptio.hxx
index 43a75832be4b..ebadb6e329fd 100644
--- a/sc/inc/appoptio.hxx
+++ b/sc/inc/appoptio.hxx
@@ -20,14 +20,13 @@
#ifndef INCLUDED_SC_INC_APPOPTIO_HXX
#define INCLUDED_SC_INC_APPOPTIO_HXX
-#include <memory>
-#include <vcl/field.hxx>
#include <sfx2/zoomitem.hxx>
-#include <unotools/configitem.hxx>
#include "scdllapi.h"
-#include "scmod.hxx"
#include "global.hxx"
#include "optutil.hxx"
+#include <tools/fldunit.hxx>
+#include <tools/color.hxx>
+#include <tools/link.hxx>
class SC_DLLPUBLIC ScAppOptions
{
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index b59a84218f88..236000218bcb 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -20,16 +20,14 @@
#ifndef INCLUDED_SC_INC_CELLSUNO_HXX
#define INCLUDED_SC_INC_CELLSUNO_HXX
-#include "global.hxx"
+#include "address.hxx"
#include "rangelst.hxx"
-#include <editeng/unotext.hxx>
#include <formula/grammar.hxx>
#include <rtl/ref.hxx>
#include <tools/link.hxx>
#include <svl/lstner.hxx>
#include <svl/listener.hxx>
-#include <svl/itemprop.hxx>
#include <com/sun/star/table/XTableChartsSupplier.hpp>
#include <com/sun/star/table/XTablePivotChartsSupplier.hpp>
#include <com/sun/star/chart/XChartDataArray.hpp>
@@ -69,9 +67,6 @@
#include <com/sun/star/util/XImportable.hpp>
#include <com/sun/star/table/XColumnRowRange.hpp>
#include <com/sun/star/table/XCell2.hpp>
-#include <com/sun/star/table/BorderLine2.hpp>
-#include <com/sun/star/table/TableBorder.hpp>
-#include <com/sun/star/table/TableBorder2.hpp>
#include <com/sun/star/sheet/XDataPilotTablesSupplier.hpp>
#include <com/sun/star/sheet/XSheetAnnotationAnchor.hpp>
#include <com/sun/star/sheet/XScenariosSupplier.hpp>
@@ -94,17 +89,29 @@
#include <memory>
#include <vector>
+namespace com { namespace sun { namespace star { namespace table { struct BorderLine2; } } } }
+namespace com { namespace sun { namespace star { namespace table { struct BorderLine; } } } }
+namespace com { namespace sun { namespace star { namespace table { struct TableBorder2; } } } }
+namespace com { namespace sun { namespace star { namespace table { struct TableBorder; } } } }
+
class ScDocShell;
class ScMarkData;
class ScMemChart;
class ScPrintRangeSaver;
class ScAttrRectIterator;
class ScCellRangeObj;
-class ScLinkListener;
class ScPatternAttr;
class SvxBoxItem;
class SvxBoxInfoItem;
class SvxItemPropertySet;
+class SvxUnoText;
+class ScDocument;
+class SfxBroadcaster;
+class SfxHint;
+class SfxItemPropertyMap;
+class SfxItemPropertySet;
+class SfxItemSet;
+struct SfxItemPropertySimpleEntry;
namespace editeng { class SvxBorderLine; }
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx
index fb19a502a4c9..1083c084d2dd 100644
--- a/sc/inc/chart2uno.hxx
+++ b/sc/inc/chart2uno.hxx
@@ -27,7 +27,6 @@
#include "chartlis.hxx"
#include <svl/lstner.hxx>
-#include <com/sun/star/chart/ChartDataRowSource.hpp>
#include <com/sun/star/chart2/data/XDataProvider.hpp>
#include <com/sun/star/chart2/data/XSheetDataProvider.hpp>
#include <com/sun/star/chart2/data/XRangeXMLConversion.hpp>
@@ -35,7 +34,6 @@
#include <com/sun/star/chart2/data/XDataSequence.hpp>
#include <com/sun/star/chart2/data/XTextualDataSequence.hpp>
#include <com/sun/star/chart2/data/XNumericalDataSequence.hpp>
-#include <com/sun/star/chart2/data/XLabeledDataSequence.hpp>
#include <com/sun/star/chart2/data/DataSequenceRole.hpp>
#include <com/sun/star/chart2/XTimeBased.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -50,6 +48,8 @@
#include <unordered_set>
#include <vector>
+namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XLabeledDataSequence; } } } } }
+
class ScDocument;
// DataProvider
diff --git a/sc/inc/charthelper.hxx b/sc/inc/charthelper.hxx
index 7aad9522045a..a12b64835dd3 100644
--- a/sc/inc/charthelper.hxx
+++ b/sc/inc/charthelper.hxx
@@ -20,11 +20,10 @@
#ifndef INCLUDED_SC_INC_CHARTHELPER_HXX
#define INCLUDED_SC_INC_CHARTHELPER_HXX
-#include "address.hxx"
-#include "global.hxx"
#include "rangelst.hxx"
-#include <com/sun/star/chart2/XChartDocument.hpp>
+namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
class SdrObject;
class SdrPage;
diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index e4562cd56ee1..2a49c368fa3b 100644
--- a/sc/inc/chartlis.hxx
+++ b/sc/inc/chartlis.hxx
@@ -20,11 +20,9 @@
#ifndef INCLUDED_SC_INC_CHARTLIS_HXX
#define INCLUDED_SC_INC_CHARTLIS_HXX
-#include <vcl/timer.hxx>
#include <vcl/idle.hxx>
#include <svl/listener.hxx>
#include "rangelst.hxx"
-#include "token.hxx"
#include "externalrefmgr.hxx"
#include <memory>
@@ -33,10 +31,12 @@
#include <unordered_set>
#include <vector>
+namespace com { namespace sun { namespace star { namespace chart { class XChartData; } } } }
+namespace com { namespace sun { namespace star { namespace chart { class XChartDataChangeEventListener; } } } }
+
+class Timer;
class ScDocument;
class ScChartUnoData;
-#include <com/sun/star/chart/XChartData.hpp>
-#include <com/sun/star/chart/XChartDataChangeEventListener.hpp>
class SC_DLLPUBLIC ScChartListener : public SvtListener
{
diff --git a/sc/inc/chartlock.hxx b/sc/inc/chartlock.hxx
index d950f816d543..eae744a2b7dd 100644
--- a/sc/inc/chartlock.hxx
+++ b/sc/inc/chartlock.hxx
@@ -23,9 +23,11 @@
#include <vcl/timer.hxx>
#include <cppuhelper/weakref.hxx>
-#include <com/sun/star/frame/XModel.hpp>
#include <memory>
+#include <vector>
+
+namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
class ScDocument;
diff --git a/sc/inc/clipoptions.hxx b/sc/inc/clipoptions.hxx
index d4ccb59b4dee..984acc5eb17b 100644
--- a/sc/inc/clipoptions.hxx
+++ b/sc/inc/clipoptions.hxx
@@ -10,7 +10,10 @@
#ifndef INCLUDED_SC_INC_CLIPOPTIONS_HXX
#define INCLUDED_SC_INC_CLIPOPTIONS_HXX
-#include <com/sun/star/document/XDocumentProperties.hpp>
+#include "scdllapi.h"
+#include <com/sun/star/uno/Reference.h>
+
+namespace com { namespace sun { namespace star { namespace document { class XDocumentProperties; } } } }
/// Stores options which are only relevant for clipboard documents.
class SC_DLLPUBLIC ScClipOptions
diff --git a/sc/inc/clipparam.hxx b/sc/inc/clipparam.hxx
index 2e5dece711e8..ee9422bc27db 100644
--- a/sc/inc/clipparam.hxx
+++ b/sc/inc/clipparam.hxx
@@ -21,11 +21,8 @@
#define INCLUDED_SC_INC_CLIPPARAM_HXX
#include "rangelst.hxx"
-#include "rangenam.hxx"
#include "charthelper.hxx"
-#include <vector>
-
/**
* This struct stores general clipboard parameters associated with a
* ScDocument instance created in clipboard mode.
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index 0ed8a82d14e3..deab394229ea 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -12,7 +12,6 @@
#include <formula/grammar.hxx>
#include <tools/color.hxx>
-#include "rangelst.hxx"
#include "conditio.hxx"
#include "document.hxx"
@@ -21,7 +20,6 @@
//TODO: merge this with conditio.hxx
-class ScDocument;
class ScFormulaCell;
class ScTokenArray;
struct ScDataBarInfo;
diff --git a/sc/inc/columnset.hxx b/sc/inc/columnset.hxx
index ddf08ba8f860..879c9098b9d6 100644
--- a/sc/inc/columnset.hxx
+++ b/sc/inc/columnset.hxx
@@ -10,7 +10,7 @@
#ifndef INCLUDED_SC_INC_COLUMNSET_HXX
#define INCLUDED_SC_INC_COLUMNSET_HXX
-#include "address.hxx"
+#include "types.hxx"
#include <unordered_set>
#include <unordered_map>
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index c569c84b9c6c..ffd783a32506 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -29,14 +29,16 @@
#include "token.hxx"
#include <formula/token.hxx>
#include <formula/grammar.hxx>
-#include <unotools/charclass.hxx>
#include <rtl/ustrbuf.hxx>
#include <com/sun/star/sheet/ExternalLinkInfo.hpp>
+#include <com/sun/star/i18n/ParseResult.hpp>
#include <vector>
#include <memory>
+#include <com/sun/star/uno/Sequence.hxx>
#include <formula/FormulaCompiler.hxx>
-#include <o3tl/typed_flags_set.hxx>
+
+namespace o3tl { template <typename T> struct typed_flags; }
// constants and data types also for external modules (ScInterpreter et al)
@@ -83,6 +85,7 @@ class ScMatrix;
class ScRangeData;
class ScTokenArray;
struct ScInterpreterContext;
+class CharClass;
namespace sc {
diff --git a/sc/inc/convuno.hxx b/sc/inc/convuno.hxx
index 14cf2728c411..389badf0eb84 100644
--- a/sc/inc/convuno.hxx
+++ b/sc/inc/convuno.hxx
@@ -24,9 +24,10 @@
#include <i18nlangtag/lang.h>
#include <com/sun/star/table/CellAddress.hpp>
#include <com/sun/star/table/CellRangeAddress.hpp>
-#include <com/sun/star/lang/Locale.hpp>
#include "address.hxx"
+namespace com { namespace sun { namespace star { namespace lang { struct Locale; } } } }
+
class ScUnoConversion
{
public: