From c4ab578198aaa177b693ec9fc8b67b74f2ca9ba2 Mon Sep 17 00:00:00 2001
From: Gabor Kelemen <kelemen.gabor2@nisz.hu>
Date: Wed, 15 May 2019 19:52:00 +0200
Subject: tdf#42949 Fix IWYU warnings in scaddins/

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

Change-Id: I6b39bd25e243ab0f39847f6feb0b767d7358bf0f
Reviewed-on: https://gerrit.libreoffice.org/72635
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
---
 scaddins/IwyuFilter_scaddins.yaml           | 25 +++++++++++++++++++++++++
 scaddins/source/analysis/analysis.cxx       |  6 ++----
 scaddins/source/analysis/analysis.hxx       |  9 ++-------
 scaddins/source/analysis/analysishelper.cxx |  3 ++-
 scaddins/source/analysis/analysishelper.hxx | 17 ++++-------------
 scaddins/source/analysis/bessel.cxx         |  4 +++-
 scaddins/source/analysis/bessel.hxx         |  2 --
 scaddins/source/analysis/financial.cxx      |  1 +
 scaddins/source/datefunc/datefunc.cxx       |  2 +-
 scaddins/source/datefunc/datefunc.hxx       |  4 ++--
 scaddins/source/pricing/pricing.cxx         |  1 -
 scaddins/source/pricing/pricing.hxx         |  4 ++--
 12 files changed, 44 insertions(+), 34 deletions(-)
 create mode 100644 scaddins/IwyuFilter_scaddins.yaml

(limited to 'scaddins')

diff --git a/scaddins/IwyuFilter_scaddins.yaml b/scaddins/IwyuFilter_scaddins.yaml
new file mode 100644
index 000000000000..f9bb348e5457
--- /dev/null
+++ b/scaddins/IwyuFilter_scaddins.yaml
@@ -0,0 +1,25 @@
+---
+assumeFilename: scaddins/source/analysis/analysis.cxx
+blacklist:
+    scaddins/source/analysis/analysis.hxx:
+    # Base class needs complete type
+    - com/sun/star/lang/XServiceInfo.hpp
+    - com/sun/star/lang/XServiceName.hpp
+    - com/sun/star/sheet/addin/XAnalysis.hpp
+    - com/sun/star/sheet/XAddIn.hpp
+    - com/sun/star/sheet/XCompatibilityNames.hpp
+    scaddins/source/datefunc/datefunc.hxx:
+    # Base class needs complete type
+    - com/sun/star/lang/XServiceInfo.hpp
+    - com/sun/star/lang/XServiceName.hpp
+    - com/sun/star/sheet/addin/XDateFunctions.hpp
+    - com/sun/star/sheet/addin/XMiscFunctions.hpp
+    - com/sun/star/sheet/XAddIn.hpp
+    - com/sun/star/sheet/XCompatibilityNames.hpp
+    scaddins/source/pricing/pricing.hxx:
+    # Base class needs complete type
+    - com/sun/star/lang/XServiceInfo.hpp
+    - com/sun/star/lang/XServiceName.hpp
+    - com/sun/star/sheet/addin/XPricingFunctions.hpp
+    - com/sun/star/sheet/XAddIn.hpp
+    - com/sun/star/sheet/XCompatibilityNames.hpp
diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx
index db051847789d..3587d859c2d6 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include "analysisdefs.hxx"
 #include "analysis.hxx"
-#include <strings.hrc>
 #include "bessel.hxx"
 #include <cppuhelper/factory.hxx>
 #include <comphelper/processfactory.hxx>
@@ -26,12 +26,10 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <o3tl/any.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <rtl/math.hxx>
 #include <sal/macros.h>
-#include <string.h>
 #include <unotools/resmgr.hxx>
-#include <unotools/charclass.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <algorithm>
 #include <cmath>
 #include <float.h>
diff --git a/scaddins/source/analysis/analysis.hxx b/scaddins/source/analysis/analysis.hxx
index c90c265abc82..ec82f509471c 100644
--- a/scaddins/source/analysis/analysis.hxx
+++ b/scaddins/source/analysis/analysis.hxx
@@ -24,22 +24,17 @@
 #include <com/sun/star/sheet/XAddIn.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/sheet/addin/XAnalysis.hpp>
-#include <com/sun/star/sheet/LocalizedName.hpp>
 #include <com/sun/star/sheet/XCompatibilityNames.hpp>
-#include <com/sun/star/sheet/NoConvergenceException.hpp>
 
 #include <cppuhelper/implbase.hxx>
 
-#include "analysisdefs.hxx"
 #include "analysishelper.hxx"
 
 #include <memory>
 
-namespace sca { namespace analysis {
-    class ConvertDataList;
-} }
+namespace com::sun::star::lang { class XMultiServiceFactory; }
+namespace com::sun::star::sheet { struct LocalizedName; }
 
 css::uno::Reference< css::uno::XInterface > AnalysisAddIn_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& );
 
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index 40cfd180fb71..c44c55f763db 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/XNumberFormatTypes.hpp>
 #include <com/sun/star/util/NumberFormatter.hpp>
 
@@ -24,9 +25,9 @@
 #include <stdio.h>
 #include <o3tl/any.hxx>
 #include <rtl/math.hxx>
-#include <sal/macros.h>
 #include <algorithm>
 #include <memory>
+#include "analysisdefs.hxx"
 #include "analysishelper.hxx"
 #include <analysis.hrc>
 #include <strings.hrc>
diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx
index 5e58a2af8fb1..627315bb11f6 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -20,23 +20,16 @@
 #define INCLUDED_SCADDINS_SOURCE_ANALYSIS_ANALYSISHELPER_HXX
 
 
-#include <com/sun/star/lang/XServiceName.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/util/Date.hpp>
-#include <com/sun/star/util/XNumberFormatter2.hpp>
-#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
-#include <com/sun/star/sheet/XAddIn.hpp>
-#include <com/sun/star/sheet/addin/XAnalysis.hpp>
+#include <com/sun/star/uno/Reference.hxx>
 
 #include <math.h>
 
-#include "analysisdefs.hxx"
-
 #include <memory>
 #include <vector>
 
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::util { class XNumberFormatter2; }
 
 namespace sca { namespace analysis {
 
@@ -507,8 +500,6 @@ enum ConvertDataClass
 #define INV_MATCHLEV        1764                    // guess, what this is... :-)
 
 
-class ConvertDataList;
-
 class ConvertData
 {
 protected:
diff --git a/scaddins/source/analysis/bessel.cxx b/scaddins/source/analysis/bessel.cxx
index ef8cffacbd44..ab87ca0e10ce 100644
--- a/scaddins/source/analysis/bessel.cxx
+++ b/scaddins/source/analysis/bessel.cxx
@@ -18,10 +18,12 @@
  */
 
 #include "bessel.hxx"
-#include "analysishelper.hxx"
 
 #include <rtl/math.hxx>
 
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <com/sun/star/sheet/NoConvergenceException.hpp>
+
 using ::com::sun::star::lang::IllegalArgumentException;
 using ::com::sun::star::sheet::NoConvergenceException;
 
diff --git a/scaddins/source/analysis/bessel.hxx b/scaddins/source/analysis/bessel.hxx
index cfb8a5a88c8a..7aea95707829 100644
--- a/scaddins/source/analysis/bessel.hxx
+++ b/scaddins/source/analysis/bessel.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_SCADDINS_SOURCE_ANALYSIS_BESSEL_HXX
 #define INCLUDED_SCADDINS_SOURCE_ANALYSIS_BESSEL_HXX
 
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/sheet/NoConvergenceException.hpp>
 #include <sal/types.h>
 
 namespace sca {
diff --git a/scaddins/source/analysis/financial.cxx b/scaddins/source/analysis/financial.cxx
index 3ae91c8cfb59..63ad2085b349 100644
--- a/scaddins/source/analysis/financial.cxx
+++ b/scaddins/source/analysis/financial.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include "analysisdefs.hxx"
 #include "analysis.hxx"
 #include "analysishelper.hxx"
 #include <o3tl/temporary.hxx>
diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx
index 860b63571780..3011ccb32480 100644
--- a/scaddins/source/datefunc/datefunc.cxx
+++ b/scaddins/source/datefunc/datefunc.cxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <rtl/ustrbuf.hxx>
 #include <unotools/resmgr.hxx>
-#include <unotools/charclass.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <algorithm>
 #include "deffuncname.hxx"
 
diff --git a/scaddins/source/datefunc/datefunc.hxx b/scaddins/source/datefunc/datefunc.hxx
index 10e98c0c8e30..967837e35e06 100644
--- a/scaddins/source/datefunc/datefunc.hxx
+++ b/scaddins/source/datefunc/datefunc.hxx
@@ -22,18 +22,18 @@
 #ifndef INCLUDED_SCADDINS_SOURCE_DATEFUNC_DATEFUNC_HXX
 #define INCLUDED_SCADDINS_SOURCE_DATEFUNC_DATEFUNC_HXX
 
-#include <string.h>
 #include <vector>
 #include <memory>
 #include <com/sun/star/lang/XServiceName.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/sheet/XAddIn.hpp>
 #include <com/sun/star/sheet/XCompatibilityNames.hpp>
 #include <com/sun/star/sheet/addin/XDateFunctions.hpp>
 #include <com/sun/star/sheet/addin/XMiscFunctions.hpp>
 #include <cppuhelper/implbase.hxx>
 
+namespace com::sun::star::lang { class XMultiServiceFactory; }
+
 enum class ScaCategory
 {
     DateTime,
diff --git a/scaddins/source/pricing/pricing.cxx b/scaddins/source/pricing/pricing.cxx
index 58ce64fb2ce5..88987d84bc96 100644
--- a/scaddins/source/pricing/pricing.cxx
+++ b/scaddins/source/pricing/pricing.cxx
@@ -33,7 +33,6 @@
 #include <iostream>
 #include <algorithm>
 #include <rtl/math.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <unotools/resmgr.hxx>
 #include <i18nlangtag/languagetag.hxx>
 
diff --git a/scaddins/source/pricing/pricing.hxx b/scaddins/source/pricing/pricing.hxx
index 76257fbd8e78..daed4c53ef2d 100644
--- a/scaddins/source/pricing/pricing.hxx
+++ b/scaddins/source/pricing/pricing.hxx
@@ -28,17 +28,17 @@
 #define INCLUDED_SCADDINS_SOURCE_PRICING_PRICING_HXX
 
 
-#include <string.h>
 #include <vector>
 #include <memory>
 #include <com/sun/star/lang/XServiceName.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/sheet/XAddIn.hpp>
 #include <com/sun/star/sheet/XCompatibilityNames.hpp>
 #include <com/sun/star/sheet/addin/XPricingFunctions.hpp>
 #include <cppuhelper/implbase.hxx>
 
+namespace com::sun::star::lang { class XMultiServiceFactory; }
+
 #define RETURN_FINITE(d)    if( !::rtl::math::isFinite( d ) ) throw css::lang::IllegalArgumentException(); return d;
 
 
-- 
cgit v1.2.3