mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
with the variadic variants.

Change-Id: If0eccdcb56f8196db5eea539eb54dd145ac57a8d
Reviewed-on: https://gerrit.libreoffice.org/17918
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Takeshi Abe
2015-08-22 16:55:44 +09:00
committed by Caolán McNamara
parent 3230c8cf1c
commit 7fa5f876fd
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysqlc/source/mysqlc_connection.hxx
View File

@@ -38,7 +38,7 @@
#include <cppconn/driver.h> #include <cppconn/driver.h>
#include <cppuhelper/compbase3.hxx> #include <cppuhelper/compbase.hxx>
#include <cppuhelper/weakref.hxx> #include <cppuhelper/weakref.hxx>
#include <rtl/string.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::container::XNameAccess > my_XNameAccessRef;
typedef ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > my_XDatabaseMetaDataRef; typedef ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > my_XDatabaseMetaDataRef;
typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XConnection, typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XConnection,
::com::sun::star::sdbc::XWarningsSupplier, ::com::sun::star::sdbc::XWarningsSupplier,
::com::sun::star::lang::XServiceInfo ::com::sun::star::lang::XServiceInfo
> OMetaConnection_BASE; > OMetaConnection_BASE;

4
mysqlc/source/mysqlc_databasemetadata.hxx
View File

@@ -23,7 +23,7 @@
#include "mysqlc_connection.hxx" #include "mysqlc_connection.hxx"
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase.hxx>
#include <cppconn/metadata.h> #include <cppconn/metadata.h>
@@ -40,7 +40,7 @@ namespace connectivity
//************ Class: ODatabaseMetaData //************ Class: ODatabaseMetaData
typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XDatabaseMetaData> ODatabaseMetaData_BASE; typedef ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XDatabaseMetaData> ODatabaseMetaData_BASE;
class ODatabaseMetaData : public ODatabaseMetaData_BASE class ODatabaseMetaData : public ODatabaseMetaData_BASE
{ {

4
mysqlc/source/mysqlc_driver.hxx
View File

@@ -35,7 +35,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <cppuhelper/compbase2.hxx> #include <cppuhelper/compbase.hxx>
#include <cppconn/driver.h> #include <cppconn/driver.h>
#include <osl/module.h> #include <osl/module.h>
@@ -50,7 +50,7 @@ namespace connectivity
using ::com::sun::star::uno::Sequence; 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); Reference< ::com::sun::star::uno::XInterface > SAL_CALL MysqlCDriver_CreateInstance(const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw(Exception);
typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::sdbc::XDriver, typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XDriver,
::com::sun::star::lang::XServiceInfo > ODriver_BASE; ::com::sun::star::lang::XServiceInfo > ODriver_BASE;
typedef void* (SAL_CALL * OMysqlCConnection_CreateInstanceFunction)(void* _pDriver); typedef void* (SAL_CALL * OMysqlCConnection_CreateInstanceFunction)(void* _pDriver);

4
mysqlc/source/mysqlc_resultset.hxx
View File

@@ -36,7 +36,7 @@
#include <com/sun/star/sdbcx/XRowLocate.hpp> #include <com/sun/star/sdbcx/XRowLocate.hpp>
#include <com/sun/star/util/XCancellable.hpp> #include <com/sun/star/util/XCancellable.hpp>
#include <cppuhelper/compbase12.hxx> #include <cppuhelper/compbase.hxx>
namespace connectivity namespace connectivity
@@ -52,7 +52,7 @@ namespace connectivity
/* /*
** OResultSet ** OResultSet
*/ */
typedef ::cppu::WeakComponentImplHelper12< ::com::sun::star::sdbc::XResultSet, typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XResultSet,
::com::sun::star::sdbc::XRow, ::com::sun::star::sdbc::XRow,
::com::sun::star::sdbc::XResultSetMetaDataSupplier, ::com::sun::star::sdbc::XResultSetMetaDataSupplier,
::com::sun::star::util::XCancellable, ::com::sun::star::util::XCancellable,

4
mysqlc/source/mysqlc_resultsetmetadata.hxx
View File

@@ -24,7 +24,7 @@
#include <com/sun/star/sdbc/XResultSetMetaData.hpp> #include <com/sun/star/sdbc/XResultSetMetaData.hpp>
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase.hxx>
#include <cppconn/resultset_metadata.h> #include <cppconn/resultset_metadata.h>
namespace connectivity namespace connectivity
@@ -36,7 +36,7 @@ namespace connectivity
//************ Class: ResultSetMetaData //************ Class: ResultSetMetaData
typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; typedef ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE;
class OResultSetMetaData : public OResultSetMetaData_BASE class OResultSetMetaData : public OResultSetMetaData_BASE
{ {

4
mysqlc/source/mysqlc_statement.hxx
View File

@@ -33,7 +33,7 @@
#include <com/sun/star/util/XCancellable.hpp> #include <com/sun/star/util/XCancellable.hpp>
#include <cppconn/statement.h> #include <cppconn/statement.h>
#include <cppuhelper/compbase5.hxx> #include <cppuhelper/compbase.hxx>
#include <list> #include <list>
namespace connectivity namespace connectivity
@@ -45,7 +45,7 @@ namespace connectivity
using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::RuntimeException; using ::com::sun::star::uno::RuntimeException;
typedef ::cppu::WeakComponentImplHelper5< ::com::sun::star::sdbc::XStatement, typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XStatement,
::com::sun::star::sdbc::XWarningsSupplier, ::com::sun::star::sdbc::XWarningsSupplier,
::com::sun::star::util::XCancellable, ::com::sun::star::util::XCancellable,
::com::sun::star::sdbc::XCloseable, ::com::sun::star::sdbc::XCloseable,