mysqlc/source/mysqlc_connection.hxx | 4 ++-- mysqlc/source/mysqlc_databasemetadata.hxx | 4 ++-- mysqlc/source/mysqlc_driver.hxx | 4 ++-- mysqlc/source/mysqlc_resultset.hxx | 4 ++-- mysqlc/source/mysqlc_resultsetmetadata.hxx | 4 ++-- mysqlc/source/mysqlc_statement.hxx | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-)
New commits: commit 112286d2ef68ffb697ca3ce48fc66197ce90c2f0 Author: Stephan Bergmann <sberg...@redhat.com> Date: Mon Aug 24 08:28:57 2015 +0200 Revert "mysqlc: tdf#88206 replace cppu::WeakImplHelper* etc." This reverts commit 7fa5f876fddfd4baeff01d74d26cbf1dc4607d18, which uses LIBO_INTERNAL_ONLY features in external code. diff --git a/mysqlc/source/mysqlc_connection.hxx b/mysqlc/source/mysqlc_connection.hxx index 2700c67..aeb9686 100644 --- a/mysqlc/source/mysqlc_connection.hxx +++ b/mysqlc/source/mysqlc_connection.hxx @@ -38,7 +38,7 @@ #include <cppconn/driver.h> -#include <cppuhelper/compbase.hxx> +#include <cppuhelper/compbase3.hxx> #include <cppuhelper/weakref.hxx> #include <rtl/string.hxx> @@ -65,7 +65,7 @@ namespace connectivity typedef ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > my_XNameAccessRef; typedef ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > my_XDatabaseMetaDataRef; - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XConnection, + typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XConnection, ::com::sun::star::sdbc::XWarningsSupplier, ::com::sun::star::lang::XServiceInfo > OMetaConnection_BASE; diff --git a/mysqlc/source/mysqlc_databasemetadata.hxx b/mysqlc/source/mysqlc_databasemetadata.hxx index e29e356..3dd311f 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> @@ -40,7 +40,7 @@ namespace connectivity //************ Class: ODatabaseMetaData - typedef ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XDatabaseMetaData> ODatabaseMetaData_BASE; + typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XDatabaseMetaData> ODatabaseMetaData_BASE; class ODatabaseMetaData : public ODatabaseMetaData_BASE { diff --git a/mysqlc/source/mysqlc_driver.hxx b/mysqlc/source/mysqlc_driver.hxx index 9f87386..f95e914 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< ::com::sun::star::uno::XInterface > SAL_CALL MysqlCDriver_CreateInstance(const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw(Exception); - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XDriver, + typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::sdbc::XDriver, ::com::sun::star::lang::XServiceInfo > ODriver_BASE; typedef void* (SAL_CALL * OMysqlCConnection_CreateInstanceFunction)(void* _pDriver); diff --git a/mysqlc/source/mysqlc_resultset.hxx b/mysqlc/source/mysqlc_resultset.hxx index 567c721..003ca03 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 @@ -52,7 +52,7 @@ namespace connectivity /* ** OResultSet */ - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XResultSet, + typedef ::cppu::WeakComponentImplHelper12< ::com::sun::star::sdbc::XResultSet, ::com::sun::star::sdbc::XRow, ::com::sun::star::sdbc::XResultSetMetaDataSupplier, ::com::sun::star::util::XCancellable, diff --git a/mysqlc/source/mysqlc_resultsetmetadata.hxx b/mysqlc/source/mysqlc_resultsetmetadata.hxx index 8528056..ef4c53e 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< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; + typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; class OResultSetMetaData : public OResultSetMetaData_BASE { diff --git a/mysqlc/source/mysqlc_statement.hxx b/mysqlc/source/mysqlc_statement.hxx index 0736ccc..f9eb191 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< ::com::sun::star::sdbc::XStatement, + typedef ::cppu::WeakComponentImplHelper5< ::com::sun::star::sdbc::XStatement, ::com::sun::star::sdbc::XWarningsSupplier, ::com::sun::star::util::XCancellable, ::com::sun::star::sdbc::XCloseable, _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits