tdf#42949 remove unused compheler includes ..

and fix the fallout

Change-Id: I15bc5d626f4d157cbc69a87392078b41e621d14e
Reviewed-on: https://gerrit.libreoffice.org/54882
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>

14 files changed, 8 insertions, 15 deletions

diff --git a/include/comphelper/accessiblewrapper.hxx b/include/comphelper/accessiblewrapper.hxx
index b37e5a0f8ffb..73643169cd39 100644
--- a/include/comphelper/accessiblewrapper.hxx
+++ b/include/comphelper/accessiblewrapper.hxx
@@ -34,7 +34,6 @@
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/basemutex.hxx>
-#include <comphelper/sequence.hxx>
 #include <comphelper/uno3.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <comphelper/accessibleeventnotifier.hxx>
diff --git a/include/comphelper/evtmethodhelper.hxx b/include/comphelper/evtmethodhelper.hxx
index a4a1bbfc366c..2539ea0b8441 100644
--- a/include/comphelper/evtmethodhelper.hxx
+++ b/include/comphelper/evtmethodhelper.hxx
@@ -18,7 +18,9 @@
  */
 #ifndef INCLUDED_COMPHELPER_EVTMETHODHELPER_HXX
 #define INCLUDED_COMPHELPER_EVTMETHODHELPER_HXX
-#include <comphelper/sequence.hxx>
+
+#include <com/sun/star/uno/Sequence.h>
+#include <comphelper/comphelperdllapi.h>
 
 namespace comphelper
 {
diff --git a/include/comphelper/propmultiplex.hxx b/include/comphelper/propmultiplex.hxx
index d9eb59115b1b..baa5103d5bd8 100644
--- a/include/comphelper/propmultiplex.hxx
+++ b/include/comphelper/propmultiplex.hxx
@@ -20,11 +20,15 @@
 #ifndef INCLUDED_COMPHELPER_PROPMULTIPLEX_HXX
 #define INCLUDED_COMPHELPER_PROPMULTIPLEX_HXX
 
-#include <comphelper/propstate.hxx>
+#include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/comphelperdllapi.h>
 #include <rtl/ref.hxx>
+#include <vector>
 
+namespace com { namespace sun { namespace star { namespace beans {
+    class XPropertySet;
+} } } }
 
 //= property helper classes
 
diff --git a/include/connectivity/dbtools.hxx b/include/connectivity/dbtools.hxx
index 432d5a66fadf..b777635a100b 100644
--- a/include/connectivity/dbtools.hxx
+++ b/include/connectivity/dbtools.hxx
@@ -22,7 +22,6 @@
 
 #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
 #include <connectivity/dbexception.hxx>
-#include <comphelper/types.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <comphelper/stl_types.hxx>
 #include <unotools/sharedunocomponent.hxx>
diff --git a/include/connectivity/sdbcx/VGroup.hxx b/include/connectivity/sdbcx/VGroup.hxx
index 80aa1cb321e6..61722d234e2f 100644
--- a/include/connectivity/sdbcx/VGroup.hxx
+++ b/include/connectivity/sdbcx/VGroup.hxx
@@ -31,7 +31,6 @@
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <connectivity/sdbcx/VCollection.hxx>
-#include <comphelper/propertycontainer.hxx>
 #include <connectivity/sdbcx/IRefreshable.hxx>
 #include <connectivity/sdbcx/VDescriptor.hxx>
 #include <connectivity/dbtoolsdllapi.hxx>
diff --git a/include/editeng/unofield.hxx b/include/editeng/unofield.hxx
index e9cc8865c6b7..604024ef8f7c 100644
--- a/include/editeng/unofield.hxx
+++ b/include/editeng/unofield.hxx
@@ -29,8 +29,6 @@
 #include <cppuhelper/component.hxx>
 #include <editeng/editengdllapi.h>
 
-#include <comphelper/servicehelper.hxx>
-
 #include <editeng/mutxhelp.hxx>
 #include <memory>
 
diff --git a/include/sfx2/lokhelper.hxx b/include/sfx2/lokhelper.hxx
index 08424a90f770..ef50a4bb5167 100644
--- a/include/sfx2/lokhelper.hxx
+++ b/include/sfx2/lokhelper.hxx
@@ -15,7 +15,6 @@
 #include <sfx2/viewsh.hxx>
 #include <cstddef>
 #include <rtl/string.hxx>
-#include <comphelper/lok.hxx>
 
 class SfxViewShell;
 
diff --git a/include/svtools/accessibleruler.hxx b/include/svtools/accessibleruler.hxx
index 2f814bdfa920..4e45ce995374 100644
--- a/include/svtools/accessibleruler.hxx
+++ b/include/svtools/accessibleruler.hxx
@@ -36,7 +36,6 @@
 #include <cppuhelper/interfacecontainer.h>
 #include <cppuhelper/compbase5.hxx>
 #include <cppuhelper/basemutex.hxx>
-#include <comphelper/servicehelper.hxx>
 #include <vcl/vclptr.hxx>
 
 namespace com { namespace sun { namespace star { namespace awt {
diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx
index 89d10a124540..de020cda80fe 100644
--- a/include/svtools/genericunodialog.hxx
+++ b/include/svtools/genericunodialog.hxx
@@ -33,7 +33,6 @@
 
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/propshlp.hxx>
-#include <comphelper/proparrhlp.hxx>
 #include <comphelper/uno3.hxx>
 #include <comphelper/propertycontainer.hxx>
 #include <comphelper/broadcasthelper.hxx>
diff --git a/include/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx
index ce6079103c21..f66ad50c8dbc 100644
--- a/include/svtools/toolboxcontroller.hxx
+++ b/include/svtools/toolboxcontroller.hxx
@@ -34,7 +34,6 @@
 #include <cppuhelper/interfacecontainer.hxx>
 #include <comphelper/broadcasthelper.hxx>
 #include <comphelper/proparrhlp.hxx>
-#include <comphelper/property.hxx>
 #include <comphelper/propertycontainer.hxx>
 #include <cppuhelper/propshlp.hxx>
 #include <tools/link.hxx>
diff --git a/include/test/testinteractionhandler.hxx b/include/test/testinteractionhandler.hxx
index 950127ae185d..e4acac3abbab 100644
--- a/include/test/testinteractionhandler.hxx
+++ b/include/test/testinteractionhandler.hxx
@@ -23,7 +23,6 @@
 
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <comphelper/sequence.hxx>
 
 class TestInteractionHandler : public cppu::WeakImplHelper<css::lang::XServiceInfo,
                                                            css::lang::XInitialization,
diff --git a/include/toolkit/controls/tabpagecontainer.hxx b/include/toolkit/controls/tabpagecontainer.hxx
index baba7498c71f..5e85542c99af 100644
--- a/include/toolkit/controls/tabpagecontainer.hxx
+++ b/include/toolkit/controls/tabpagecontainer.hxx
@@ -29,7 +29,6 @@
 #include <toolkit/controls/unocontrolmodel.hxx>
 #include <toolkit/helper/servicenames.hxx>
 #include <cppuhelper/implbase1.hxx>
-#include <comphelper/sequence.hxx>
 #include <toolkit/controls/controlmodelcontainerbase.hxx>
 #include <toolkit/helper/listenermultiplexer.hxx>
 
diff --git a/include/unotools/accessiblerelationsethelper.hxx b/include/unotools/accessiblerelationsethelper.hxx
index bbbefcd2b1ff..28a43f912bea 100644
--- a/include/unotools/accessiblerelationsethelper.hxx
+++ b/include/unotools/accessiblerelationsethelper.hxx
@@ -29,7 +29,6 @@
 #include <com/sun/star/lang/XServiceName.hpp>
 #include <osl/mutex.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <comphelper/servicehelper.hxx>
 #include <memory>
 
 class AccessibleRelationSetHelperImpl;
diff --git a/include/unotools/accessiblestatesethelper.hxx b/include/unotools/accessiblestatesethelper.hxx
index 4091153df059..38e9a3a69837 100644
--- a/include/unotools/accessiblestatesethelper.hxx
+++ b/include/unotools/accessiblestatesethelper.hxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/lang/XServiceName.hpp>
 #include <osl/mutex.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <comphelper/servicehelper.hxx>
 #include <memory>
 
 class AccessibleStateSetHelperImpl;