From 67478f9d637096781c9e3df64896b1ddaccc331b Mon Sep 17 00:00:00 2001
From: Gabor Kelemen <kelemeng@ubuntu.com>
Date: Thu, 20 Jan 2022 20:54:56 +0100
Subject: Recheck modules [i-l]* with IWYU

See tdf#42949 for motivation

Change-Id: I758bb27e93779e3df21c463714e49354748f446f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128715
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
---
 lingucomponent/IwyuFilter_lingucomponent.yaml        | 20 ++++++++++++++++++++
 .../source/hyphenator/hyphen/hyphenimp.cxx           |  5 -----
 lingucomponent/source/languageguessing/guess.cxx     |  1 -
 lingucomponent/source/languageguessing/guesslang.cxx |  1 -
 .../source/languageguessing/simpleguesser.cxx        |  4 ----
 .../source/languageguessing/simpleguesser.hxx        |  2 --
 lingucomponent/source/lingutil/lingutil.hxx          |  2 --
 lingucomponent/source/numbertext/numbertext.cxx      |  5 -----
 lingucomponent/source/spellcheck/spell/sspellimp.cxx |  7 +------
 lingucomponent/source/spellcheck/spell/sspellimp.hxx |  9 +++------
 lingucomponent/source/thesaurus/libnth/nthesimp.cxx  |  6 ------
 11 files changed, 24 insertions(+), 38 deletions(-)
 create mode 100644 lingucomponent/IwyuFilter_lingucomponent.yaml

(limited to 'lingucomponent')

diff --git a/lingucomponent/IwyuFilter_lingucomponent.yaml b/lingucomponent/IwyuFilter_lingucomponent.yaml
new file mode 100644
index 000000000000..ebea8246ccca
--- /dev/null
+++ b/lingucomponent/IwyuFilter_lingucomponent.yaml
@@ -0,0 +1,20 @@
+---
+assumeFilename: lingucomponent/source/spellcheck/spell/sspellimp.cxx
+excludelist:
+    lingucomponent/source/lingutil/lingutil.hxx:
+    # Needed on WIN
+    - rtl/string.hxx
+    lingucomponent/source/languageguessing/guesslang.cxx:
+    # Needed for code protected by EXTTEXTCAT_VERSION_MAJOR
+    - libexttextcat/textcat.h
+    - tools/debug.hxx
+    - sal/macros.h
+    lingucomponent/source/numbertext/numbertext.cxx:
+    # Needed on WIN
+    - o3tl/char16_t2wchar_t.hxx
+    lingucomponent/source/spellcheck/spell/sspellimp.cxx:
+    # Needed for SpellFailure::SPELLING_ERROR
+    - com/sun/star/linguistic2/SpellFailure.hpp
+    lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx:
+    # Actually used
+    - com/sun/star/linguistic2/XLinguProperties.hpp
diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
index 3163b631e9cd..9ccc1210956a 100644
--- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
@@ -23,8 +23,6 @@
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weak.hxx>
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/linguistic2/XLinguProperties.hpp>
 #include <i18nlangtag/languagetag.hxx>
 #include <tools/debug.hxx>
@@ -40,12 +38,9 @@
 #include <rtl/textenc.h>
 #include <sal/log.hxx>
 
-#include <linguistic/lngprops.hxx>
 #include <linguistic/misc.hxx>
 #include <svtools/strings.hrc>
 #include <unotools/charclass.hxx>
-#include <unotools/pathoptions.hxx>
-#include <unotools/useroptions.hxx>
 #include <unotools/lingucfg.hxx>
 #include <unotools/resmgr.hxx>
 #include <osl/file.hxx>
diff --git a/lingucomponent/source/languageguessing/guess.cxx b/lingucomponent/source/languageguessing/guess.cxx
index e6eb506eb6fe..a7cbeccabc98 100644
--- a/lingucomponent/source/languageguessing/guess.cxx
+++ b/lingucomponent/source/languageguessing/guess.cxx
@@ -20,7 +20,6 @@
 #include <sal/config.h>
 
 #include <cassert>
-#include <iostream>
 #include <string.h>
 
 #ifdef SYSTEM_LIBEXTTEXTCAT
diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx
index 987642538f0e..d6d5803a51a7 100644
--- a/lingucomponent/source/languageguessing/guesslang.cxx
+++ b/lingucomponent/source/languageguessing/guesslang.cxx
@@ -26,7 +26,6 @@
 
 #include <sal/config.h>
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
diff --git a/lingucomponent/source/languageguessing/simpleguesser.cxx b/lingucomponent/source/languageguessing/simpleguesser.cxx
index 8c370b576315..7b4d9f1119ad 100644
--- a/lingucomponent/source/languageguessing/simpleguesser.cxx
+++ b/lingucomponent/source/languageguessing/simpleguesser.cxx
@@ -28,21 +28,17 @@
   */
 
 #include <string.h>
-#include <sstream>
-#include <iostream>
 
 #ifdef SYSTEM_LIBEXTTEXTCAT
 #include <libexttextcat/textcat.h>
 #include <libexttextcat/common.h>
 #include <libexttextcat/constants.h>
 #include <libexttextcat/fingerprint.h>
-#include <libexttextcat/utf8misc.h>
 #else
 #include <textcat.h>
 #include <common.h>
 #include <constants.h>
 #include <fingerprint.h>
-#include <utf8misc.h>
 #endif
 
 #include <sal/types.h>
diff --git a/lingucomponent/source/languageguessing/simpleguesser.hxx b/lingucomponent/source/languageguessing/simpleguesser.hxx
index d6b88d1d67b9..aec5442853b1 100644
--- a/lingucomponent/source/languageguessing/simpleguesser.hxx
+++ b/lingucomponent/source/languageguessing/simpleguesser.hxx
@@ -19,9 +19,7 @@
 #ifndef INCLUDED_LINGUCOMPONENT_SOURCE_LANGUAGEGUESSING_SIMPLEGUESSER_HXX
 #define INCLUDED_LINGUCOMPONENT_SOURCE_LANGUAGEGUESSING_SIMPLEGUESSER_HXX
 
-#include <string.h>
 #include <string>
-#include <cstdlib>
 #include <vector>
 #include "guess.hxx"
 
diff --git a/lingucomponent/source/lingutil/lingutil.hxx b/lingucomponent/source/lingutil/lingutil.hxx
index 984b5e2e8902..4c4fe15ec47f 100644
--- a/lingucomponent/source/lingutil/lingutil.hxx
+++ b/lingucomponent/source/lingutil/lingutil.hxx
@@ -20,9 +20,7 @@
 #ifndef INCLUDED_LINGUCOMPONENT_SOURCE_LINGUTIL_LINGUTIL_HXX
 #define INCLUDED_LINGUCOMPONENT_SOURCE_LINGUTIL_LINGUTIL_HXX
 
-#include <com/sun/star/lang/Locale.hpp>
 #include <rtl/string.hxx>
-#include <rtl/ustring.hxx>
 
 #include <vector>
 
diff --git a/lingucomponent/source/numbertext/numbertext.cxx b/lingucomponent/source/numbertext/numbertext.cxx
index f878a55f591c..79c8e6810041 100644
--- a/lingucomponent/source/numbertext/numbertext.cxx
+++ b/lingucomponent/source/numbertext/numbertext.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <iostream>
 #include <mutex>
 
 #include <osl/file.hxx>
@@ -26,19 +25,15 @@
 
 #include <sal/config.h>
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
 #include <i18nlangtag/languagetag.hxx>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/linguistic2/XNumberText.hpp>
 #include <unotools/pathoptions.hxx>
 #include <osl/thread.h>
 
-#include <sal/macros.h>
-
 #include <Numbertext.hxx>
 
 using namespace ::osl;
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index 843dcfb28585..95b264157533 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -23,12 +23,9 @@
 #include <com/sun/star/linguistic2/XLinguProperties.hpp>
 #include <comphelper/lok.hxx>
 #include <comphelper/processfactory.hxx>
-#include <cppuhelper/factory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weak.hxx>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
 #include <tools/debug.hxx>
 #include <osl/mutex.hxx>
 #include <osl/thread.h>
@@ -38,14 +35,12 @@
 #include <hunspell.hxx>
 #include "sspellimp.hxx"
 
-#include <linguistic/lngprops.hxx>
+#include <linguistic/misc.hxx>
 #include <linguistic/spelldta.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <svtools/strings.hrc>
-#include <unotools/pathoptions.hxx>
 #include <unotools/lingucfg.hxx>
 #include <unotools/resmgr.hxx>
-#include <unotools/useroptions.hxx>
 #include <osl/file.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/textenc.h>
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.hxx b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
index c4c002b9ead1..000f1756f5bc 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.hxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
@@ -25,25 +25,22 @@
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceDisplayName.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/PropertyValues.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/linguistic2/XSpellChecker.hpp>
 #include <com/sun/star/linguistic2/XLinguServiceEventBroadcaster.hpp>
 
-#include <linguistic/misc.hxx>
 #include <linguistic/lngprophelp.hxx>
 
-#include <lingutil.hxx>
 #include <memory>
 
+#include <hunspell.hxx>
+
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::linguistic2;
 
-class Hunspell;
-
 class SpellChecker :
     public cppu::WeakImplHelper
     <
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
index 6fc64f781267..ca29cca2ac52 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
@@ -21,9 +21,6 @@
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weak.hxx>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/linguistic2/LinguServiceManager.hpp>
 #include <com/sun/star/linguistic2/XLinguProperties.hpp>
 #include <com/sun/star/linguistic2/XSpellChecker1.hpp>
@@ -34,19 +31,16 @@
 #include <comphelper/sequence.hxx>
 #include <osl/mutex.hxx>
 #include <osl/thread.h>
-#include <unotools/pathoptions.hxx>
 #include <unotools/lingucfg.hxx>
 #include <unotools/resmgr.hxx>
 
 #include <rtl/string.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <rtl/textenc.h>
 
 #include <svtools/strings.hrc>
 
 #include "nthesimp.hxx"
 #include <linguistic/misc.hxx>
-#include <linguistic/lngprops.hxx>
 #include "nthesdta.hxx"
 
 #include <vector>
-- 
cgit