tdf#42949 Fix IWYU warnings in comphelper

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

Also re-evaluate some blacklisted headers and recheck include/comphelper/

Change-Id: Ib7eea5951e849c07cea2e2782be4e8945f71ad96
Reviewed-on: https://gerrit.libreoffice.org/70899
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

14 files changed, 53 insertions, 45 deletions

diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index 455c1bc4f6ae..7d09debc7b5f 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -137,15 +137,22 @@ blacklist:
     # base class has to be a complete type
     - com/sun/star/util/XCloneable.hpp
     - com/sun/star/xml/sax/XAttributeList.hpp
-    include/comphelper/componentmodule.hxx:
+    include/comphelper/ChainablePropertySetInfo.hxx:
     # base class has to be a complete type
-    - com/sun/star/lang/XSingleServiceFactory.hpp
-    include/comphelper/configurationhelper.hxx:
-    # Needed for implicit destructor
-    - com/sun/star/uno/Any.hxx
+    - com/sun/star/beans/XPropertySetInfo.hpp
+    include/comphelper/containermultiplexer.hxx:
+    # base class has to be a complete type
+    - com/sun/star/container/XContainerListener.hpp
     include/comphelper/docpasswordrequest.hxx:
     # base class has to be a complete type
     - com/sun/star/task/XInteractionRequest.hpp
+    include/comphelper/enumhelper.hxx:
+    # base class has to be a complete type
+    - com/sun/star/container/XEnumeration.hpp
+    - com/sun/star/lang/XEventListener.hpp
+    include/comphelper/evtlistenerhlp.hxx:
+    # base class has to be a complete type
+    - com/sun/star/lang/XEventListener.hpp
     include/comphelper/interaction.hxx:
     # base class has to be a complete type
     - com/sun/star/task/XInteractionAbort.hpp
@@ -156,6 +163,9 @@ blacklist:
     include/comphelper/SelectionMultiplex.hxx:
     # base class has to be a complete type
     - com/sun/star/view/XSelectionChangeListener.hpp
+    include/comphelper/MasterPropertySetInfo.hxx:
+    # base class has to be a complete type
+    - com/sun/star/beans/XPropertySetInfo.hpp
     include/comphelper/namedvaluecollection.hxx:
     # Needed for template class
     - com/sun/star/beans/PropertyValue.hpp
@@ -167,22 +177,23 @@ blacklist:
     # base class has to be a complete type
     - com/sun/star/io/XInputStream.hpp
     - com/sun/star/io/XOutputStream.hpp
+    include/comphelper/propertysetinfo.hxx:
+    # base class has to be a complete type
+    - com/sun/star/beans/XPropertySetInfo.hpp
     include/comphelper/propmultiplex.hxx:
     # base class has to be a complete type
     - com/sun/star/beans/XPropertyChangeListener.hpp
     include/comphelper/propertystatecontainer.hxx:
     # base class has to be a complete type
     - com/sun/star/beans/XPropertyState.hpp
+    include/comphelper/seekableinput.hxx:
+    # base class has to be a complete type
+    - com/sun/star/io/XInputStream.hpp
+    - com/sun/star/io/XSeekable.hpp
     include/comphelper/seqstream.hxx:
     # base class has to be a complete type
     - com/sun/star/io/XInputStream.hpp
     - com/sun/star/io/XSeekable.hpp
-    include/comphelper/sequence.hxx:
-    # Needed for implicit dtor
-    - com/sun/star/uno/Sequence.hxx
-    include/comphelper/sequenceashashmap.hxx:
-    # Needed for implicit dtor
-    - com/sun/star/uno/Sequence.hxx
     include/comphelper/servicedecl.hxx:
     # base class has to be a complete type
     - com/sun/star/lang/XServiceInfo.hpp
@@ -190,15 +201,16 @@ blacklist:
     include/comphelper/servicehelper.hxx:
     # Needed for macro
     - rtl/instance.hxx
-    include/comphelper/simplefileaccessinteraction.hxx:
-    # base class has to be a complete type
-    - com/sun/star/task/XInteractionHandler.hpp
     include/comphelper/unique_disposing_ptr.hxx:
     # base class has to be a complete type
     - com/sun/star/lang/XServiceInfo.hpp
     include/comphelper/uno3.hxx:
     # Needed for macro
     - comphelper/sequence.hxx
+    include/comphelper/weakeventlistener.hxx:
+    # base class has to be a complete type
+    - com/sun/star/lang/XEventListener.hpp
+    - com/sun/star/lang/XComponent.hpp
     include/basegfx/utils/unopolypolygon.hxx:
     # base class has to be a complete type
     - com/sun/star/lang/XServiceInfo.hpp
diff --git a/include/comphelper/AccessibleImplementationHelper.hxx b/include/comphelper/AccessibleImplementationHelper.hxx
index b2a54d7f02dc..742c56f195bb 100644
--- a/include/comphelper/AccessibleImplementationHelper.hxx
+++ b/include/comphelper/AccessibleImplementationHelper.hxx
@@ -20,12 +20,18 @@
 #ifndef INCLUDED_COMPHELPER_ACESSIBLEIMPLEMENTATIONHELPER_HXX
 #define INCLUDED_COMPHELPER_ACESSIBLEIMPLEMENTATIONHELPER_HXX
 
-#include <com/sun/star/awt/KeyStroke.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
-
 #include <comphelper/comphelperdllapi.h>
 #include <rtl/ustring.hxx>
 
+namespace com::sun::star::awt
+{
+struct KeyStroke;
+}
+namespace com::sun::star::uno
+{
+template <class E> class Sequence;
+}
+
 namespace comphelper
 {
 /**
diff --git a/include/comphelper/DisableInteractionHelper.hxx b/include/comphelper/DisableInteractionHelper.hxx
index da513b9b23eb..c24fdeee40e2 100644
--- a/include/comphelper/DisableInteractionHelper.hxx
+++ b/include/comphelper/DisableInteractionHelper.hxx
@@ -11,7 +11,7 @@
 #define INCLUDED_COMPHELPER_DISABLEINTERACTIONHELPER_HXX
 
 #include <cppuhelper/implbase.hxx>
-#include <uno/current_context.hxx>
+#include <com/sun/star/uno/XCurrentContext.hpp>
 
 namespace comphelper
 {
diff --git a/include/comphelper/IdPropArrayHelper.hxx b/include/comphelper/IdPropArrayHelper.hxx
index 6a0f5b48975d..55598ff1df1a 100644
--- a/include/comphelper/IdPropArrayHelper.hxx
+++ b/include/comphelper/IdPropArrayHelper.hxx
@@ -28,8 +28,6 @@
 #include <rtl/instance.hxx>
 #include <cppuhelper/propshlp.hxx>
 
-namespace cppu { class IPropertyArrayHelper; }
-
 namespace comphelper
 {
 
diff --git a/include/comphelper/SelectionMultiplex.hxx b/include/comphelper/SelectionMultiplex.hxx
index f1a0e294d765..8ac2cecf407a 100644
--- a/include/comphelper/SelectionMultiplex.hxx
+++ b/include/comphelper/SelectionMultiplex.hxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/lang/EventObject.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/comphelperdllapi.h>
-#include <rtl/ref.hxx>
 
 namespace com { namespace sun { namespace star { namespace view { class XSelectionSupplier; } } } }
 
@@ -35,9 +34,6 @@ namespace comphelper
 {
 
 
-    class OSelectionChangeMultiplexer;
-
-
     //= OSelectionChangeListener
 
     /// simple listener adapter for selections
diff --git a/include/comphelper/componentmodule.hxx b/include/comphelper/componentmodule.hxx
index a60c83aee70d..277d0d483edf 100644
--- a/include/comphelper/componentmodule.hxx
+++ b/include/comphelper/componentmodule.hxx
@@ -21,7 +21,6 @@
 
 #include <comphelper/comphelperdllapi.h>
 
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 
 #include <cppuhelper/factory.hxx>
diff --git a/include/comphelper/containermultiplexer.hxx b/include/comphelper/containermultiplexer.hxx
index a896c690d530..b1c4f9dadb5f 100644
--- a/include/comphelper/containermultiplexer.hxx
+++ b/include/comphelper/containermultiplexer.hxx
@@ -20,12 +20,14 @@
 #ifndef INCLUDED_COMPHELPER_CONTAINERMULTIPLEXER_HXX
 #define INCLUDED_COMPHELPER_CONTAINERMULTIPLEXER_HXX
 
-#include <com/sun/star/container/XContainer.hpp>
+#include <com/sun/star/container/XContainerListener.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <osl/mutex.hxx>
 #include <comphelper/comphelperdllapi.h>
 #include <rtl/ref.hxx>
 
+namespace osl { class Mutex; }
+namespace com::sun::star::container { class XContainer; }
+
 
 namespace comphelper
 {
diff --git a/include/comphelper/enumhelper.hxx b/include/comphelper/enumhelper.hxx
index 2de51f332782..32d2427267ca 100644
--- a/include/comphelper/enumhelper.hxx
+++ b/include/comphelper/enumhelper.hxx
@@ -20,15 +20,15 @@
 #ifndef INCLUDED_COMPHELPER_ENUMHELPER_HXX
 #define INCLUDED_COMPHELPER_ENUMHELPER_HXX
 
-#include <vector>
-#include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XEnumeration.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <osl/mutex.hxx>
 #include <comphelper/comphelperdllapi.h>
 
+namespace com::sun::star::container { class XIndexAccess; }
+namespace com::sun::star::container { class XNameAccess; }
+
 namespace comphelper
 {
 
diff --git a/include/comphelper/evtlistenerhlp.hxx b/include/comphelper/evtlistenerhlp.hxx
index a640a79294bc..004ceb9def23 100644
--- a/include/comphelper/evtlistenerhlp.hxx
+++ b/include/comphelper/evtlistenerhlp.hxx
@@ -21,7 +21,6 @@
 
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XEventListener.hpp>
-#include <osl/diagnose.h>
 #include <cppuhelper/weakref.hxx>
 #include <comphelper/comphelperdllapi.h>
 
diff --git a/include/comphelper/logging.hxx b/include/comphelper/logging.hxx
index 8c1ddbd7fec0..e6e793c3c014 100644
--- a/include/comphelper/logging.hxx
+++ b/include/comphelper/logging.hxx
@@ -26,10 +26,9 @@
 #include <boost/optional.hpp>
 #include <memory>
 
-#include <com/sun/star/logging/XLogger.hpp>
-
-namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::uno { template <class interface_type> class Reference; }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::logging { class XLogger; }
 
 namespace comphelper
 {
diff --git a/include/comphelper/proparrhlp.hxx b/include/comphelper/proparrhlp.hxx
index 114efda1734f..5d9cb97f9c11 100644
--- a/include/comphelper/proparrhlp.hxx
+++ b/include/comphelper/proparrhlp.hxx
@@ -26,10 +26,6 @@
 #include <osl/diagnose.h>
 #include <rtl/instance.hxx>
 
-namespace cppu {
-    class IPropertyArrayHelper;
-}
-
 namespace comphelper
 {
 
diff --git a/include/comphelper/seekableinput.hxx b/include/comphelper/seekableinput.hxx
index 3544f0e6cc83..54e2aa884cca 100644
--- a/include/comphelper/seekableinput.hxx
+++ b/include/comphelper/seekableinput.hxx
@@ -21,12 +21,13 @@
 
 #include <osl/mutex.hxx>
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XSeekable.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/comphelperdllapi.h>
 
+namespace com::sun::star::uno { class XComponentContext; }
+
 namespace comphelper
 {
 
diff --git a/include/comphelper/stillreadwriteinteraction.hxx b/include/comphelper/stillreadwriteinteraction.hxx
index 11b0f12c4e69..6bd1d8c6f744 100644
--- a/include/comphelper/stillreadwriteinteraction.hxx
+++ b/include/comphelper/stillreadwriteinteraction.hxx
@@ -22,10 +22,11 @@
 
 #include <ucbhelper/interceptedinteraction.hxx>
 
-#include <com/sun/star/task/XInteractionHandler.hpp>
-
 #include <comphelper/comphelperdllapi.h>
 
+namespace com::sun::star::task { class XInteractionHandler; }
+namespace com::sun::star::task { class XInteractionRequest; }
+
 
 namespace comphelper{
 class COMPHELPER_DLLPUBLIC StillReadWriteInteraction : public ::ucbhelper::InterceptedInteraction
diff --git a/include/comphelper/weakeventlistener.hxx b/include/comphelper/weakeventlistener.hxx
index b77ab2a30231..ffe367bbfea0 100644
--- a/include/comphelper/weakeventlistener.hxx
+++ b/include/comphelper/weakeventlistener.hxx
@@ -24,10 +24,9 @@
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <comphelper/comphelperdllapi.h>
+#include <com/sun/star/lang/XEventListener.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
 
-
-namespace com { namespace sun { namespace star { namespace lang { class XComponent; } } } }
-namespace com { namespace sun { namespace star { namespace lang { class XEventListener; } } } }
 namespace com { namespace sun { namespace star { namespace uno { class XWeak; } } } }
 
 namespace comphelper