forms: tdf#88206 replace cppu::WeakImplHelper* etc.

with the variadic variants.

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

18 files changed, 32 insertions, 37 deletions

diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index e5214aa01dcd..88ed5623e79e 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -63,7 +63,6 @@
 #include <comphelper/sequence.hxx>
 #include <connectivity/dbtools.hxx>
 #include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <rtl/math.hxx>
 #include <rtl/tencinfo.h>
diff --git a/forms/source/component/Filter.hxx b/forms/source/component/Filter.hxx
index 337d726cebe1..d75744875590 100644
--- a/forms/source/component/Filter.hxx
+++ b/forms/source/component/Filter.hxx
@@ -34,7 +34,6 @@
 #include <toolkit/helper/listenermultiplexer.hxx>
 #include <cppuhelper/implbase5.hxx>
 #include <comphelper/uno3.hxx>
-#include <cppuhelper/implbase4.hxx>
 #include <connectivity/sqlparse.hxx>
 #include <svx/ParseContext.hxx>
 
diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx
index c2c17c292fbb..bd4aeb3fa55f 100644
--- a/forms/source/component/GroupManager.hxx
+++ b/forms/source/component/GroupManager.hxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/container/XContainerListener.hpp>
 #include <com/sun/star/container/XContainer.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/types.hxx>
 
 #include <algorithm>
@@ -161,7 +161,7 @@ typedef std::map<OUString, OGroup> OGroupArr;
 typedef std::vector<OGroupArr::iterator> OActiveGroups;
 
 
-class OGroupManager : public ::cppu::WeakImplHelper2< ::com::sun::star::beans::XPropertyChangeListener, ::com::sun::star::container::XContainerListener>
+class OGroupManager : public ::cppu::WeakImplHelper< ::com::sun::star::beans::XPropertyChangeListener, ::com::sun::star::container::XContainerListener>
 {
     OGroup*         m_pCompGroup;           // Sort all Components by TabIndices
     OGroupArr       m_aGroupArr;            // Sort all Components by group
diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx
index 4a77df0a9192..35063793dccd 100644
--- a/forms/source/component/ListBox.hxx
+++ b/forms/source/component/ListBox.hxx
@@ -37,7 +37,7 @@
 #include <comphelper/asyncnotification.hxx>
 #include <connectivity/FValue.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase4.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/idle.hxx>
 
diff --git a/forms/source/helper/windowstateguard.cxx b/forms/source/helper/windowstateguard.cxx
index e5f4c1c05996..5ecce323b01d 100644
--- a/forms/source/helper/windowstateguard.cxx
+++ b/forms/source/helper/windowstateguard.cxx
@@ -22,7 +22,7 @@
 
 #include <com/sun/star/awt/XWindowListener2.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <tools/diagnose_ex.h>
 
 
@@ -41,7 +41,7 @@ namespace frm
     using ::com::sun::star::uno::UNO_QUERY;
     using ::com::sun::star::uno::Exception;
 
-    typedef ::cppu::WeakImplHelper1 <   XWindowListener2
+    typedef ::cppu::WeakImplHelper <   XWindowListener2
                                     >   WindowStateGuard_Impl_Base;
     class WindowStateGuard_Impl : public WindowStateGuard_Impl_Base
     {
diff --git a/forms/source/richtext/featuredispatcher.hxx b/forms/source/richtext/featuredispatcher.hxx
index df78405db874..03a7891e4f7f 100644
--- a/forms/source/richtext/featuredispatcher.hxx
+++ b/forms/source/richtext/featuredispatcher.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <cppuhelper/interfacecontainer.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/broadcasthelper.hxx>
 
 class EditView;
@@ -31,7 +31,7 @@ class EditView;
 namespace frm
 {
 
-    typedef ::cppu::WeakImplHelper1 <   ::com::sun::star::frame::XDispatch
+    typedef ::cppu::WeakImplHelper <   ::com::sun::star::frame::XDispatch
                                     >   ORichTextFeatureDispatcher_Base;
 
     class ORichTextFeatureDispatcher    :public ::comphelper::OBaseMutex
diff --git a/forms/source/runtime/formoperations.hxx b/forms/source/runtime/formoperations.hxx
index 9635af010566..8b1779a8f8b5 100644
--- a/forms/source/runtime/formoperations.hxx
+++ b/forms/source/runtime/formoperations.hxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase6.hxx>
+#include <cppuhelper/compbase.hxx>
 
 
 namespace frm
@@ -44,7 +44,7 @@ namespace frm
 
     //= FormOperations
 
-    typedef ::cppu::WeakComponentImplHelper6    <   ::com::sun::star::form::runtime::XFormOperations
+    typedef ::cppu::WeakComponentImplHelper    <   ::com::sun::star::form::runtime::XFormOperations
                                                 ,   ::com::sun::star::lang::XInitialization
                                                 ,   ::com::sun::star::lang::XServiceInfo
                                                 ,   ::com::sun::star::beans::XPropertyChangeListener
diff --git a/forms/source/xforms/NameContainer.hxx b/forms/source/xforms/NameContainer.hxx
index 113a00568ab5..db4719564592 100644
--- a/forms/source/xforms/NameContainer.hxx
+++ b/forms/source/xforms/NameContainer.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_FORMS_SOURCE_XFORMS_NAMECONTAINER_HXX
 #define INCLUDED_FORMS_SOURCE_XFORMS_NAMECONTAINER_HXX
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <map>
 
 #include <com/sun/star/container/XNameContainer.hpp>
@@ -33,7 +33,7 @@
 #include <com/sun/star/uno/Type.hxx>
 #include <osl/diagnose.h>
 
-typedef cppu::WeakImplHelper1<
+typedef cppu::WeakImplHelper<
     com::sun::star::container::XNameContainer
 > NameContainer_t;
 
diff --git a/forms/source/xforms/binding.hxx b/forms/source/xforms/binding.hxx
index 6f9064b01f37..30511745beb0 100644
--- a/forms/source/xforms/binding.hxx
+++ b/forms/source/xforms/binding.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_FORMS_SOURCE_XFORMS_BINDING_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
-#include <cppuhelper/implbase8.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <propertysetbase.hxx>
 #include <com/sun/star/form/binding/XValueBinding.hpp>
 #include <com/sun/star/form/binding/XListEntrySource.hpp>
@@ -73,7 +73,7 @@ namespace xforms
  * See http://www.w3.org/TR/xforms/ for more information.
  */
 
-typedef cppu::ImplInheritanceHelper8<
+typedef cppu::ImplInheritanceHelper<
     PropertySetBase,
     css::form::binding::XValueBinding,
     css::form::binding::XListEntrySource,
diff --git a/forms/source/xforms/collection.hxx b/forms/source/xforms/collection.hxx
index 0b50b3ebee4c..d6d41954dd60 100644
--- a/forms/source/xforms/collection.hxx
+++ b/forms/source/xforms/collection.hxx
@@ -22,7 +22,7 @@
 
 #include "enumeration.hxx"
 
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/container/ElementExistException.hpp>
 #include <com/sun/star/container/NoSuchElementException.hpp>
 #include <com/sun/star/container/XEnumeration.hpp>
@@ -41,7 +41,7 @@
 #include <algorithm>
 
 
-typedef cppu::WeakImplHelper3<
+typedef cppu::WeakImplHelper<
     css::container::XIndexReplace,
     css::container::XSet,
     css::container::XContainer>
diff --git a/forms/source/xforms/datatyperepository.hxx b/forms/source/xforms/datatyperepository.hxx
index 0158c15f403c..d677993f2f86 100644
--- a/forms/source/xforms/datatyperepository.hxx
+++ b/forms/source/xforms/datatyperepository.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_FORMS_SOURCE_XFORMS_DATATYPEREPOSITORY_HXX
 
 #include <com/sun/star/xforms/XDataTypeRepository.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <rtl/ref.hxx>
 
 #include <map>
@@ -32,7 +32,7 @@ namespace xforms
 
     class OXSDDataType;
 
-    typedef ::cppu::WeakImplHelper1 <   ::com::sun::star::xforms::XDataTypeRepository
+    typedef ::cppu::WeakImplHelper <   ::com::sun::star::xforms::XDataTypeRepository
                                     >   ODataTypeRepository_Base;
     class ODataTypeRepository : public ODataTypeRepository_Base
     {
diff --git a/forms/source/xforms/datatypes.hxx b/forms/source/xforms/datatypes.hxx
index 87a34ef9fa02..7e4c175c98ea 100644
--- a/forms/source/xforms/datatypes.hxx
+++ b/forms/source/xforms/datatypes.hxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/xsd/XDataType.hpp>
 #include <com/sun/star/xsd/DataTypeClass.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/uno3.hxx>
 #include <comphelper/propertycontainer.hxx>
 #include <comphelper/proparrhlp.hxx>
@@ -44,7 +44,7 @@ namespace xforms
 
     //= OXSDDataType
 
-    typedef ::cppu::WeakImplHelper1             <   ::com::sun::star::xsd::XDataType
+    typedef ::cppu::WeakImplHelper             <   ::com::sun::star::xsd::XDataType
                                                 >   OXSDDataType_Base;
     typedef ::comphelper::OMutexAndBroadcastHelper  OXSDDataType_BBase;
     typedef ::comphelper::OPropertyContainer        OXSDDataType_PBase;
diff --git a/forms/source/xforms/enumeration.hxx b/forms/source/xforms/enumeration.hxx
index 760db7dcf301..0c1836b0a9e0 100644
--- a/forms/source/xforms/enumeration.hxx
+++ b/forms/source/xforms/enumeration.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_FORMS_SOURCE_XFORMS_ENUMERATION_HXX
 
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/container/XEnumeration.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 
@@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star {
 
 /** implement XEnumeration based on container::XIndexAccess */
 class Enumeration
-    : public cppu::WeakImplHelper1<com::sun::star::container::XEnumeration>
+    : public cppu::WeakImplHelper<com::sun::star::container::XEnumeration>
 {
     com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> mxContainer;
     sal_Int32 mnIndex;
diff --git a/forms/source/xforms/namedcollection.hxx b/forms/source/xforms/namedcollection.hxx
index f411595310e6..5166dfe8f1ee 100644
--- a/forms/source/xforms/namedcollection.hxx
+++ b/forms/source/xforms/namedcollection.hxx
@@ -21,13 +21,13 @@
 #define INCLUDED_FORMS_SOURCE_XFORMS_NAMEDCOLLECTION_HXX
 
 #include <collection.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
 
 #include <algorithm>
 
 template<class T>
-class NamedCollection : public cppu::ImplInheritanceHelper1<
+class NamedCollection : public cppu::ImplInheritanceHelper<
                             Collection<T>,
                             com::sun::star::container::XNameAccess>
 {
diff --git a/forms/source/xforms/submission.hxx b/forms/source/xforms/submission.hxx
index 93313d953526..90da4f7b8c2e 100644
--- a/forms/source/xforms/submission.hxx
+++ b/forms/source/xforms/submission.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_FORMS_SOURCE_XFORMS_SUBMISSION_HXX
 #define INCLUDED_FORMS_SOURCE_XFORMS_SUBMISSION_HXX
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <propertysetbase.hxx>
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
 #include <com/sun/star/container/XNamed.hpp>
@@ -55,7 +55,7 @@ namespace xforms
  *
  * See http://www.w3.org/TR/xforms/ for more information.
  */
-typedef cppu::ImplInheritanceHelper2<
+typedef cppu::ImplInheritanceHelper<
     PropertySetBase,
     com::sun::star::lang::XUnoTunnel,
     com::sun::star::xforms::XSubmission
diff --git a/forms/source/xforms/submission/submission.hxx b/forms/source/xforms/submission/submission.hxx
index a8cd11d4a87b..f98b0dc502f8 100644
--- a/forms/source/xforms/submission/submission.hxx
+++ b/forms/source/xforms/submission/submission.hxx
@@ -40,9 +40,7 @@
 
 #include <com/sun/star/frame/XFrame.hpp>
 
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include "serialization.hxx"
 
@@ -52,7 +50,7 @@ class CSubmissionPut;
 class CSubmissionPost;
 class CSubmissionGet;
 
-class CCommandEnvironmentHelper : public cppu::WeakImplHelper1< css::ucb::XCommandEnvironment >
+class CCommandEnvironmentHelper : public cppu::WeakImplHelper< css::ucb::XCommandEnvironment >
 {
     friend class CSubmissionPut;
     friend class CSubmissionPost;
@@ -74,7 +72,7 @@ public:
     }
 };
 
-class CProgressHandlerHelper : public cppu::WeakImplHelper1< css::ucb::XProgressHandler >
+class CProgressHandlerHelper : public cppu::WeakImplHelper< css::ucb::XProgressHandler >
 {
     friend class CSubmissionPut;
     friend class CSubmissionPost;
diff --git a/forms/source/xforms/xformsevent.hxx b/forms/source/xforms/xformsevent.hxx
index 5628208ad4ad..a72f4252cb40 100644
--- a/forms/source/xforms/xformsevent.hxx
+++ b/forms/source/xforms/xformsevent.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_FORMS_SOURCE_XFORMS_XFORMSEVENT_HXX
 
 #include <sal/types.h>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/xforms/XFormsEvent.hpp>
 #include <com/sun/star/xml/dom/events/XEventTarget.hpp>
@@ -30,7 +30,7 @@ namespace sun {
 namespace star {
 namespace xforms {
 
-class XFormsEventConcrete : public cppu::WeakImplHelper1< XFormsEvent > {
+class XFormsEventConcrete : public cppu::WeakImplHelper< XFormsEvent > {
 
     public:
 
diff --git a/forms/source/xforms/xpathlib/extension.hxx b/forms/source/xforms/xpathlib/extension.hxx
index 0edd542ee783..84bdd5d41f91 100644
--- a/forms/source/xforms/xpathlib/extension.hxx
+++ b/forms/source/xforms/xpathlib/extension.hxx
@@ -24,8 +24,7 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Any.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
@@ -39,7 +38,7 @@
 
 
 
-class CLibxml2XFormsExtension : public cppu::WeakImplHelper2<
+class CLibxml2XFormsExtension : public cppu::WeakImplHelper<
     com::sun::star::xml::xpath::XXPathExtension, com::sun::star::lang::XInitialization>
 {
 private: