tdf#42949 Fix IWYU warnings in sc/inc/[gh]*

Found with bin/find-unneeded-includes Simple removal proposals are dealt with here and a bit of fallout management Change-Id: Ia6f8d4ca46d7b218f5827052ced5641367bd4478 Reviewed-on: https://gerrit.libreoffice.org/54683 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
darshan-yadav · May 25, 2018 · f8edef3 · f8edef3
1 parent 3ebaf1a
commit f8edef3
Show file tree

Hide file tree

Showing 23 changed files with 26 additions and 11 deletions.
diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
@@ -177,3 +177,7 @@ blacklist:
     - global.hxx
     # Needed for macros
     - calcmacros.hxx
+    sc/inc/global.hxx:
+    # base class has to be a complete type
+    - com/sun/star/uno/Reference.hxx
+    - tools/ref.hxx
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SC_INC_ATTRIB_HXX
 
 #include <memory>
+#include <vector>
 #include <svl/poolitem.hxx>
 #include <svl/intitem.hxx>
 #include <svl/eitem.hxx>

diff --git a/sc/inc/chartpos.hxx b/sc/inc/chartpos.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SC_INC_CHARTPOS_HXX
 
 #include "rangelst.hxx"
+#include <tools/solar.h>
 #include <memory>
 #include <map>
 

diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SC_INC_CONDITIO_HXX
 
 #include "global.hxx"
+#include <tools/solar.h>
 #include "address.hxx"
 #include <formula/grammar.hxx>
 #include "scdllapi.h"
@@ -42,6 +43,7 @@
 class ScFormulaCell;
 class ScTokenArray;
 struct ScRefCellValue;
+class Color;
 
 namespace sc {
 

diff --git a/sc/inc/consoli.hxx b/sc/inc/consoli.hxx
@@ -22,6 +22,7 @@
 
 #include "global.hxx"
 #include "address.hxx"
+#include <vector>
 
 class ScDocument;
 

diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
@@ -43,6 +43,7 @@ struct ScQueryParam;
 struct ScDBQueryParamInternal;
 struct ScDBQueryParamMatrix;
 class ScFormulaCell;
+class OutputDevice;
 struct ScInterpreterContext;
 enum class SvNumFormatType : sal_Int16;
 

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
@@ -23,6 +23,7 @@
 #include <vcl/prntypes.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/idle.hxx>
+#include <vcl/errcode.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <vcl/vclptr.hxx>
 #include "scdllapi.h"

diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
@@ -23,18 +23,16 @@
 #include "address.hxx"
 #include <i18nlangtag/lang.h>
 #include <svx/svdtypes.hxx>
-#include <tools/stream.hxx>
+#include <tools/ref.hxx>
+#include <sal/types.h>
 #include <com/sun/star/uno/Reference.hxx>
 #include "scdllapi.h"
 #include <rtl/ustring.hxx>
 
 #include <map>
-#include <vector>
 
-class Bitmap;
 class SfxItemSet;
 class SfxViewShell;
-class Color;
 struct ScCalcConfig;
 enum class SvtScriptType;
 enum class FormulaError : sal_uInt16;
@@ -460,7 +458,6 @@ struct ScImportParam
     bool            operator==  ( const ScImportParam& r ) const;
 };
 
-class ScDocument;
 class ScDocShell;
 class SvxSearchItem;
 class ScAutoFormat;
@@ -471,7 +468,6 @@ class SvxBrushItem;
 class ScFunctionList;
 class ScFunctionMgr;
 class SfxItemPool;
-class SdrModel;
 class EditTextObject;
 class SfxObjectShell;
 class SvNumberFormatter;
@@ -482,7 +478,6 @@ class SvtSysLocale;
 class CalendarWrapper;
 class CollatorWrapper;
 class IntlWrapper;
-class OutputDevice;
 class ScFieldEditEngine;
 
 namespace com { namespace sun { namespace star {

diff --git a/sc/inc/grouparealistener.hxx b/sc/inc/grouparealistener.hxx
@@ -11,7 +11,6 @@
 #define INCLUDED_SC_GROUPAREALISTENER_HXX
 
 #include "address.hxx"
-#include "calcmacros.hxx"
 
 #include <svl/listener.hxx>
 

diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_SC_INC_HELPIDS_H
 #define INCLUDED_SC_INC_HELPIDS_H
 
-#include <svx/svxcommands.h>
-
 #define HID_INSWIN_POS                                          "SC_HID_INSWIN_POS"
 #define HID_INSWIN_CALC                                         "SC_HID_INSWIN_CALC"
 #define HID_INSWIN_CANCEL                                       "SC_HID_INSWIN_CANCEL"

diff --git a/sc/inc/hints.hxx b/sc/inc/hints.hxx
@@ -22,6 +22,7 @@
 
 #include "global.hxx"
 #include "address.hxx"
+#include <tools/solar.h>
 #include <svl/hint.hxx>
 
 class SC_DLLPUBLIC ScPaintHint : public SfxHint

diff --git a/sc/inc/queryentry.hxx b/sc/inc/queryentry.hxx
@@ -24,6 +24,7 @@
 #include <svl/sharedstring.hxx>
 #include <unotools/textsearch.hxx>
 
+#include <memory>
 #include <vector>
 
 /**

diff --git a/sc/source/core/data/markarr.cxx b/sc/source/core/data/markarr.cxx
@@ -20,6 +20,7 @@
 #include <markarr.hxx>
 #include <global.hxx>
 #include <address.hxx>
+#include <vector>
 
 #include <osl/diagnose.h>
 

diff --git a/sc/source/core/tool/jumpmatrix.cxx b/sc/source/core/tool/jumpmatrix.cxx
@@ -19,7 +19,7 @@
 
 #include <jumpmatrix.hxx>
 #include <scmatrix.hxx>
-
+#include <tools/solar.h>
 #include <osl/diagnose.h>
 
 namespace {

diff --git a/sc/source/core/tool/zforauto.cxx b/sc/source/core/tool/zforauto.cxx
@@ -24,6 +24,7 @@
 
 #include <zforauto.hxx>
 #include <global.hxx>
+#include <tools/stream.hxx>
 
 ScNumFormatAbbrev::ScNumFormatAbbrev() :
     sFormatstring   ( "Standard" ),

diff --git a/sc/source/filter/inc/formel.hxx b/sc/source/filter/inc/formel.hxx
@@ -22,6 +22,7 @@
 
 #include <compiler.hxx>
 #include <global.hxx>
+#include <tools/stream.hxx>
 
 #include "root.hxx"
 #include "tokstack.hxx"

diff --git a/sc/source/filter/xml/XMLExportSharedData.hxx b/sc/source/filter/xml/XMLExportSharedData.hxx
@@ -25,6 +25,7 @@
 
 #include <vector>
 #include <list>
+#include <memory>
 
 struct ScMyDrawPage
 {

diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -19,6 +19,7 @@
 
 #include "XMLStylesExportHelper.hxx"
 #include <global.hxx>
+#include <tools/lineend.hxx>
 #include <unonames.hxx>
 #include "XMLConverter.hxx"
 #include "xmlexprt.hxx"

diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
@@ -28,6 +28,7 @@
 #include <xmloff/xmlstyle.hxx>
 #include <com/sun/star/util/DateTime.hpp>
 #include "xmlsubti.hxx"
+#include <vcl/errcode.hxx>
 #include <global.hxx>
 #include <formula/grammar.hxx>
 #include <compiler.hxx>

diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx
@@ -24,6 +24,7 @@
 #include <sot/exchange.hxx>
 #include <global.hxx>
 #include <address.hxx>
+#include <tools/stream.hxx>
 
 class ScDocShell;
 class ScDocument;

diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx
@@ -22,6 +22,7 @@
 
 #include <global.hxx>
 #include <address.hxx>
+#include <tools/solar.h>
 #include <typedstrdata.hxx>
 
 #include <tools/fract.hxx>

diff --git a/sc/source/ui/inc/pfuncache.hxx b/sc/source/ui/inc/pfuncache.hxx
@@ -27,6 +27,7 @@
 
 class ScDocShell;
 class ScMarkData;
+class OutputDevice;
 
 /** Possible types of selection for print functions */
 

diff --git a/sc/source/ui/inc/rfindlst.hxx b/sc/source/ui/inc/rfindlst.hxx
@@ -23,6 +23,7 @@
 #include <tools/color.hxx>
 #include <global.hxx>
 #include <address.hxx>
+#include <tools/solar.h>
 
 struct ScRangeFindData
 {