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>

39 files changed, 31 insertions, 24 deletions

diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx
index d0f77ca64d13..5f48bdb74f58 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -24,6 +24,7 @@
 
 #include <comphelper/streamsection.hxx>
 #include <comphelper/basicio.hxx>
+#include <comphelper/property.hxx>
 #include <o3tl/any.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/debug.hxx>
diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx
index a6cef2d2605d..667ad43c0734 100644
--- a/forms/source/component/Columns.cxx
+++ b/forms/source/component/Columns.cxx
@@ -32,7 +32,6 @@
 #include <com/sun/star/form/binding/XBindableValue.hpp>
 #include <com/sun/star/beans/XPropertyContainer.hpp>
 #include <com/sun/star/text/XText.hpp>
-#include <comphelper/sequence.hxx>
 #include <comphelper/property.hxx>
 #include <comphelper/basicio.hxx>
 #include <comphelper/servicehelper.hxx>
diff --git a/forms/source/component/Columns.hxx b/forms/source/component/Columns.hxx
index 482a004347b0..e3b4111da6cb 100644
--- a/forms/source/component/Columns.hxx
+++ b/forms/source/component/Columns.hxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/io/XObjectInputStream.hpp>
 #include <com/sun/star/io/XObjectOutputStream.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
 
 #include <comphelper/propagg.hxx>
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index 71b8a25efc58..c0561c5a62d4 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -38,6 +38,7 @@
 #include <com/sun/star/sdb/CommandType.hpp>
 
 #include <comphelper/basicio.hxx>
+#include <comphelper/property.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbconversion.hxx>
 #include <cppuhelper/queryinterface.hxx>
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 77dad35de045..c434543fbace 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -55,6 +55,7 @@
 #include <com/sun/star/util/XModifiable2.hpp>
 
 #include <comphelper/basicio.hxx>
+#include <comphelper/property.hxx>
 #include <comphelper/seqstream.hxx>
 #include <comphelper/sequence.hxx>
 #include <connectivity/dbtools.hxx>
diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx
index 1958a6b1b5b6..211cf216c68d 100644
--- a/forms/source/component/DatabaseForm.hxx
+++ b/forms/source/component/DatabaseForm.hxx
@@ -68,7 +68,6 @@
 #include <listenercontainers.hxx>
 #include <comphelper/propmultiplex.hxx>
 #include <comphelper/uno3.hxx>
-#include <comphelper/proparrhlp.hxx>
 #include <cppuhelper/implbase12.hxx>
 #include <cppuhelper/implbase4.hxx>
 #include <cppuhelper/implbase7.hxx>
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx
index 4e87cdd8c3d4..064bfe7205a0 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.cxx
@@ -36,6 +36,7 @@
 #include <connectivity/formattedcolumnvalue.hxx>
 #include <connectivity/dbconversion.hxx>
 
+#include <comphelper/property.hxx>
 #include <tools/diagnose_ex.h>
 
 using namespace dbtools;
diff --git a/forms/source/component/EditBase.cxx b/forms/source/component/EditBase.cxx
index 4bf9a0fc815b..52f368f54051 100644
--- a/forms/source/component/EditBase.cxx
+++ b/forms/source/component/EditBase.cxx
@@ -22,6 +22,7 @@
 #include <services.hxx>
 #include <tools/debug.hxx>
 #include <comphelper/basicio.hxx>
+#include <comphelper/property.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <frm_resource.hxx>
 #include <strings.hrc>
diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx
index 1b3e698de8d5..281f18e9a476 100644
--- a/forms/source/component/File.cxx
+++ b/forms/source/component/File.cxx
@@ -25,7 +25,7 @@
 #include <cppuhelper/queryinterface.hxx>
 #include <tools/debug.hxx>
 #include <comphelper/basicio.hxx>
-#include <comphelper/guarding.hxx>
+#include <comphelper/property.hxx>
 
 
 namespace frm
diff --git a/forms/source/component/FixedText.cxx b/forms/source/component/FixedText.cxx
index fb35214cf428..34e74d094d70 100644
--- a/forms/source/component/FixedText.cxx
+++ b/forms/source/component/FixedText.cxx
@@ -21,6 +21,8 @@
 #include <services.hxx>
 #include <property.hxx>
 
+#include <comphelper/property.hxx>
+
 
 namespace frm
 {
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 05ed6dc5018d..a28e9ab5bcb6 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -41,7 +41,7 @@
 
 #include <comphelper/basicio.hxx>
 #include <comphelper/guarding.hxx>
-#include <comphelper/listenernotification.hxx>
+#include <comphelper/interfacecontainer2.hxx>
 #include <comphelper/property.hxx>
 #include <connectivity/dbtools.hxx>
 #include <cppuhelper/exc_hlp.hxx>
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index cec040e8c869..c3b2914f7ba7 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -22,6 +22,7 @@
 #include <frm_resource.hxx>
 #include <strings.hrc>
 #include <propertybaghelper.hxx>
+#include <comphelper/property.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/numbers.hxx>
 #include <connectivity/dbtools.hxx>
diff --git a/forms/source/component/FormattedField.hxx b/forms/source/component/FormattedField.hxx
index f64a5c94ff44..8d3f3d16c917 100644
--- a/forms/source/component/FormattedField.hxx
+++ b/forms/source/component/FormattedField.hxx
@@ -22,7 +22,6 @@
 
 #include "EditBase.hxx"
 #include <tools/link.hxx>
-#include <comphelper/propmultiplex.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include "errorbroadcaster.hxx"
 
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index 6b92c9a8b138..03336a91fa08 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/form/XLoadable.hpp>
 #include <com/sun/star/text/WritingMode2.hpp>
 #include <comphelper/basicio.hxx>
+#include <comphelper/property.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <vcl/unohelp.hxx>
 #include <vcl/svapp.hxx>
diff --git a/forms/source/component/Grid.hxx b/forms/source/component/Grid.hxx
index 2e8e77ad1e02..43c3d277d064 100644
--- a/forms/source/component/Grid.hxx
+++ b/forms/source/component/Grid.hxx
@@ -31,7 +31,6 @@
 #include <com/sun/star/sdb/XRowSetChangeBroadcaster.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 
-#include <comphelper/proparrhlp.hxx>
 #include <cppuhelper/implbase7.hxx>
 
 
diff --git a/forms/source/component/GroupBox.cxx b/forms/source/component/GroupBox.cxx
index 4d7d8c25214c..510b993e5fe9 100644
--- a/forms/source/component/GroupBox.cxx
+++ b/forms/source/component/GroupBox.cxx
@@ -20,6 +20,7 @@
 #include "GroupBox.hxx"
 #include <property.hxx>
 #include <services.hxx>
+#include <comphelper/property.hxx>
 #include <tools/debug.hxx>
 
 namespace frm
diff --git a/forms/source/component/GroupManager.cxx b/forms/source/component/GroupManager.cxx
index 199b9a3a6c32..35fd716a47a2 100644
--- a/forms/source/component/GroupManager.cxx
+++ b/forms/source/component/GroupManager.cxx
@@ -21,6 +21,7 @@
 #include <com/sun/star/beans/XFastPropertySet.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
 #include <comphelper/property.hxx>
+#include <comphelper/types.hxx>
 #include <osl/diagnose.h>
 #include <tools/solar.h>
 
@@ -37,6 +38,7 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::form;
 using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::lang;
+using namespace ::comphelper;
 
 namespace
 {
diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx
index a39f91fb6bee..b2966e9ec3cd 100644
--- a/forms/source/component/GroupManager.hxx
+++ b/forms/source/component/GroupManager.hxx
@@ -27,15 +27,12 @@
 #include <com/sun/star/container/XContainerListener.hpp>
 #include <com/sun/star/container/XContainer.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <comphelper/types.hxx>
 
 #include <algorithm>
 #include <map>
 #include <memory>
 #include <vector>
 
-using namespace comphelper;
-
 /*
  * The GroupManager listens at the StarForm for FormComponent insertion and removal as well as
  * its properties "Name" and "TabIndex" and updates its Group using this information.
diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx
index c4531804912d..d127e30cc5ff 100644
--- a/forms/source/component/Hidden.cxx
+++ b/forms/source/component/Hidden.cxx
@@ -22,6 +22,7 @@
 #include <services.hxx>
 #include <tools/debug.hxx>
 #include <comphelper/basicio.hxx>
+#include <comphelper/property.hxx>
 
 
 namespace frm
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index 8e76aefc7d52..b75b08270334 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -50,6 +50,7 @@
 #include <vcl/svapp.hxx>
 #include <unotools/streamhelper.hxx>
 #include <comphelper/guarding.hxx>
+#include <comphelper/property.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <svl/urihelper.hxx>
 
diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx
index 920a459200f9..f72d69cda836 100644
--- a/forms/source/component/ImageControl.hxx
+++ b/forms/source/component/ImageControl.hxx
@@ -26,12 +26,9 @@
 #include <com/sun/star/awt/XMouseListener.hpp>
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
 #include <com/sun/star/graphic/XGraphicObject.hpp>
-#include <comphelper/propmultiplex.hxx>
 #include <cppuhelper/implbase2.hxx>
 #include <rtl/ref.hxx>
 
-using namespace comphelper;
-
 
 namespace frm
 {
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 2b3a6a4a82ba..869c0e9e04ab 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -39,7 +39,7 @@
 #include <com/sun/star/sdb/CommandType.hpp>
 
 #include <comphelper/basicio.hxx>
-#include <comphelper/listenernotification.hxx>
+#include <comphelper/property.hxx>
 #include <comphelper/sequence.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/formattedcolumnvalue.hxx>
diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx
index ee910f0d2578..0fac875bb2a1 100644
--- a/forms/source/component/RadioButton.cxx
+++ b/forms/source/component/RadioButton.cxx
@@ -22,6 +22,7 @@
 #include <property.hxx>
 #include <services.hxx>
 #include <comphelper/basicio.hxx>
+#include <comphelper/property.hxx>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/awt/XVclWindowPeer.hpp>
 
diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx
index d110b36f1524..7d0b389db85b 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -42,7 +42,8 @@
 #include <sfx2/objsh.hxx>
 #include <osl/mutex.hxx>
 #include <services.hxx>
-#include <comphelper/listenernotification.hxx>
+#include <comphelper/interfacecontainer2.hxx>
+#include <comphelper/property.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <svtools/imageresourceaccess.hxx>
 #define LOCAL_URL_PREFIX    '#'
diff --git a/forms/source/component/findpos.cxx b/forms/source/component/findpos.cxx
index 62a8f26b6b9b..02d63f7bce38 100644
--- a/forms/source/component/findpos.cxx
+++ b/forms/source/component/findpos.cxx
@@ -23,7 +23,6 @@
 #include "findpos.hxx"
 
 #include <com/sun/star/uno/Sequence.hxx>
-#include <comphelper/types.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
diff --git a/forms/source/component/navigationbar.hxx b/forms/source/component/navigationbar.hxx
index 6cc028c6b8e5..e9ebb688c402 100644
--- a/forms/source/component/navigationbar.hxx
+++ b/forms/source/component/navigationbar.hxx
@@ -22,7 +22,6 @@
 
 #include <FormComponent.hxx>
 #include <com/sun/star/io/XPersistObject.hpp>
-#include <comphelper/proparrhlp.hxx>
 #include <comphelper/propertycontainerhelper.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
diff --git a/forms/source/component/refvaluecomponent.cxx b/forms/source/component/refvaluecomponent.cxx
index 760fd6f9c164..8321db5785cf 100644
--- a/forms/source/component/refvaluecomponent.cxx
+++ b/forms/source/component/refvaluecomponent.cxx
@@ -19,6 +19,7 @@
 
 #include "refvaluecomponent.hxx"
 
+#include <comphelper/property.hxx>
 #include <tools/diagnose_ex.h>
 
 #include <vector>
diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx
index 957167f83718..1d8e1aacc988 100644
--- a/forms/source/component/scrollbar.cxx
+++ b/forms/source/component/scrollbar.cxx
@@ -18,6 +18,7 @@
  */
 
 #include "scrollbar.hxx"
+#include <comphelper/property.hxx>
 #include <comphelper/streamsection.hxx>
 #include <comphelper/basicio.hxx>
 #include <rtl/math.hxx>
diff --git a/forms/source/component/spinbutton.cxx b/forms/source/component/spinbutton.cxx
index 164cce42319e..3156418a4b43 100644
--- a/forms/source/component/spinbutton.cxx
+++ b/forms/source/component/spinbutton.cxx
@@ -19,6 +19,7 @@
 
 #include "spinbutton.hxx"
 #include "scrollbar.hxx"
+#include <comphelper/property.hxx>
 #include <comphelper/streamsection.hxx>
 #include <comphelper/basicio.hxx>
 
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx
index bef6e81ec25d..38ed4a08f3a7 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -53,6 +53,7 @@
 #include <com/sun/star/sdbc/XRowSet.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/uno/XAggregation.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/util/XModifyListener.hpp>
 #include <com/sun/star/form/XLoadable.hpp>
@@ -60,7 +61,6 @@
 #include <comphelper/propagg.hxx>
 #include <comphelper/propertybag.hxx>
 #include <comphelper/propmultiplex.hxx>
-#include <comphelper/sequence.hxx>
 #include <comphelper/uno3.hxx>
 #include <cppuhelper/component.hxx>
 #include <cppuhelper/implbase1.hxx>
diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx
index 59d0ea530845..3939b77306ea 100644
--- a/forms/source/inc/InterfaceContainer.hxx
+++ b/forms/source/inc/InterfaceContainer.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FORMS_SOURCE_INC_INTERFACECONTAINER_HXX
 #define INCLUDED_FORMS_SOURCE_INC_INTERFACECONTAINER_HXX
 
-#include <comphelper/types.hxx>
 #include <comphelper/uno3.hxx>
 #include <com/sun/star/container/XNameReplace.hpp>
 #include <com/sun/star/container/XIndexReplace.hpp>
diff --git a/forms/source/inc/frm_strings.hxx b/forms/source/inc/frm_strings.hxx
index 1ad4fce608ce..2910c01ef17b 100644
--- a/forms/source/inc/frm_strings.hxx
+++ b/forms/source/inc/frm_strings.hxx
@@ -22,7 +22,6 @@
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
-#include <comphelper/string.hxx>
 
 
 namespace frm
diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx
index 346c6c6a4c9c..97945b54fe14 100644
--- a/forms/source/inc/property.hxx
+++ b/forms/source/inc/property.hxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <cppuhelper/propshlp.hxx>
-#include <comphelper/property.hxx>
 #include <comphelper/propagg.hxx>
 #include <tools/debug.hxx>
 
diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx
index 8d9c27bdd390..266b5de5d5b6 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@ -32,6 +32,7 @@
 #include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/form/XForm.hpp>
 
diff --git a/forms/source/richtext/richtextmodel.hxx b/forms/source/richtext/richtextmodel.hxx
index 07406bfb295b..493fbda75807 100644
--- a/forms/source/richtext/richtextmodel.hxx
+++ b/forms/source/richtext/richtextmodel.hxx
@@ -22,8 +22,8 @@
 #include <FormComponent.hxx>
 #include <formcontrolfont.hxx>
 #include "richtextunowrapper.hxx"
+#include <comphelper/interfacecontainer2.hxx>
 #include <comphelper/propertycontainerhelper.hxx>
-#include <comphelper/listenernotification.hxx>
 
 #include <com/sun/star/awt/XDevice.hpp>
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx
index feb5ac62826d..f4f6c64d07a7 100644
--- a/forms/source/xforms/binding.cxx
+++ b/forms/source/xforms/binding.cxx
@@ -52,7 +52,6 @@
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 
-#include <comphelper/propertysetinfo.hxx>
 #include <unotools/textsearch.hxx>
 #include <cppuhelper/typeprovider.hxx>
 
diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx
index ad6ccbcece3d..8566f60e4040 100644
--- a/forms/source/xforms/model.cxx
+++ b/forms/source/xforms/model.cxx
@@ -34,7 +34,6 @@
 #include <rtl/ustrbuf.hxx>
 #include <tools/debug.hxx>
 
-#include <comphelper/propertysetinfo.hxx>
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/typeprovider.hxx>
diff --git a/forms/source/xforms/propertysetbase.hxx b/forms/source/xforms/propertysetbase.hxx
index 04dfa535879b..5627055a8a61 100644
--- a/forms/source/xforms/propertysetbase.hxx
+++ b/forms/source/xforms/propertysetbase.hxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <comphelper/propstate.hxx>
 #include <comphelper/propertysetinfo.hxx>
-#include <comphelper/proparrhlp.hxx>
 #include <rtl/ref.hxx>
 #include <salhelper/simplereferenceobject.hxx>
 
diff --git a/forms/source/xforms/xpathlib/extension.cxx b/forms/source/xforms/xpathlib/extension.cxx
index e2d29e00b948..914e3b8010e7 100644
--- a/forms/source/xforms/xpathlib/extension.cxx
+++ b/forms/source/xforms/xpathlib/extension.cxx
@@ -24,6 +24,10 @@
 #include "xpathlib.hxx"
 #include <services.hxx>
 
+namespace com { namespace sun { namespace star { namespace uno {
+    class XComponentContext;
+} } } }
+
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::xforms;