[Libreoffice-commits] core.git: sc/inc sc/IwyuFilter_sc.yaml sc/source

Gabor Kelemen kelemeng at ubuntu.com
Mon Jun 11 19:55:45 UTC 2018 

 sc/IwyuFilter_sc.yaml               |   32 ++++++++++++++++++++++++++++++++
 sc/inc/sc.hrc                       |    2 --
 sc/inc/scextopt.hxx                 |    1 -
 sc/inc/scitems.hxx                  |    1 -
 sc/inc/scmatrix.hxx                 |    5 +----
 sc/inc/scres.hrc                    |    1 -
 sc/inc/segmenttree.hxx              |    2 +-
 sc/inc/servuno.hxx                  |    6 ++++--
 sc/inc/sheetdata.hxx                |    2 --
 sc/inc/simplerangelist.hxx          |    3 ---
 sc/inc/spellcheckcontext.hxx        |    3 ++-
 sc/inc/stlalgorithm.hxx             |    1 -
 sc/inc/styleuno.hxx                 |   10 +++++-----
 sc/inc/subtotalparam.hxx            |    1 -
 sc/source/core/data/drwlayer.cxx    |    1 +
 sc/source/core/data/segmenttree.cxx |    1 +
 sc/source/filter/excel/xehelper.cxx |    1 +
 sc/source/filter/excel/xistyle.cxx  |    1 +
 sc/source/filter/excel/xlroot.cxx   |    1 +
 19 files changed, 50 insertions(+), 25 deletions(-)

New commits:
commit d2dab4079b716f3c2a2c53ab8070340995aed58d
Author: Gabor Kelemen <kelemeng at ubuntu.com>
Date:   Thu May 17 20:01:16 2018 +0200

    tdf#42949 Fix IWYU warnings in sc/inc/s*
    
    Found with bin/find-unneeded-includes
    Removal proposals and fallout management are dealt with here.
    
    Change-Id: I21217fbac071f06987b989e735982b2dfad6a54e
    Reviewed-on: https://gerrit.libreoffice.org/55537
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Jochen Nitschke <j.nitschke+logerrit at ok.de>

diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index a72dfb5d1d58..e2a2829c862d 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -203,3 +203,35 @@ blacklist:
     sc/inc/rowheightcontext.hxx:
     # base class has to be a complete type
     - vcl/outdev.hxx
+    sc/inc/scerrors.hxx:
+    # needed for defines
+    - vcl/errcode.hxx
+    sc/inc/scitems.hxx:
+    # needed for defines
+    - svl/typedwhich.hxx
+    sc/inc/scmatrix.hxx:
+    # base class has to be a complete type
+    - svl/sharedstringpool.hxx
+    sc/inc/simplerangelist.hxx:
+    # base class has to be a complete type
+    - memory
+    sc/inc/spellcheckcontext.hxx:
+    # base class has to be a complete type
+    - editeng/misspellrange.hxx
+    sc/inc/srchuno.hxx:
+    # base class has to be a complete type
+    - com/sun/star/lang/XServiceInfo.hpp
+    - com/sun/star/lang/XUnoTunnel.hpp
+    - com/sun/star/util/XReplaceDescriptor.hpp
+    sc/inc/styleuno.hxx:
+    # base class has to be a complete type
+    - com/sun/star/beans/XMultiPropertySet.hpp
+    - com/sun/star/beans/XMultiPropertyStates.hpp
+    - com/sun/star/beans/XPropertySet.hpp
+    - com/sun/star/beans/XPropertyState.hpp
+    - com/sun/star/container/XIndexAccess.hpp
+    - com/sun/star/container/XNameContainer.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    - com/sun/star/lang/XUnoTunnel.hpp
+    - com/sun/star/style/XStyle.hpp
+    - com/sun/star/style/XStyleLoader2.hpp
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index ba6fbc6686dd..961b17979070 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -23,8 +23,6 @@
 #include <sfx2/sfxsids.hrc>
 #include <svx/svxids.hrc>
 
-#include <svx/svxcommands.h>
-
 // areas
 
 #define SC_VIEW_START           (SID_SC_START)
diff --git a/sc/inc/scextopt.hxx b/sc/inc/scextopt.hxx
index 8edc960782fa..22c48d687961 100644
--- a/sc/inc/scextopt.hxx
+++ b/sc/inc/scextopt.hxx
@@ -22,7 +22,6 @@
 #include <memory>
 #include <tools/gen.hxx>
 #include <tools/color.hxx>
-#include "global.hxx"
 #include "rangelst.hxx"
 
 /** Extended settings for the document, used in import/export filters. */
diff --git a/sc/inc/scitems.hxx b/sc/inc/scitems.hxx
index d304828ccaf9..d5871af119fe 100644
--- a/sc/inc/scitems.hxx
+++ b/sc/inc/scitems.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SC_INC_SCITEMS_HXX
 #define INCLUDED_SC_INC_SCITEMS_HXX
 
-#include <svx/svxids.hrc>
 #include <svl/typedwhich.hxx>
 
 //  EditEngine is not allowed to define its own ITEMID's
diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx
index 9be335fbc06b..2dbd3490cfb9 100644
--- a/sc/inc/scmatrix.hxx
+++ b/sc/inc/scmatrix.hxx
@@ -20,20 +20,17 @@
 #ifndef INCLUDED_SC_INC_SCMATRIX_HXX
 #define INCLUDED_SC_INC_SCMATRIX_HXX
 
-#include "global.hxx"
+#include "address.hxx"
 #include "matrixoperators.hxx"
 #include "types.hxx"
 #include <formula/errorcodes.hxx>
 #include "scdllapi.h"
-#include <rtl/ustring.hxx>
 #include <svl/sharedstring.hxx>
 #include <svl/sharedstringpool.hxx>
 
-#include <functional>
 #include <memory>
 #include <utility>
 #include <vector>
-#include <boost/intrusive_ptr.hpp>
 
 #define DEBUG_MATRIX 0
 
diff --git a/sc/inc/scres.hrc b/sc/inc/scres.hrc
index 40c92cedf77d..3189dc9f27fe 100644
--- a/sc/inc/scres.hrc
+++ b/sc/inc/scres.hrc
@@ -21,7 +21,6 @@
 #define SC_SCRES_HRC
 
 #include "sc.hrc"
-#include <formula/compiler.hxx>
 
 #define STR_START               (SC_RESOURCE_START+100)
 
diff --git a/sc/inc/segmenttree.hxx b/sc/inc/segmenttree.hxx
index 53eec168a722..40f584a931d5 100644
--- a/sc/inc/segmenttree.hxx
+++ b/sc/inc/segmenttree.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SC_INC_SEGMENTTREE_HXX
 #define INCLUDED_SC_INC_SEGMENTTREE_HXX
 
-#include "address.hxx"
+#include "types.hxx"
 
 #include <memory>
 
diff --git a/sc/inc/servuno.hxx b/sc/inc/servuno.hxx
index d3e55bcaf272..aa0ab5151ec4 100644
--- a/sc/inc/servuno.hxx
+++ b/sc/inc/servuno.hxx
@@ -20,8 +20,10 @@
 #ifndef INCLUDED_SC_INC_SERVUNO_HXX
 #define INCLUDED_SC_INC_SERVUNO_HXX
 
-#include <com/sun/star/uno/XInterface.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/uno/Sequence.h>
+#include <com/sun/star/uno/Reference.h>
+
+namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } }
 
 class ScDocShell;
 
diff --git a/sc/inc/sheetdata.hxx b/sc/inc/sheetdata.hxx
index 238a50983c03..19962852a092 100644
--- a/sc/inc/sheetdata.hxx
+++ b/sc/inc/sheetdata.hxx
@@ -20,14 +20,12 @@
 #ifndef INCLUDED_SC_INC_SHEETDATA_HXX
 #define INCLUDED_SC_INC_SHEETDATA_HXX
 
-#include <xmloff/maptype.hxx>
 #include <editeng/editdata.hxx>
 #include <unordered_set>
 #include <vector>
 
 #include "address.hxx"
 
-class ScAddress;
 class SvXMLNamespaceMap;
 
 struct ScStreamEntry
diff --git a/sc/inc/simplerangelist.hxx b/sc/inc/simplerangelist.hxx
index bf672ea19f12..a16cf0042325 100644
--- a/sc/inc/simplerangelist.hxx
+++ b/sc/inc/simplerangelist.hxx
@@ -26,9 +26,6 @@
 #include <map>
 #include <memory>
 
-class ScRange;
-class ScRangeList;
-
 /**
  * This container is optimized for use in the ods import filter, to store
  * ranges for cell styles.  We may change the name of this class once we
diff --git a/sc/inc/spellcheckcontext.hxx b/sc/inc/spellcheckcontext.hxx
index fcc873f3294a..42ec80389af2 100644
--- a/sc/inc/spellcheckcontext.hxx
+++ b/sc/inc/spellcheckcontext.hxx
@@ -10,10 +10,11 @@
 #ifndef INCLUDED_SC_INC_SPELLCHECKCONTEXT_HXX
 #define INCLUDED_SC_INC_SPELLCHECKCONTEXT_HXX
 
-#include "address.hxx"
 #include <editeng/misspellrange.hxx>
+#include "types.hxx"
 
 #include <unordered_map>
+#include <vector>
 
 namespace sc {
 
diff --git a/sc/inc/stlalgorithm.hxx b/sc/inc/stlalgorithm.hxx
index d99476ea9a76..14c73f579c78 100644
--- a/sc/inc/stlalgorithm.hxx
+++ b/sc/inc/stlalgorithm.hxx
@@ -10,7 +10,6 @@
 #ifndef INCLUDED_SC_INC_STLALGORITHM_HXX
 #define INCLUDED_SC_INC_STLALGORITHM_HXX
 
-#include <functional>
 #include <limits>
 
 #include <rtl/alloc.h>
diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx
index 57cf51bcdeff..4d076df46d51 100644
--- a/sc/inc/styleuno.hxx
+++ b/sc/inc/styleuno.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SC_INC_STYLEUNO_HXX
 #define INCLUDED_SC_INC_STYLEUNO_HXX
 
-#include <svl/itemprop.hxx>
 #include <svl/lstner.hxx>
 #include <svl/style.hxx>
 #include <com/sun/star/container/XIndexAccess.hpp>
@@ -28,22 +27,23 @@
 #include <com/sun/star/style/XStyleLoader2.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/container/XIndexReplace.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/XMultiPropertyStates.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <com/sun/star/lang/XComponent.hpp>
 
+namespace com { namespace sun { namespace star { namespace container { class XIndexReplace; } } } }
+namespace com { namespace sun { namespace star { namespace lang { class XComponent; } } } }
 
-class SfxStyleSheetBase;
 class ScDocShell;
-class SfxObjectShell;
+class SfxItemPropertySet;
+class SfxItemSet;
 
 class ScStyleFamilyObj;
 class ScStyleObj;
+struct SfxItemPropertySimpleEntry;
 
 class ScStyleFamiliesObj : public ::cppu::WeakImplHelper<
                             css::container::XIndexAccess,
diff --git a/sc/inc/subtotalparam.hxx b/sc/inc/subtotalparam.hxx
index eaf60f61dd47..b22d1ad9809b 100644
--- a/sc/inc/subtotalparam.hxx
+++ b/sc/inc/subtotalparam.hxx
@@ -11,7 +11,6 @@
 #define INCLUDED_SC_INC_SUBTOTALPARAM_HXX
 
 #include "global.hxx"
-#include "address.hxx"
 
 struct SC_DLLPUBLIC ScSubTotalParam
 {
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 078e49674f09..909438316dd8 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -38,6 +38,7 @@
 #include <svx/svdograf.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdundo.hxx>
+#include <svx/svxids.hrc>
 #include <i18nlangtag/mslangid.hxx>
 #include <editeng/unolingu.hxx>
 #include <svx/drawitem.hxx>
diff --git a/sc/source/core/data/segmenttree.cxx b/sc/source/core/data/segmenttree.cxx
index c7fbcb547835..21f7b0fc890a 100644
--- a/sc/source/core/data/segmenttree.cxx
+++ b/sc/source/core/data/segmenttree.cxx
@@ -22,6 +22,7 @@
 #include <mdds/flat_segment_tree.hpp>
 #include <algorithm>
 #include <limits>
+#include <address.hxx>
 
 using ::std::numeric_limits;
 
diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx
index 45b17ab694a1..a541d9f21b82 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -34,6 +34,7 @@
 #include <editeng/flditem.hxx>
 #include <editeng/escapementitem.hxx>
 #include <editeng/svxfont.hxx>
+#include <editeng/editids.hrc>
 
 #include <document.hxx>
 #include <docpool.hxx>
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index 07216a81db1f..c6a660e7735d 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -43,6 +43,7 @@
 #include <editeng/eeitem.hxx>
 #include <editeng/flstitem.hxx>
 #include <editeng/justifyitem.hxx>
+#include <editeng/editids.hrc>
 #include <sal/macros.h>
 #include <vcl/fontcharmap.hxx>
 #include <document.hxx>
diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx
index d9fdf2071776..9adf75a83f61 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -31,6 +31,7 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/docfile.hxx>
+#include <sfx2/sfxsids.hrc>
 #include <vcl/font.hxx>
 #include <vcl/settings.hxx>

More information about the Libreoffice-commits mailing list