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

[Gabor Kelemen]

 sc/IwyuFilter_sc.yaml                 |    5 +++++
 sc/inc/formularesult.hxx              |    8 +++++++-
 sc/source/core/data/clipcontext.cxx   |    1 +
 sc/source/core/data/colorscale.cxx    |    1 +
 sc/source/core/data/column3.cxx       |    1 +
 sc/source/core/data/formulaiter.cxx   |    1 +
 sc/source/core/data/table1.cxx        |    1 +
 sc/source/core/tool/consoli.cxx       |    1 +
 sc/source/core/tool/formularesult.cxx |    1 +
 sc/source/core/tool/sharedformula.cxx |    1 +
 10 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit 494f1a98bf32bea014c277bd0bee81b9aab5c966
Author: Gabor Kelemen <kelemeng at ubuntu.com>
Date:   Wed May 16 08:18:07 2018 +0200

    tdf#42949 Fix IWYU warnings in sc/inc/formularesult.hxx
    
    Found with bin/find-unneeded-includes
    This one caused lots of fallout, manage it separately
    
    Change-Id: Idf153caa07b1edd85352609806f5b8b74fc6ead8
    Reviewed-on: https://gerrit.libreoffice.org/54410
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index 455aabd20da0..84b23623a578 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -172,3 +172,8 @@ blacklist:
     sc/inc/formulaparserpool.hxx:
     # base class has to be a complete type
     - com/sun/star/sheet/XFormulaParser.hpp
+    sc/inc/formularesult.hxx:
+    # Needed for enum
+    - global.hxx
+    # Needed for macros
+    - calcmacros.hxx
diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index 4797b5939522..b5fd6228dc41 100644
--- a/sc/inc/formularesult.hxx
+++ b/sc/inc/formularesult.hxx
@@ -20,8 +20,14 @@
 #ifndef INCLUDED_SC_INC_FORMULARESULT_HXX
 #define INCLUDED_SC_INC_FORMULARESULT_HXX
 
-#include "token.hxx"
 #include "scdllapi.h"
+#include "global.hxx"
+#include "calcmacros.hxx"
+#include <svl/sharedstring.hxx>
+#include <formula/token.hxx>
+#include <formula/types.hxx>
+
+class ScMatrixFormulaCellToken;
 
 namespace sc {
 
diff --git a/sc/source/core/data/clipcontext.cxx b/sc/source/core/data/clipcontext.cxx
index 1f35be3fe9c8..47eca9167cf8 100644
--- a/sc/source/core/data/clipcontext.cxx
+++ b/sc/source/core/data/clipcontext.cxx
@@ -19,6 +19,7 @@
 
 #include <svl/intitem.hxx>
 #include <formula/errorcodes.hxx>
+#include <refdata.hxx>
 
 namespace sc {
 
diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx
index 77e2d1a7c524..4ea3606e48b8 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -15,6 +15,7 @@
 #include <bitmaps.hlst>
 #include <tokenarray.hxx>
 #include <refupdatecontext.hxx>
+#include <refdata.hxx>
 
 #include <formula/token.hxx>
 #include <o3tl/make_unique.hxx>
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 114b132d797f..fc9f253e72fd 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -63,6 +63,7 @@
 #include <editeng/editstat.hxx>
 
 #include <cstdio>
+#include <refdata.hxx>
 
 using ::com::sun::star::i18n::LocaleDataItem2;
 
diff --git a/sc/source/core/data/formulaiter.cxx b/sc/source/core/data/formulaiter.cxx
index ac5369285b49..bd37a4bc2163 100644
--- a/sc/source/core/data/formulaiter.cxx
+++ b/sc/source/core/data/formulaiter.cxx
@@ -22,6 +22,7 @@
 #include <formulacell.hxx>
 #include <tokenarray.hxx>
 #include <formula/token.hxx>
+#include <token.hxx>
 
 using namespace formula;
 
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index adaf36c92ceb..c6627ab126d0 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -52,6 +52,7 @@
 #include <rowheightcontext.hxx>
 
 #include <formula/vectortoken.hxx>
+#include <token.hxx>
 
 #include <vector>
 #include <memory>
diff --git a/sc/source/core/tool/consoli.cxx b/sc/source/core/tool/consoli.cxx
index bc0bd265bb70..dc085b19882f 100644
--- a/sc/source/core/tool/consoli.cxx
+++ b/sc/source/core/tool/consoli.cxx
@@ -25,6 +25,7 @@
 #include <formulacell.hxx>
 #include <tokenarray.hxx>
 #include <osl/diagnose.h>
+#include <refdata.hxx>
 
 #include <math.h>
 #include <string.h>
diff --git a/sc/source/core/tool/formularesult.cxx b/sc/source/core/tool/formularesult.cxx
index 1b3fcd995f8a..c1ed01516113 100644
--- a/sc/source/core/tool/formularesult.cxx
+++ b/sc/source/core/tool/formularesult.cxx
@@ -9,6 +9,7 @@
 
 #include <formularesult.hxx>
 #include <scmatrix.hxx>
+#include <token.hxx>
 
 namespace sc {
 
diff --git a/sc/source/core/tool/sharedformula.cxx b/sc/source/core/tool/sharedformula.cxx
index ea55273bbc7c..e18e1adf09b4 100644
--- a/sc/source/core/tool/sharedformula.cxx
+++ b/sc/source/core/tool/sharedformula.cxx
@@ -13,6 +13,7 @@
 #include <listenercontext.hxx>
 #include <document.hxx>
 #include <grouparealistener.hxx>
+#include <refdata.hxx>
 
 namespace sc {