[Libreoffice-commits] core.git: mysqlc/source
Stephan Bergmann
sbergman at redhat.com
Tue Apr 12 07:31:06 UTC 2016
mysqlc/source/mysqlc_connection.hxx | 4 ++--
mysqlc/source/mysqlc_databasemetadata.hxx | 4 ++--
mysqlc/source/mysqlc_driver.hxx | 4 ++--
mysqlc/source/mysqlc_preparedstatement.hxx | 2 +-
mysqlc/source/mysqlc_resultset.hxx | 4 ++--
mysqlc/source/mysqlc_resultsetmetadata.hxx | 4 ++--
mysqlc/source/mysqlc_statement.hxx | 4 ++--
7 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 553f7e515d9183d50221bbda9e8e6a023e4d6c57
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 12 09:29:59 2016 +0200
Revert "tdf#88206: use variadic variants for cppu helper"
This reverts commit cf1ecad26d22e3dc5f556f976bdc49a31bfa5630. Library_mysqlc is
external_code, so cannot use these LIBO_INTERNAL_ONLY features.
diff --git a/mysqlc/source/mysqlc_connection.hxx b/mysqlc/source/mysqlc_connection.hxx
index 8d83af7..50ac3c5 100644
--- a/mysqlc/source/mysqlc_connection.hxx
+++ b/mysqlc/source/mysqlc_connection.hxx
@@ -37,7 +37,7 @@
#include <cppconn/driver.h>
-#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/compbase3.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::WeakComponentImplHelper< css::sdbc::XConnection,
+ typedef ::cppu::WeakComponentImplHelper3< 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 bf2bf2e..531ba50 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/implbase.hxx>
+#include <cppuhelper/implbase1.hxx>
#include <cppconn/metadata.h>
@@ -37,7 +37,7 @@ namespace connectivity
//************ Class: ODatabaseMetaData
- typedef ::cppu::WeakImplHelper< css::sdbc::XDatabaseMetaData> ODatabaseMetaData_BASE;
+ typedef ::cppu::WeakImplHelper1< 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 d0c322c..0d1f3a3 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/compbase.hxx>
+#include <cppuhelper/compbase2.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::WeakComponentImplHelper< css::sdbc::XDriver,
+ typedef ::cppu::WeakComponentImplHelper2< 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 4a99290..d5c657d 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::ImplHelper< css::sdbc::XPreparedStatement,
+ typedef ::cppu::ImplHelper5< 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 459dd10c..ee92fcc 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/compbase.hxx>
+#include <cppuhelper/compbase12.hxx>
namespace connectivity
@@ -50,7 +50,7 @@ namespace connectivity
/*
** OResultSet
*/
- typedef ::cppu::WeakComponentImplHelper< css::sdbc::XResultSet,
+ typedef ::cppu::WeakComponentImplHelper12< 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 494c806..65ea730 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/implbase.hxx>
+#include <cppuhelper/implbase1.hxx>
#include <cppconn/resultset_metadata.h>
namespace connectivity
@@ -36,7 +36,7 @@ namespace connectivity
//************ Class: ResultSetMetaData
- typedef ::cppu::WeakImplHelper< css::sdbc::XResultSetMetaData> OResultSetMetaData_BASE;
+ typedef ::cppu::WeakImplHelper1< 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 551186a..18b63aa 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/compbase.hxx>
+#include <cppuhelper/compbase5.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::WeakComponentImplHelper< css::sdbc::XStatement,
+ typedef ::cppu::WeakComponentImplHelper5< css::sdbc::XStatement,
css::sdbc::XWarningsSupplier,
css::util::XCancellable,
css::sdbc::XCloseable,
More information about the Libreoffice-commits
mailing list