tdf#88206 replace cppu::WeakImplHelper* etc.

with the variadic variants, for connectivity.

Change-Id: I3645a2855e903848936520ac854fc1039fc456e8
Reviewed-on: https://gerrit.libreoffice.org/16971
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

9 files changed, 36 insertions, 37 deletions

diff --git a/include/connectivity/BlobHelper.hxx b/include/connectivity/BlobHelper.hxx
index 193efc0276ed..af93d460785e 100644
--- a/include/connectivity/BlobHelper.hxx
+++ b/include/connectivity/BlobHelper.hxx
@@ -21,11 +21,11 @@
 
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <com/sun/star/sdbc/XBlob.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace connectivity
 {
-    class OOO_DLLPUBLIC_DBTOOLS BlobHelper : public ::cppu::WeakImplHelper1< com::sun::star::sdbc::XBlob >
+    class OOO_DLLPUBLIC_DBTOOLS BlobHelper : public ::cppu::WeakImplHelper< com::sun::star::sdbc::XBlob >
     {
         ::com::sun::star::uno::Sequence< sal_Int8 > m_aValue;
     public:
diff --git a/include/connectivity/conncleanup.hxx b/include/connectivity/conncleanup.hxx
index 265f058e25bf..8fcad620db8c 100644
--- a/include/connectivity/conncleanup.hxx
+++ b/include/connectivity/conncleanup.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_CONNCLEANUP_HXX
 #define INCLUDED_CONNECTIVITY_CONNCLEANUP_HXX
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sdbc/XRowSet.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
@@ -34,9 +34,9 @@ namespace dbtools
 
     //= OAutoConnectionDisposer
 
-    typedef ::cppu::WeakImplHelper2 <   ::com::sun::star::beans::XPropertyChangeListener,
-                                        ::com::sun::star::sdbc::XRowSetListener
-                                    >   OAutoConnectionDisposer_Base;
+    typedef ::cppu::WeakImplHelper <   ::com::sun::star::beans::XPropertyChangeListener,
+                                       ::com::sun::star::sdbc::XRowSetListener
+                                   >   OAutoConnectionDisposer_Base;
 
     class OOO_DLLPUBLIC_DBTOOLS OAutoConnectionDisposer : public OAutoConnectionDisposer_Base
     {
diff --git a/include/connectivity/paramwrapper.hxx b/include/connectivity/paramwrapper.hxx
index 2096260afbb2..328eed4c8315 100644
--- a/include/connectivity/paramwrapper.hxx
+++ b/include/connectivity/paramwrapper.hxx
@@ -32,7 +32,7 @@
 #include <comphelper/broadcasthelper.hxx>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/propshlp.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 
 #include <memory>
 #include <vector>
@@ -128,9 +128,9 @@ namespace param
 
     //= ParameterWrapperContainer
 
-    typedef ::cppu::WeakComponentImplHelper2    <   ::com::sun::star::container::XIndexAccess
-                                                ,   ::com::sun::star::container::XEnumerationAccess
-                                                >   ParameterWrapperContainer_Base;
+    typedef ::cppu::WeakComponentImplHelper    <   ::com::sun::star::container::XIndexAccess
+                                               ,   ::com::sun::star::container::XEnumerationAccess
+                                               >   ParameterWrapperContainer_Base;
 
     /// class for the parameter event @see approveParameter
     class OOO_DLLPUBLIC_DBTOOLS ParameterWrapperContainer :
diff --git a/include/connectivity/sdbcx/VCatalog.hxx b/include/connectivity/sdbcx/VCatalog.hxx
index 264cc33e1568..19c99add23f4 100644
--- a/include/connectivity/sdbcx/VCatalog.hxx
+++ b/include/connectivity/sdbcx/VCatalog.hxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/sdbcx/XGroupsSupplier.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
-#include <cppuhelper/compbase5.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <connectivity/CommonTools.hxx>
 #include <connectivity/OSubComponent.hxx>
@@ -45,11 +45,11 @@ namespace connectivity
         // other drivers can be derived their catalog from this class when they want to support sdbcx
         // it holds already tables, views, groups and users
 
-        typedef ::cppu::WeakComponentImplHelper5< ::com::sun::star::sdbcx::XTablesSupplier,
-                                                  ::com::sun::star::sdbcx::XViewsSupplier,
-                                                  ::com::sun::star::sdbcx::XUsersSupplier,
-                                                  ::com::sun::star::sdbcx::XGroupsSupplier,
-                                                  ::com::sun::star::lang::XServiceInfo> OCatalog_BASE;
+        typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbcx::XTablesSupplier,
+                                                 ::com::sun::star::sdbcx::XViewsSupplier,
+                                                 ::com::sun::star::sdbcx::XUsersSupplier,
+                                                 ::com::sun::star::sdbcx::XGroupsSupplier,
+                                                 ::com::sun::star::lang::XServiceInfo> OCatalog_BASE;
 
 
         class OOO_DLLPUBLIC_DBTOOLS SAL_NO_VTABLE OCatalog :
diff --git a/include/connectivity/sdbcx/VColumn.hxx b/include/connectivity/sdbcx/VColumn.hxx
index 317436242e7b..ac28d3ae192a 100644
--- a/include/connectivity/sdbcx/VColumn.hxx
+++ b/include/connectivity/sdbcx/VColumn.hxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 #include <comphelper/IdPropArrayHelper.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <connectivity/CommonTools.hxx>
 #include <comphelper/broadcasthelper.hxx>
@@ -37,8 +37,8 @@ namespace connectivity
         class OColumn;
         typedef ::comphelper::OIdPropertyArrayUsageHelper<OColumn> OColumn_PROP;
 
-        typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::container::XNamed,
-                                                  ::com::sun::star::lang::XServiceInfo> OColumnDescriptor_BASE;
+        typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::container::XNamed,
+                                                 ::com::sun::star::lang::XServiceInfo> OColumnDescriptor_BASE;
         typedef ::cppu::ImplHelper1< ::com::sun::star::sdbcx::XDataDescriptorFactory > OColumn_BASE;
 
 
diff --git a/include/connectivity/sdbcx/VGroup.hxx b/include/connectivity/sdbcx/VGroup.hxx
index b4223b01d42f..de7c588303d0 100644
--- a/include/connectivity/sdbcx/VGroup.hxx
+++ b/include/connectivity/sdbcx/VGroup.hxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/sdbcx/XAuthorizable.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 #include <comphelper/proparrhlp.hxx>
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/broadcasthelper.hxx>
 #include <connectivity/sdbcx/VCollection.hxx>
 #include <comphelper/propertycontainer.hxx>
@@ -42,10 +42,10 @@ namespace connectivity
     {
         typedef OCollection OUsers;
 
-        typedef ::cppu::WeakComponentImplHelper4<   ::com::sun::star::sdbcx::XUsersSupplier,
-                                                    ::com::sun::star::sdbcx::XAuthorizable,
-                                                    ::com::sun::star::container::XNamed,
-                                                    ::com::sun::star::lang::XServiceInfo> OGroup_BASE;
+        typedef ::cppu::WeakComponentImplHelper<   ::com::sun::star::sdbcx::XUsersSupplier,
+                                                   ::com::sun::star::sdbcx::XAuthorizable,
+                                                   ::com::sun::star::container::XNamed,
+                                                   ::com::sun::star::lang::XServiceInfo> OGroup_BASE;
 
         class OOO_DLLPUBLIC_DBTOOLS OGroup :
                         public comphelper::OBaseMutex,
diff --git a/include/connectivity/sdbcx/VTable.hxx b/include/connectivity/sdbcx/VTable.hxx
index 4f1882cfb539..82c28184bb01 100644
--- a/include/connectivity/sdbcx/VTable.hxx
+++ b/include/connectivity/sdbcx/VTable.hxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/sdbcx/XKeysSupplier.hpp>
 #include <comphelper/IdPropArrayHelper.hxx>
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/implbase4.hxx>
 #include <comphelper/broadcasthelper.hxx>
 #include <com/sun/star/container/XNamed.hpp>
@@ -45,10 +45,10 @@ namespace connectivity
         class OTable;
         class OCollection;
 
-        typedef ::cppu::WeakComponentImplHelper4<   ::com::sun::star::sdbcx::XColumnsSupplier,
-                                                    ::com::sun::star::sdbcx::XKeysSupplier,
-                                                    ::com::sun::star::container::XNamed,
-                                                    ::com::sun::star::lang::XServiceInfo> OTableDescriptor_BASE;
+        typedef ::cppu::WeakComponentImplHelper<   ::com::sun::star::sdbcx::XColumnsSupplier,
+                                                   ::com::sun::star::sdbcx::XKeysSupplier,
+                                                   ::com::sun::star::container::XNamed,
+                                                   ::com::sun::star::lang::XServiceInfo> OTableDescriptor_BASE;
 
         typedef ::cppu::ImplHelper4<                ::com::sun::star::sdbcx::XDataDescriptorFactory,
                                                     ::com::sun::star::sdbcx::XIndexesSupplier,
diff --git a/include/connectivity/sdbcx/VUser.hxx b/include/connectivity/sdbcx/VUser.hxx
index 3b8287323a55..0917ed669a22 100644
--- a/include/connectivity/sdbcx/VUser.hxx
+++ b/include/connectivity/sdbcx/VUser.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/sdbcx/XUser.hpp>
 #include <com/sun/star/sdbcx/XGroupsSupplier.hpp>
 #include <comphelper/proparrhlp.hxx>
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <connectivity/CommonTools.hxx>
 #include <comphelper/broadcasthelper.hxx>
 #include <connectivity/sdbcx/VCollection.hxx>
@@ -39,10 +39,10 @@ namespace connectivity
     {
         typedef OCollection OGroups;
 
-        typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::sdbcx::XUser,
-                                                  ::com::sun::star::sdbcx::XGroupsSupplier,
-                                                  ::com::sun::star::container::XNamed,
-                                                  ::com::sun::star::lang::XServiceInfo> OUser_BASE;
+        typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbcx::XUser,
+                                                 ::com::sun::star::sdbcx::XGroupsSupplier,
+                                                 ::com::sun::star::container::XNamed,
+                                                 ::com::sun::star::lang::XServiceInfo> OUser_BASE;
 
         class OOO_DLLPUBLIC_DBTOOLS OUser :
                         public comphelper::OBaseMutex,
diff --git a/include/connectivity/sdbcx/VView.hxx b/include/connectivity/sdbcx/VView.hxx
index d7088939603e..c5ec6a170968 100644
--- a/include/connectivity/sdbcx/VView.hxx
+++ b/include/connectivity/sdbcx/VView.hxx
@@ -24,21 +24,20 @@
 #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
 #include <comphelper/proparrhlp.hxx>
-#include <cppuhelper/compbase1.hxx>
 #include <connectivity/CommonTools.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <com/sun/star/container/XNamed.hpp>
 #include <connectivity/sdbcx/VDescriptor.hxx>
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <comphelper/IdPropArrayHelper.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace connectivity
 {
     namespace sdbcx
     {
 
-        typedef ::cppu::WeakImplHelper2<    ::com::sun::star::lang::XServiceInfo,
+        typedef ::cppu::WeakImplHelper< ::com::sun::star::lang::XServiceInfo,
                                         ::com::sun::star::container::XNamed> OView_BASE;