tdf#88206: use variadic variants for cppu helper

Change-Id: I58a00f721cbb37f97fdbc599d57c26b1e89f4c73
Reviewed-on: https://gerrit.libreoffice.org/23998
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>

7 files changed, 13 insertions, 13 deletions

diff --git a/mysqlc/source/mysqlc_connection.hxx b/mysqlc/source/mysqlc_connection.hxx
index 50ac3c5ac15d..8d83af707e11 100644
--- a/mysqlc/source/mysqlc_connection.hxx
+++ b/mysqlc/source/mysqlc_connection.hxx
@@ -37,7 +37,7 @@
 
 #include <cppconn/driver.h>
 
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <rtl/string.hxx>
 
@@ -61,7 +61,7 @@ namespace connectivity
         using ::com::sun::star::uno::RuntimeException;
         typedef css::uno::Reference< css::container::XNameAccess > my_XNameAccessRef;
 
-        typedef ::cppu::WeakComponentImplHelper3<   css::sdbc::XConnection,
+        typedef ::cppu::WeakComponentImplHelper<   css::sdbc::XConnection,
                                                     css::sdbc::XWarningsSupplier,
                                                     css::lang::XServiceInfo
                                                 > OMetaConnection_BASE;
diff --git a/mysqlc/source/mysqlc_databasemetadata.hxx b/mysqlc/source/mysqlc_databasemetadata.hxx
index 531ba50ff283..bf2bf2ea1310 100644
--- a/mysqlc/source/mysqlc_databasemetadata.hxx
+++ b/mysqlc/source/mysqlc_databasemetadata.hxx
@@ -23,7 +23,7 @@
 #include "mysqlc_connection.hxx"
 
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <cppconn/metadata.h>
 
@@ -37,7 +37,7 @@ namespace connectivity
         //************ Class: ODatabaseMetaData
 
 
-        typedef ::cppu::WeakImplHelper1< css::sdbc::XDatabaseMetaData> ODatabaseMetaData_BASE;
+        typedef ::cppu::WeakImplHelper< css::sdbc::XDatabaseMetaData> ODatabaseMetaData_BASE;
 
         class ODatabaseMetaData : public ODatabaseMetaData_BASE
         {
diff --git a/mysqlc/source/mysqlc_driver.hxx b/mysqlc/source/mysqlc_driver.hxx
index 0d1f3a301388..d0c322c2f89d 100644
--- a/mysqlc/source/mysqlc_driver.hxx
+++ b/mysqlc/source/mysqlc_driver.hxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppconn/driver.h>
 #include <osl/module.h>
 
@@ -50,7 +50,7 @@ namespace connectivity
         using ::com::sun::star::uno::Sequence;
         Reference< css::uno::XInterface > SAL_CALL MysqlCDriver_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw(Exception);
 
-        typedef ::cppu::WeakComponentImplHelper2<   css::sdbc::XDriver,
+        typedef ::cppu::WeakComponentImplHelper<   css::sdbc::XDriver,
                                                     css::lang::XServiceInfo > ODriver_BASE;
 
         typedef void* (SAL_CALL * OMysqlCConnection_CreateInstanceFunction)(void* _pDriver);
diff --git a/mysqlc/source/mysqlc_preparedstatement.hxx b/mysqlc/source/mysqlc_preparedstatement.hxx
index d5c657dae9d8..4a99290783b2 100644
--- a/mysqlc/source/mysqlc_preparedstatement.hxx
+++ b/mysqlc/source/mysqlc_preparedstatement.hxx
@@ -41,7 +41,7 @@ namespace connectivity
         using ::com::sun::star::uno::RuntimeException;
         using ::com::sun::star::sdbc::XResultSetMetaData;
 
-        typedef ::cppu::ImplHelper5<    css::sdbc::XPreparedStatement,
+        typedef ::cppu::ImplHelper<    css::sdbc::XPreparedStatement,
                                         css::sdbc::XParameters,
                                         css::sdbc::XPreparedBatchExecution,
                                         css::sdbc::XResultSetMetaDataSupplier,
diff --git a/mysqlc/source/mysqlc_resultset.hxx b/mysqlc/source/mysqlc_resultset.hxx
index ee92fccb3dd0..459dd10cd4f5 100644
--- a/mysqlc/source/mysqlc_resultset.hxx
+++ b/mysqlc/source/mysqlc_resultset.hxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/sdbcx/XRowLocate.hpp>
 #include <com/sun/star/util/XCancellable.hpp>
 
-#include <cppuhelper/compbase12.hxx>
+#include <cppuhelper/compbase.hxx>
 
 
 namespace connectivity
@@ -50,7 +50,7 @@ namespace connectivity
         /*
         **  OResultSet
         */
-        typedef ::cppu::WeakComponentImplHelper12<  css::sdbc::XResultSet,
+        typedef ::cppu::WeakComponentImplHelper<  css::sdbc::XResultSet,
                                                     css::sdbc::XRow,
                                                     css::sdbc::XResultSetMetaDataSupplier,
                                                     css::util::XCancellable,
diff --git a/mysqlc/source/mysqlc_resultsetmetadata.hxx b/mysqlc/source/mysqlc_resultsetmetadata.hxx
index 65ea730264e3..494c80658ec2 100644
--- a/mysqlc/source/mysqlc_resultsetmetadata.hxx
+++ b/mysqlc/source/mysqlc_resultsetmetadata.hxx
@@ -24,7 +24,7 @@
 
 #include <com/sun/star/sdbc/XResultSetMetaData.hpp>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppconn/resultset_metadata.h>
 
 namespace connectivity
@@ -36,7 +36,7 @@ namespace connectivity
 
         //************ Class: ResultSetMetaData
 
-        typedef ::cppu::WeakImplHelper1< css::sdbc::XResultSetMetaData> OResultSetMetaData_BASE;
+        typedef ::cppu::WeakImplHelper< css::sdbc::XResultSetMetaData> OResultSetMetaData_BASE;
 
         class OResultSetMetaData : public OResultSetMetaData_BASE
         {
diff --git a/mysqlc/source/mysqlc_statement.hxx b/mysqlc/source/mysqlc_statement.hxx
index 18b63aa0bcfa..551186aa30e5 100644
--- a/mysqlc/source/mysqlc_statement.hxx
+++ b/mysqlc/source/mysqlc_statement.hxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/util/XCancellable.hpp>
 
 #include <cppconn/statement.h>
-#include <cppuhelper/compbase5.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <list>
 
 namespace connectivity
@@ -45,7 +45,7 @@ namespace connectivity
         using ::com::sun::star::uno::Any;
         using ::com::sun::star::uno::RuntimeException;
 
-        typedef ::cppu::WeakComponentImplHelper5<   css::sdbc::XStatement,
+        typedef ::cppu::WeakComponentImplHelper<   css::sdbc::XStatement,
                                                     css::sdbc::XWarningsSupplier,
                                                     css::util::XCancellable,
                                                     css::sdbc::XCloseable,