From 77450fa1c9b7cb3acb19b23ff3b4ed7bc2b7c7a1 Mon Sep 17 00:00:00 2001
From: Gabor Kelemen <kelemen.gabor2@nisz.hu>
Date: Wed, 15 May 2019 23:05:02 +0200
Subject: tdf#42949 Fix IWYU warnings in sccomp/

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: Ie2d1a6dad1dc17777f05aa033ea5fed1807261ce
Reviewed-on: https://gerrit.libreoffice.org/72636
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
---
 sccomp/IwyuFilter_sccomp.yaml            | 8 ++++++++
 sccomp/qa/unit/SwarmSolverTest.cxx       | 7 -------
 sccomp/qa/unit/solver.cxx                | 4 ----
 sccomp/source/solver/CoinMPSolver.cxx    | 3 ++-
 sccomp/source/solver/LpsolveSolver.cxx   | 5 ++---
 sccomp/source/solver/SolverComponent.cxx | 3 ---
 sccomp/source/solver/SolverComponent.hxx | 3 ++-
 sccomp/source/solver/SwarmSolver.cxx     | 6 +++++-
 8 files changed, 19 insertions(+), 20 deletions(-)
 create mode 100644 sccomp/IwyuFilter_sccomp.yaml

diff --git a/sccomp/IwyuFilter_sccomp.yaml b/sccomp/IwyuFilter_sccomp.yaml
new file mode 100644
index 000000000000..9c8634e83c26
--- /dev/null
+++ b/sccomp/IwyuFilter_sccomp.yaml
@@ -0,0 +1,8 @@
+---
+assumeFilename: sccomp/source/solver/SolverComponent.cxx
+blacklist:
+    sccomp/source/solver/SolverComponent.hxx:
+    # Base class needs full type
+    - com/sun/star/sheet/XSolver.hpp
+    - com/sun/star/sheet/XSolverDescription.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
diff --git a/sccomp/qa/unit/SwarmSolverTest.cxx b/sccomp/qa/unit/SwarmSolverTest.cxx
index b7bd3025373e..90422e520197 100644
--- a/sccomp/qa/unit/SwarmSolverTest.cxx
+++ b/sccomp/qa/unit/SwarmSolverTest.cxx
@@ -9,20 +9,13 @@
 
 #include <sal/config.h>
 
-#include <com/sun/star/container/XContentEnumerationAccess.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/sheet/XSolver.hpp>
-#include <com/sun/star/sheet/XSolverDescription.hpp>
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
 #include <com/sun/star/sheet/XSpreadsheet.hpp>
-#include <com/sun/star/text/XTextRange.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
 #include <test/calc_unoapi_test.hxx>
 
-#include <address.hxx>
-
 using namespace css;
 
 namespace
diff --git a/sccomp/qa/unit/solver.cxx b/sccomp/qa/unit/solver.cxx
index 76d94fee88c3..9355733c36d2 100644
--- a/sccomp/qa/unit/solver.cxx
+++ b/sccomp/qa/unit/solver.cxx
@@ -9,15 +9,11 @@
 
 #include <sal/config.h>
 
-#include <com/sun/star/container/XContentEnumerationAccess.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/sheet/XSolver.hpp>
 #include <com/sun/star/sheet/XSolverDescription.hpp>
 #include <test/bootstrapfixture.hxx>
 
-#include <address.hxx>
-
 using namespace css;
 
 namespace {
diff --git a/sccomp/source/solver/CoinMPSolver.cxx b/sccomp/source/solver/CoinMPSolver.cxx
index d227e48d5f0f..cd2973580997 100644
--- a/sccomp/source/solver/CoinMPSolver.cxx
+++ b/sccomp/source/solver/CoinMPSolver.cxx
@@ -25,13 +25,14 @@
 
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/table/CellAddress.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <rtl/math.hxx>
 #include <stdexcept>
 #include <vector>
 #include <float.h>
 
+namespace com::sun::star::uno { class XComponentContext; }
+
 using namespace com::sun::star;
 
 class CoinMPSolver : public SolverComponent
diff --git a/sccomp/source/solver/LpsolveSolver.cxx b/sccomp/source/solver/LpsolveSolver.cxx
index 0eb7d08dafd6..e20434a8cb46 100644
--- a/sccomp/source/solver/LpsolveSolver.cxx
+++ b/sccomp/source/solver/LpsolveSolver.cxx
@@ -37,7 +37,6 @@
  ************************************************************************/
 
 #include <sal/config.h>
-#include <config_lgpl.h>
 
 #undef LANGUAGE_NONE
 #if defined _WIN32
@@ -57,12 +56,12 @@
 
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/table/CellAddress.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <rtl/math.hxx>
-#include <cppuhelper/supportsservice.hxx>
 #include <memory>
 #include <vector>
 
+namespace com::sun::star::uno { class XComponentContext; }
+
 using namespace com::sun::star;
 
 class LpsolveSolver : public SolverComponent
diff --git a/sccomp/source/solver/SolverComponent.cxx b/sccomp/source/solver/SolverComponent.cxx
index d279d8feceb4..58ce00adf284 100644
--- a/sccomp/source/solver/SolverComponent.cxx
+++ b/sccomp/source/solver/SolverComponent.cxx
@@ -26,11 +26,8 @@
 #include <com/sun/star/table/CellAddress.hpp>
 
 #include <cppuhelper/supportsservice.hxx>
-#include <vector>
 
 #include <unotools/resmgr.hxx>
-#include <vcl/settings.hxx>
-#include <vcl/svapp.hxx>
 
 using namespace com::sun::star;
 
diff --git a/sccomp/source/solver/SolverComponent.hxx b/sccomp/source/solver/SolverComponent.hxx
index 21b646731e0c..d4ead6889291 100644
--- a/sccomp/source/solver/SolverComponent.hxx
+++ b/sccomp/source/solver/SolverComponent.hxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/sheet/XSolver.hpp>
 #include <com/sun/star/sheet/XSolverDescription.hpp>
 #include <com/sun/star/table/CellAddress.hpp>
-#include <com/sun/star/table/XCell.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/broadcasthelper.hxx>
@@ -32,6 +31,8 @@
 
 #include <unordered_map>
 
+namespace com::sun::star::table { class XCell; }
+
 // hash map for the coefficients of a dependent cell (objective or constraint)
 // The size of each vector is the number of columns (variable cells) plus one, first entry is initial value.
 
diff --git a/sccomp/source/solver/SwarmSolver.cxx b/sccomp/source/solver/SwarmSolver.cxx
index ac2d15bd29d1..e342658dea77 100644
--- a/sccomp/source/solver/SwarmSolver.cxx
+++ b/sccomp/source/solver/SwarmSolver.cxx
@@ -11,7 +11,6 @@
 #include <sal/config.h>
 
 #include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
 #include <com/sun/star/sheet/XSpreadsheet.hpp>
@@ -43,6 +42,11 @@
 
 #include <strings.hrc>
 
+namespace com::sun::star::uno
+{
+class XComponentContext;
+}
+
 using namespace css;
 
 namespace
-- 
cgit