[Libreoffice-commits] core.git: connectivity/source connectivity/workben include/connectivity
Takeshi Abe
tabe at fixedpoint.jp
Fri Jul 17 00:18:06 PDT 2015
connectivity/source/commontools/TTableHelper.cxx | 3 -
connectivity/source/commontools/dbtools.cxx | 4 -
connectivity/source/cpool/ZConnectionPool.hxx | 4 -
connectivity/source/cpool/ZConnectionWrapper.hxx | 6 +-
connectivity/source/cpool/ZDriverWrapper.hxx | 6 +-
connectivity/source/cpool/ZPoolCollection.hxx | 12 ++--
connectivity/source/cpool/ZPooledConnection.hxx | 6 +-
connectivity/source/drivers/evoab2/NDriver.hxx | 4 -
connectivity/source/drivers/evoab2/NResultSet.hxx | 20 +++----
connectivity/source/drivers/evoab2/NResultSetMetaData.hxx | 4 -
connectivity/source/drivers/evoab2/NStatement.hxx | 10 +--
connectivity/source/drivers/firebird/Blob.hxx | 6 +-
connectivity/source/drivers/firebird/Connection.hxx | 12 ++--
connectivity/source/drivers/firebird/DatabaseMetaData.hxx | 4 -
connectivity/source/drivers/firebird/Driver.hxx | 8 +--
connectivity/source/drivers/firebird/ResultSet.hxx | 18 +++---
connectivity/source/drivers/firebird/ResultSetMetaData.hxx | 4 -
connectivity/source/drivers/firebird/StatementCommonBase.hxx | 10 +--
connectivity/source/drivers/hsqldb/HTerminateListener.hxx | 4 -
connectivity/source/drivers/kab/KConnection.hxx | 4 -
connectivity/source/drivers/kab/KDatabaseMetaData.hxx | 4 -
connectivity/source/drivers/kab/KDriver.hxx | 8 +--
connectivity/source/drivers/kab/KPreparedStatement.hxx | 12 ++--
connectivity/source/drivers/kab/KResultSet.hxx | 26 +++++-----
connectivity/source/drivers/kab/KResultSetMetaData.hxx | 4 -
connectivity/source/drivers/kab/KStatement.hxx | 14 ++---
connectivity/source/drivers/macab/MacabConnection.hxx | 4 -
connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx | 4 -
connectivity/source/drivers/macab/MacabDriver.hxx | 8 +--
connectivity/source/drivers/macab/MacabPreparedStatement.hxx | 12 ++--
connectivity/source/drivers/macab/MacabResultSet.hxx | 26 +++++-----
connectivity/source/drivers/macab/MacabResultSetMetaData.hxx | 4 -
connectivity/source/drivers/macab/MacabStatement.hxx | 14 ++---
connectivity/source/drivers/mork/MDriver.hxx | 4 -
connectivity/source/drivers/mork/MResultSet.hxx | 26 +++++-----
connectivity/source/drivers/mork/MResultSetMetaData.hxx | 4 -
connectivity/source/drivers/mork/MStatement.hxx | 8 +--
connectivity/source/drivers/mozab/MDriver.hxx | 6 +-
connectivity/source/drivers/mozab/MResultSet.hxx | 26 +++++-----
connectivity/source/drivers/mozab/MResultSetMetaData.hxx | 4 -
connectivity/source/drivers/mozab/MStatement.hxx | 8 +--
connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx | 6 +-
connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx | 4 -
connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx | 4 -
connectivity/source/drivers/postgresql/pq_array.hxx | 4 -
connectivity/source/drivers/postgresql/pq_connection.cxx | 4 -
connectivity/source/drivers/postgresql/pq_connection.hxx | 4 -
connectivity/source/drivers/postgresql/pq_databasemetadata.hxx | 4 -
connectivity/source/drivers/postgresql/pq_driver.cxx | 9 +--
connectivity/source/drivers/postgresql/pq_driver.hxx | 7 +-
connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx | 4 -
connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx | 4 -
connectivity/source/drivers/postgresql/pq_statement.hxx | 15 +++--
connectivity/source/drivers/postgresql/pq_xcolumns.cxx | 4 -
connectivity/source/drivers/postgresql/pq_xcontainer.cxx | 4 -
connectivity/source/drivers/postgresql/pq_xcontainer.hxx | 4 -
connectivity/source/inc/FDatabaseMetaDataResultSet.hxx | 20 +++----
connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx | 4 -
connectivity/source/inc/ParameterSubstitution.hxx | 8 +--
connectivity/source/inc/TConnection.hxx | 12 ++--
connectivity/source/inc/TDatabaseMetaDataBase.hxx | 6 +-
connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx | 16 +++---
connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx | 4 -
connectivity/source/inc/ado/ADriver.hxx | 8 +--
connectivity/source/inc/ado/AResultSet.hxx | 26 +++++-----
connectivity/source/inc/ado/AResultSetMetaData.hxx | 4 -
connectivity/source/inc/ado/AStatement.hxx | 12 ++--
connectivity/source/inc/file/FDriver.hxx | 8 +--
connectivity/source/inc/file/FResultSet.hxx | 26 +++++-----
connectivity/source/inc/file/FResultSetMetaData.hxx | 4 -
connectivity/source/inc/file/FStatement.hxx | 8 +--
connectivity/source/inc/hsqldb/HConnection.hxx | 8 +--
connectivity/source/inc/hsqldb/HDriver.hxx | 4 -
connectivity/source/inc/java/io/InputStream.hxx | 4 -
connectivity/source/inc/java/io/Reader.hxx | 4 -
connectivity/source/inc/java/sql/Array.hxx | 4 -
connectivity/source/inc/java/sql/Blob.hxx | 4 -
connectivity/source/inc/java/sql/Clob.hxx | 4 -
connectivity/source/inc/java/sql/Driver.hxx | 4 -
connectivity/source/inc/java/sql/JStatement.hxx | 14 ++---
connectivity/source/inc/java/sql/Ref.hxx | 4 -
connectivity/source/inc/java/sql/ResultSet.hxx | 22 ++++----
connectivity/source/inc/java/sql/ResultSetMetaData.hxx | 4 -
connectivity/source/inc/mysql/YDriver.hxx | 10 +--
connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx | 16 +++---
connectivity/source/inc/odbc/ODriver.hxx | 4 -
connectivity/source/inc/odbc/OResultSet.hxx | 26 +++++-----
connectivity/source/inc/odbc/OResultSetMetaData.hxx | 4 -
connectivity/source/inc/odbc/OStatement.hxx | 14 ++---
connectivity/source/manager/mdrivermanager.cxx | 4 -
connectivity/source/manager/mdrivermanager.hxx | 10 +--
connectivity/workben/skeleton/SResultSet.hxx | 26 +++++-----
include/connectivity/BlobHelper.hxx | 4 -
include/connectivity/conncleanup.hxx | 8 +--
include/connectivity/paramwrapper.hxx | 8 +--
include/connectivity/sdbcx/VCatalog.hxx | 12 ++--
include/connectivity/sdbcx/VColumn.hxx | 6 +-
include/connectivity/sdbcx/VGroup.hxx | 10 +--
include/connectivity/sdbcx/VTable.hxx | 10 +--
include/connectivity/sdbcx/VUser.hxx | 10 +--
include/connectivity/sdbcx/VView.hxx | 5 -
101 files changed, 443 insertions(+), 446 deletions(-)
New commits:
commit 1a24285dd55c5c85272decc00dc8f93c9a917b8f
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Mon Jul 13 11:21:57 2015 +0900
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 at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index b12f05a..fbd00ec 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -25,6 +25,7 @@
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/sdbcx/KeyType.hpp>
#include <com/sun/star/sdbc/KeyRule.hpp>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -52,7 +53,7 @@ using namespace ::com::sun::star::lang;
namespace
{
/// helper class for column property change events which holds the OComponentDefinition weak
-typedef ::cppu::WeakImplHelper1 < XContainerListener > OTableContainerListener_BASE;
+typedef ::cppu::WeakImplHelper< XContainerListener > OTableContainerListener_BASE;
class OTableContainerListener:
public OTableContainerListener_BASE, private boost::noncopyable
{
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 1d8d157..a3feae5 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -77,7 +77,7 @@
#include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
#include <tools/diagnose_ex.h>
-
+#include <cppuhelper/implbase.hxx>
#include "resource/common_res.hrc"
#include "resource/sharedresources.hxx"
#include <connectivity/OSubComponent.hxx>
@@ -1642,7 +1642,7 @@ bool implSetObject( const Reference< XParameters >& _rxParameters,
namespace
{
- class OParameterWrapper : public ::cppu::WeakImplHelper1< XIndexAccess >
+ class OParameterWrapper : public ::cppu::WeakImplHelper< XIndexAccess >
{
::std::vector<bool, std::allocator<bool> > m_aSet;
Reference<XIndexAccess> m_xSource;
diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx
index d8b3c41..6b85b64 100644
--- a/connectivity/source/cpool/ZConnectionPool.hxx
+++ b/connectivity/source/cpool/ZConnectionPool.hxx
@@ -31,7 +31,7 @@
#include <com/sun/star/beans/XPropertyChangeListener.hpp>
#include <com/sun/star/reflection/XProxyFactory.hpp>
#include <cppuhelper/weakref.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <osl/mutex.hxx>
#include <salhelper/timer.hxx>
#include <rtl/ref.hxx>
@@ -59,7 +59,7 @@ namespace connectivity
// OConnectionPool - the one-instance service for PooledConnections
// manages the active connections and the connections in the pool
- typedef ::cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertyChangeListener> OConnectionPool_Base;
+ typedef ::cppu::WeakImplHelper< ::com::sun::star::beans::XPropertyChangeListener> OConnectionPool_Base;
// typedef for the interanl structure
typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPooledConnection> > TPooledConnections;
diff --git a/connectivity/source/cpool/ZConnectionWrapper.hxx b/connectivity/source/cpool/ZConnectionWrapper.hxx
index f15487f..2c13235 100644
--- a/connectivity/source/cpool/ZConnectionWrapper.hxx
+++ b/connectivity/source/cpool/ZConnectionWrapper.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZCONNECTIONWRAPPER_HXX
#define INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZCONNECTIONWRAPPER_HXX
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/uno3.hxx>
@@ -33,8 +33,8 @@ namespace connectivity
// OConnectionWeakWrapper - wraps all methods to the real connection from the driver
// but when disposed it doesn't dispose the real connection
- typedef ::cppu::WeakComponentImplHelper1< ::com::sun::star::sdbc::XConnection
- > OConnectionWeakWrapper_BASE;
+ typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XConnection
+ > OConnectionWeakWrapper_BASE;
class OConnectionWeakWrapper : public ::comphelper::OBaseMutex
,public OConnectionWeakWrapper_BASE
diff --git a/connectivity/source/cpool/ZDriverWrapper.hxx b/connectivity/source/cpool/ZDriverWrapper.hxx
index 7cf98f6..a4bae6c 100644
--- a/connectivity/source/cpool/ZDriverWrapper.hxx
+++ b/connectivity/source/cpool/ZDriverWrapper.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZDRIVERWRAPPER_HXX
#include <com/sun/star/sdbc/XDriver.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <osl/mutex.hxx>
#include <com/sun/star/uno/XAggregation.hpp>
@@ -32,8 +32,8 @@ namespace connectivity
class OConnectionPool;
- typedef ::cppu::WeakImplHelper1 < ::com::sun::star::sdbc::XDriver
- > ODriverWrapper_BASE;
+ typedef ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XDriver
+ > ODriverWrapper_BASE;
class ODriverWrapper : public ODriverWrapper_BASE
{
diff --git a/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx
index 758a5cd..0ed726c 100644
--- a/connectivity/source/cpool/ZPoolCollection.hxx
+++ b/connectivity/source/cpool/ZPoolCollection.hxx
@@ -23,7 +23,7 @@
#include <map>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/beans/XPropertyChangeListener.hpp>
#include <com/sun/star/sdbc/XDriver.hpp>
#include <com/sun/star/sdbc/XDriverManager2.hpp>
@@ -47,11 +47,11 @@ namespace connectivity
// OPoolCollection - the one-instance service for PooledConnections
// manages the active connections and the connections in the pool
- typedef ::cppu::WeakImplHelper4< ::com::sun::star::sdbc::XConnectionPool,
- ::com::sun::star::lang::XServiceInfo,
- ::com::sun::star::frame::XTerminateListener,
- ::com::sun::star::beans::XPropertyChangeListener
- > OPoolCollection_Base;
+ typedef ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XConnectionPool,
+ ::com::sun::star::lang::XServiceInfo,
+ ::com::sun::star::frame::XTerminateListener,
+ ::com::sun::star::beans::XPropertyChangeListener
+ > OPoolCollection_Base;
/// OPoolCollection: control the whole connection pooling for oo
class OPoolCollection : public OPoolCollection_Base
diff --git a/connectivity/source/cpool/ZPooledConnection.hxx b/connectivity/source/cpool/ZPooledConnection.hxx
index 92d49d9..420dfb8 100644
--- a/connectivity/source/cpool/ZPooledConnection.hxx
+++ b/connectivity/source/cpool/ZPooledConnection.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZPOOLEDCONNECTION_HXX
#define INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZPOOLEDCONNECTION_HXX
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <com/sun/star/sdbc/XPooledConnection.hpp>
#include <com/sun/star/lang/XEventListener.hpp>
#include <comphelper/broadcasthelper.hxx>
@@ -32,8 +32,8 @@ namespace connectivity
// OPooledConnection -
// allows to pool a real connection
- typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::sdbc::XPooledConnection
- ,::com::sun::star::lang::XEventListener> OPooledConnection_Base;
+ typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XPooledConnection
+ ,::com::sun::star::lang::XEventListener> OPooledConnection_Base;
class OPooledConnection : public ::comphelper::OBaseMutex
,public OPooledConnection_Base
diff --git a/connectivity/source/drivers/evoab2/NDriver.hxx b/connectivity/source/drivers/evoab2/NDriver.hxx
index 0d47a79..0a8aed4 100644
--- a/connectivity/source/drivers/evoab2/NDriver.hxx
+++ b/connectivity/source/drivers/evoab2/NDriver.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/sdbc/XDriver.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <comphelper/processfactory.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <connectivity/CommonTools.hxx>
#include <osl/module.h>
@@ -37,7 +37,7 @@ namespace connectivity
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL OEvoabDriver_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception );
- typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::sdbc::XDriver,
+ typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XDriver,
::com::sun::star::lang::XServiceInfo > ODriver_BASE;
diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx b/connectivity/source/drivers/evoab2/NResultSet.hxx
index 080f909..24131ed 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.hxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.hxx
@@ -31,7 +31,7 @@
#include <com/sun/star/sdbc/XRowUpdate.hpp>
#include <com/sun/star/sdbcx/XRowLocate.hpp>
#include <com/sun/star/sdbcx/XDeleteRows.hpp>
-#include <cppuhelper/compbase8.hxx>
+#include <cppuhelper/compbase.hxx>
#include <comphelper/proparrhlp.hxx>
#include <comphelper/propertycontainer.hxx>
#include <connectivity/CommonTools.hxx>
@@ -63,15 +63,15 @@ namespace connectivity
virtual ~OEvoabVersionHelper() {}
};
- typedef ::cppu::WeakComponentImplHelper8 < ::com::sun::star::sdbc::XResultSet
- , ::com::sun::star::sdbc::XRow
- , ::com::sun::star::sdbc::XResultSetMetaDataSupplier
- , ::com::sun::star::util::XCancellable
- , ::com::sun::star::sdbc::XWarningsSupplier
- , ::com::sun::star::sdbc::XCloseable
- , ::com::sun::star::sdbc::XColumnLocate
- , ::com::sun::star::lang::XServiceInfo
- > OResultSet_BASE;
+ typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XResultSet
+ , ::com::sun::star::sdbc::XRow
+ , ::com::sun::star::sdbc::XResultSetMetaDataSupplier
+ , ::com::sun::star::util::XCancellable
+ , ::com::sun::star::sdbc::XWarningsSupplier
+ , ::com::sun::star::sdbc::XCloseable
+ , ::com::sun::star::sdbc::XColumnLocate
+ , ::com::sun::star::lang::XServiceInfo
+ > OResultSet_BASE;
class OEvoabResultSet :public comphelper::OBaseMutex
diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
index 11ce298..d02f368 100644
--- a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
+++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_EVOAB2_NRESULTSETMETADATA_HXX
#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include "NConnection.hxx"
#include <rtl/ref.hxx>
#include <com/sun/star/connection/XConnection.hpp>
@@ -32,7 +32,7 @@ namespace connectivity
//************ Class: ResultSetMetaData
- typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE;
+ typedef ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE;
class OEvoabResultSetMetaData : public OResultSetMetaData_BASE
{
diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx
index f1665d5..34ba585 100644
--- a/connectivity/source/drivers/evoab2/NStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NStatement.hxx
@@ -26,7 +26,7 @@
#include <com/sun/star/sdbc/XCloseable.hpp>
#include <com/sun/star/sdbc/SQLWarning.hpp>
#include <comphelper/proparrhlp.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/implbase2.hxx>
#include <comphelper/uno3.hxx>
#include <connectivity/CommonTools.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -36,7 +36,7 @@
#include <connectivity/FValue.hxx>
#include <connectivity/OSubComponent.hxx>
#include <com/sun/star/util/XCancellable.hpp>
-#include <cppuhelper/compbase5.hxx>
+#include <cppuhelper/compbase.hxx>
#include <comphelper/propertycontainer.hxx>
#include "EApi.h"
@@ -48,9 +48,9 @@ namespace connectivity
{
namespace evoab
{
- typedef ::cppu::WeakComponentImplHelper2 < ::com::sun::star::sdbc::XWarningsSupplier
- , ::com::sun::star::sdbc::XCloseable
- > OCommonStatement_IBase;
+ typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XWarningsSupplier
+ , ::com::sun::star::sdbc::XCloseable
+ > OCommonStatement_IBase;
struct FieldSort
{
diff --git a/connectivity/source/drivers/firebird/Blob.hxx b/connectivity/source/drivers/firebird/Blob.hxx
index bf8c2cf..03c3a12 100644
--- a/connectivity/source/drivers/firebird/Blob.hxx
+++ b/connectivity/source/drivers/firebird/Blob.hxx
@@ -12,7 +12,7 @@
#include <ibase.h>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/sdbc/XBlob.hpp>
@@ -21,8 +21,8 @@ namespace connectivity
{
namespace firebird
{
- typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::sdbc::XBlob,
- ::com::sun::star::io::XInputStream >
+ typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XBlob,
+ ::com::sun::star::io::XInputStream >
Blob_BASE;
class Blob :
diff --git a/connectivity/source/drivers/firebird/Connection.hxx b/connectivity/source/drivers/firebird/Connection.hxx
index 1e90581..47f0ad7 100644
--- a/connectivity/source/drivers/firebird/Connection.hxx
+++ b/connectivity/source/drivers/firebird/Connection.hxx
@@ -28,7 +28,7 @@
#include <boost/scoped_ptr.hpp>
#include <connectivity/CommonTools.hxx>
#include <connectivity/OSubComponent.hxx>
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/weakref.hxx>
#include <map>
#include <OTypeInfo.hxx>
@@ -52,11 +52,11 @@ namespace connectivity
namespace firebird
{
- typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::document::XDocumentEventListener,
- ::com::sun::star::lang::XServiceInfo,
- ::com::sun::star::sdbc::XConnection,
- ::com::sun::star::sdbc::XWarningsSupplier
- > Connection_BASE;
+ typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::document::XDocumentEventListener,
+ ::com::sun::star::lang::XServiceInfo,
+ ::com::sun::star::sdbc::XConnection,
+ ::com::sun::star::sdbc::XWarningsSupplier
+ > Connection_BASE;
class OStatementCommonBase;
class FirebirdDriver;
diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.hxx b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx
index fb43242..5a25bdc 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.hxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx
@@ -23,7 +23,7 @@
#include "Connection.hxx"
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
namespace connectivity
{
@@ -33,7 +33,7 @@ namespace connectivity
//************ 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
{
diff --git a/connectivity/source/drivers/firebird/Driver.hxx b/connectivity/source/drivers/firebird/Driver.hxx
index d01707d..e1600c5 100644
--- a/connectivity/source/drivers/firebird/Driver.hxx
+++ b/connectivity/source/drivers/firebird/Driver.hxx
@@ -26,7 +26,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/sdbc/XDriver.hpp>
#include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
#include <unotools/tempfile.hxx>
namespace connectivity
@@ -40,9 +40,9 @@ namespace connectivity
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL FirebirdDriver_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception, std::exception );
- typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XDriver,
- ::com::sun::star::sdbcx::XDataDefinitionSupplier,
- ::com::sun::star::lang::XServiceInfo > ODriver_BASE;
+ typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XDriver,
+ ::com::sun::star::sdbcx::XDataDefinitionSupplier,
+ ::com::sun::star::lang::XServiceInfo > ODriver_BASE;
class FirebirdDriver : public ODriver_BASE
{
diff --git a/connectivity/source/drivers/firebird/ResultSet.hxx b/connectivity/source/drivers/firebird/ResultSet.hxx
index be3d9ad..4c7b878 100644
--- a/connectivity/source/drivers/firebird/ResultSet.hxx
+++ b/connectivity/source/drivers/firebird/ResultSet.hxx
@@ -26,7 +26,7 @@
#include <connectivity/FValue.hxx>
#include <connectivity/OSubComponent.hxx>
-#include <cppuhelper/compbase7.hxx>
+#include <cppuhelper/compbase.hxx>
#include <comphelper/proparrhlp.hxx>
#include <comphelper/propertycontainer.hxx>
@@ -50,16 +50,16 @@ namespace connectivity
/*
** OResultSet
*/
- typedef ::cppu::WeakComponentImplHelper7< ::com::sun::star::sdbc::XResultSet,
- ::com::sun::star::sdbc::XRow,
- ::com::sun::star::sdbc::XResultSetMetaDataSupplier,
- ::com::sun::star::util::XCancellable,
+ typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XResultSet,
+ ::com::sun::star::sdbc::XRow,
+ ::com::sun::star::sdbc::XResultSetMetaDataSupplier,
+ ::com::sun::star::util::XCancellable,
#if 0
- ::com::sun::star::sdbc::XWarningsSupplier,
+ ::com::sun::star::sdbc::XWarningsSupplier,
#endif
- ::com::sun::star::sdbc::XCloseable,
- ::com::sun::star::sdbc::XColumnLocate,
- ::com::sun::star::lang::XServiceInfo> OResultSet_BASE;
+ ::com::sun::star::sdbc::XCloseable,
+ ::com::sun::star::sdbc::XColumnLocate,
+ ::com::sun::star::lang::XServiceInfo> OResultSet_BASE;
/**
* This ResultSet does not deal with the management of the SQLDA
diff --git a/connectivity/source/drivers/firebird/ResultSetMetaData.hxx b/connectivity/source/drivers/firebird/ResultSetMetaData.hxx
index d8ad569..fc24128 100644
--- a/connectivity/source/drivers/firebird/ResultSetMetaData.hxx
+++ b/connectivity/source/drivers/firebird/ResultSetMetaData.hxx
@@ -24,7 +24,7 @@
#include <ibase.h>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
@@ -32,7 +32,7 @@ namespace connectivity
{
namespace firebird
{
- typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData>
+ typedef ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XResultSetMetaData>
OResultSetMetaData_BASE;
class OResultSetMetaData : public OResultSetMetaData_BASE
diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.hxx b/connectivity/source/drivers/firebird/StatementCommonBase.hxx
index 29c4b28..7c86df6 100644
--- a/connectivity/source/drivers/firebird/StatementCommonBase.hxx
+++ b/connectivity/source/drivers/firebird/StatementCommonBase.hxx
@@ -25,7 +25,7 @@
#include <ibase.h>
#include <connectivity/OSubComponent.hxx>
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase.hxx>
#include <list>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -42,10 +42,10 @@ namespace connectivity
namespace firebird
{
- typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::sdbc::XWarningsSupplier,
- ::com::sun::star::util::XCancellable,
- ::com::sun::star::sdbc::XCloseable,
- ::com::sun::star::sdbc::XMultipleResults> OStatementCommonBase_Base;
+ typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XWarningsSupplier,
+ ::com::sun::star::util::XCancellable,
+ ::com::sun::star::sdbc::XCloseable,
+ ::com::sun::star::sdbc::XMultipleResults> OStatementCommonBase_Base;
class OStatementCommonBase : public OStatementCommonBase_Base,
public ::cppu::OPropertySetHelper,
diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
index 1eded7b..5680a76 100644
--- a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
+++ b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_HSQLDB_HTERMINATELISTENER_HXX
#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_HSQLDB_HTERMINATELISTENER_HXX
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/frame/XTerminateListener.hpp>
@@ -30,7 +30,7 @@ namespace connectivity
namespace hsqldb
{
class ODriverDelegator;
- class OConnectionController : public ::cppu::WeakImplHelper1<
+ class OConnectionController : public ::cppu::WeakImplHelper<
::com::sun::star::frame::XTerminateListener >
{
ODriverDelegator* m_pDriver;
diff --git a/connectivity/source/drivers/kab/KConnection.hxx b/connectivity/source/drivers/kab/KConnection.hxx
index 5fb23e5..4e0b7f9 100644
--- a/connectivity/source/drivers/kab/KConnection.hxx
+++ b/connectivity/source/drivers/kab/KConnection.hxx
@@ -29,7 +29,7 @@
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
#include <comphelper/broadcasthelper.hxx>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
#include <shell/kde_headers.h>
namespace KABC
@@ -46,7 +46,7 @@ namespace connectivity
namespace kab
{
- typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XConnection,
+ typedef ::cppu::WeakComponentImplHelper<::com::sun::star::sdbc::XConnection,
::com::sun::star::sdbc::XWarningsSupplier,
::com::sun::star::lang::XServiceInfo
> OMetaConnection_BASE;
diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx
index 21c51eb..b21ad2e 100644
--- a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx
@@ -22,7 +22,7 @@
#include "KConnection.hxx"
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
namespace connectivity
{
@@ -32,7 +32,7 @@ namespace connectivity
//************ Class: KabDatabaseMetaData
- typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XDatabaseMetaData> KabDatabaseMetaData_BASE;
+ typedef ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XDatabaseMetaData> KabDatabaseMetaData_BASE;
class KabDatabaseMetaData : public KabDatabaseMetaData_BASE
{
diff --git a/connectivity/source/drivers/kab/KDriver.hxx b/connectivity/source/drivers/kab/KDriver.hxx
index 42cea30..4ad3114 100644
--- a/connectivity/source/drivers/kab/KDriver.hxx
+++ b/connectivity/source/drivers/kab/KDriver.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/frame/XTerminateListener.hpp>
#include <comphelper/processfactory.hxx>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
#include <osl/module.h>
namespace connectivity
@@ -130,9 +130,9 @@ namespace connectivity
// = KabDriver
- typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XDriver,
- ::com::sun::star::lang::XServiceInfo,
- ::com::sun::star::frame::XTerminateListener > KDriver_BASE;
+ typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XDriver,
+ ::com::sun::star::lang::XServiceInfo,
+ ::com::sun::star::frame::XTerminateListener > KDriver_BASE;
class KabDriver : public KDriver_BASE
{
protected:
diff --git a/connectivity/source/drivers/kab/KPreparedStatement.hxx b/connectivity/source/drivers/kab/KPreparedStatement.hxx
index a9ba3de..58f7ac3 100644
--- a/connectivity/source/drivers/kab/KPreparedStatement.hxx
+++ b/connectivity/source/drivers/kab/KPreparedStatement.hxx
@@ -25,17 +25,17 @@
#include <connectivity/FValue.hxx>
#include <com/sun/star/sdbc/XParameters.hpp>
#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
namespace connectivity
{
namespace kab
{
- typedef ::cppu::ImplInheritanceHelper4< KabCommonStatement,
- ::com::sun::star::sdbc::XPreparedStatement,
- ::com::sun::star::sdbc::XParameters,
- ::com::sun::star::sdbc::XResultSetMetaDataSupplier,
- ::com::sun::star::lang::XServiceInfo> KabPreparedStatement_BASE;
+ typedef ::cppu::ImplInheritanceHelper< KabCommonStatement,
+ ::com::sun::star::sdbc::XPreparedStatement,
+ ::com::sun::star::sdbc::XParameters,
+ ::com::sun::star::sdbc::XResultSetMetaDataSupplier,
+ ::com::sun::star::lang::XServiceInfo> KabPreparedStatement_BASE;
class KabPreparedStatement : public KabPreparedStatement_BASE
{
diff --git a/connectivity/source/drivers/kab/KResultSet.hxx b/connectivity/source/drivers/kab/KResultSet.hxx
index fc347d4..d1620a9 100644
--- a/connectivity/source/drivers/kab/KResultSet.hxx
+++ b/connectivity/source/drivers/kab/KResultSet.hxx
@@ -30,7 +30,7 @@
#include <com/sun/star/sdbc/XRowUpdate.hpp>
#include <com/sun/star/sdbcx/XRowLocate.hpp>
#include <com/sun/star/sdbcx/XDeleteRows.hpp>
-#include <cppuhelper/compbase12.hxx>
+#include <cppuhelper/compbase.hxx>
namespace connectivity
{
@@ -39,18 +39,18 @@ namespace connectivity
/*
** KabResultSet
*/
- typedef ::cppu::WeakComponentImplHelper12< ::com::sun::star::sdbc::XResultSet,
- ::com::sun::star::sdbc::XRow,
- ::com::sun::star::sdbc::XResultSetMetaDataSupplier,
- ::com::sun::star::util::XCancellable,
- ::com::sun::star::sdbc::XWarningsSupplier,
- ::com::sun::star::sdbc::XResultSetUpdate,
- ::com::sun::star::sdbc::XRowUpdate,
- ::com::sun::star::sdbcx::XRowLocate,
- ::com::sun::star::sdbcx::XDeleteRows,
- ::com::sun::star::sdbc::XCloseable,
- ::com::sun::star::sdbc::XColumnLocate,
- ::com::sun::star::lang::XServiceInfo> KabResultSet_BASE;
+ typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XResultSet,
+ ::com::sun::star::sdbc::XRow,
+ ::com::sun::star::sdbc::XResultSetMetaDataSupplier,
+ ::com::sun::star::util::XCancellable,
+ ::com::sun::star::sdbc::XWarningsSupplier,
+ ::com::sun::star::sdbc::XResultSetUpdate,
+ ::com::sun::star::sdbc::XRowUpdate,
+ ::com::sun::star::sdbcx::XRowLocate,
+ ::com::sun::star::sdbcx::XDeleteRows,
+ ::com::sun::star::sdbc::XCloseable,
+ ::com::sun::star::sdbc::XColumnLocate,
+ ::com::sun::star::lang::XServiceInfo> KabResultSet_BASE;
class KabResultSet : public comphelper::OBaseMutex,
public KabResultSet_BASE,
diff --git a/connectivity/source/drivers/kab/KResultSetMetaData.hxx b/connectivity/source/drivers/kab/KResultSetMetaData.hxx
index f1755d3..61321c9 100644
--- a/connectivity/source/drivers/kab/KResultSetMetaData.hxx
+++ b/connectivity/source/drivers/kab/KResultSetMetaData.hxx
@@ -22,7 +22,7 @@
#include <connectivity/CommonTools.hxx>
#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <rtl/ref.hxx>
namespace connectivity
@@ -32,7 +32,7 @@ namespace connectivity
/*
** KabResultSetMetaData
*/
- typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> KabResultSetMetaData_BASE;
+ typedef ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XResultSetMetaData> KabResultSetMetaData_BASE;
class KabResultSetMetaData : public KabResultSetMetaData_BASE
{
diff --git a/connectivity/source/drivers/kab/KStatement.hxx b/connectivity/source/drivers/kab/KStatement.hxx
index bd01eaf..9f31d23 100644
--- a/connectivity/source/drivers/kab/KStatement.hxx
+++ b/connectivity/source/drivers/kab/KStatement.hxx
@@ -26,18 +26,18 @@
#include <connectivity/sqlparse.hxx>
#include <com/sun/star/sdbc/XStatement.hpp>
#include <com/sun/star/util/XCancellable.hpp>
-#include <cppuhelper/compbase4.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/proparrhlp.hxx>
namespace connectivity
{
namespace kab
{
- typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::sdbc::XStatement,
- ::com::sun::star::sdbc::XWarningsSupplier,
- ::com::sun::star::util::XCancellable,
- ::com::sun::star::sdbc::XCloseable> KabCommonStatement_BASE;
+ typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XStatement,
+ ::com::sun::star::sdbc::XWarningsSupplier,
+ ::com::sun::star::util::XCancellable,
+ ::com::sun::star::sdbc::XCloseable> KabCommonStatement_BASE;
// Class KabCommonStatement
@@ -142,7 +142,7 @@ namespace connectivity
// Class KabStatement
- typedef ::cppu::ImplInheritanceHelper1<
+ typedef ::cppu::ImplInheritanceHelper<
KabCommonStatement, ::com::sun::star::lang::XServiceInfo > KabStatement_BASE;
class KabStatement : public KabStatement_BASE
diff --git a/connectivity/source/drivers/macab/MacabConnection.hxx b/connectivity/source/drivers/macab/MacabConnection.hxx
index 36ed86e..97b6dfe 100644
--- a/connectivity/source/drivers/macab/MacabConnection.hxx
+++ b/connectivity/source/drivers/macab/MacabConnection.hxx
@@ -29,7 +29,7 @@
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
#include <comphelper/broadcasthelper.hxx>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
#include "TConnection.hxx"
namespace connectivity
@@ -37,7 +37,7 @@ namespace connectivity
namespace macab
{
- typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XConnection,
+ typedef ::cppu::WeakComponentImplHelper<::com::sun::star::sdbc::XConnection,
::com::sun::star::sdbc::XWarningsSupplier,
::com::sun::star::lang::XServiceInfo
> OMetaConnection_BASE;
diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx
index 691da30f..f97a779 100644
--- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx
@@ -22,7 +22,7 @@
#include "MacabConnection.hxx"
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
namespace connectivity
{
@@ -32,7 +32,7 @@ namespace connectivity
//************ Class: MacabDatabaseMetaData
- typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XDatabaseMetaData> MacabDatabaseMetaData_BASE;
+ typedef ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XDatabaseMetaData> MacabDatabaseMetaData_BASE;
class MacabDatabaseMetaData : public MacabDatabaseMetaData_BASE
{
diff --git a/connectivity/source/drivers/macab/MacabDriver.hxx b/connectivity/source/drivers/macab/MacabDriver.hxx
index 508cae0..e519b1c 100644
--- a/connectivity/source/drivers/macab/MacabDriver.hxx
+++ b/connectivity/source/drivers/macab/MacabDriver.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/frame/XTerminateListener.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
#include <osl/module.h>
// the address book driver's version
@@ -104,9 +104,9 @@ namespace connectivity
// = MacabDriver
- typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XDriver,
- ::com::sun::star::lang::XServiceInfo,
- ::com::sun::star::frame::XTerminateListener > MacabDriver_BASE;
+ typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XDriver,
+ ::com::sun::star::lang::XServiceInfo,
+ ::com::sun::star::frame::XTerminateListener > MacabDriver_BASE;
class MacabDriver : public MacabDriver_BASE
{
protected:
diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx
index ba4546a..2cf0eb8 100644
--- a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx
+++ b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx
@@ -25,17 +25,17 @@
#include <connectivity/FValue.hxx>
#include <com/sun/star/sdbc/XParameters.hpp>
#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
namespace connectivity
{
namespace macab
{
- typedef ::cppu::ImplInheritanceHelper4< MacabCommonStatement,
- ::com::sun::star::sdbc::XPreparedStatement,
- ::com::sun::star::sdbc::XParameters,
- ::com::sun::star::sdbc::XResultSetMetaDataSupplier,
- ::com::sun::star::lang::XServiceInfo> MacabPreparedStatement_BASE;
+ typedef ::cppu::ImplInheritanceHelper< MacabCommonStatement,
+ ::com::sun::star::sdbc::XPreparedStatement,
+ ::com::sun::star::sdbc::XParameters,
+ ::com::sun::star::sdbc::XResultSetMetaDataSupplier,
+ ::com::sun::star::lang::XServiceInfo> MacabPreparedStatement_BASE;
class MacabPreparedStatement : public MacabPreparedStatement_BASE
{
diff --git a/connectivity/source/drivers/macab/MacabResultSet.hxx b/connectivity/source/drivers/macab/MacabResultSet.hxx
index 61b4cb0..4e048c7 100644
--- a/connectivity/source/drivers/macab/MacabResultSet.hxx
+++ b/connectivity/source/drivers/macab/MacabResultSet.hxx
@@ -29,7 +29,7 @@
#include <com/sun/star/sdbc/XRowUpdate.hpp>
#include <com/sun/star/sdbcx/XRowLocate.hpp>
#include <com/sun/star/sdbcx/XDeleteRows.hpp>
-#include <cppuhelper/compbase12.hxx>
+#include <cppuhelper/compbase.hxx>
namespace connectivity
{
@@ -38,18 +38,18 @@ namespace connectivity
/*
** MacabResultSet
*/
- typedef ::cppu::WeakComponentImplHelper12< ::com::sun::star::sdbc::XResultSet,
- ::com::sun::star::sdbc::XRow,
- ::com::sun::star::sdbc::XResultSetMetaDataSupplier,
- ::com::sun::star::util::XCancellable,
- ::com::sun::star::sdbc::XWarningsSupplier,
- ::com::sun::star::sdbc::XResultSetUpdate,
- ::com::sun::star::sdbc::XRowUpdate,
- ::com::sun::star::sdbcx::XRowLocate,
- ::com::sun::star::sdbcx::XDeleteRows,
- ::com::sun::star::sdbc::XCloseable,
- ::com::sun::star::sdbc::XColumnLocate,
- ::com::sun::star::lang::XServiceInfo> MacabResultSet_BASE;
+ typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XResultSet,
+ ::com::sun::star::sdbc::XRow,
+ ::com::sun::star::sdbc::XResultSetMetaDataSupplier,
+ ::com::sun::star::util::XCancellable,
+ ::com::sun::star::sdbc::XWarningsSupplier,
+ ::com::sun::star::sdbc::XResultSetUpdate,
+ ::com::sun::star::sdbc::XRowUpdate,
+ ::com::sun::star::sdbcx::XRowLocate,
+ ::com::sun::star::sdbcx::XDeleteRows,
+ ::com::sun::star::sdbc::XCloseable,
+ ::com::sun::star::sdbc::XColumnLocate,
+ ::com::sun::star::lang::XServiceInfo> MacabResultSet_BASE;
class MacabRecords;
class MacabResultSet : public comphelper::OBaseMutex,
diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx
index 36dd27c..1867fce 100644
--- a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx
+++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx
@@ -23,7 +23,7 @@
#include "MacabConnection.hxx"
#include <connectivity/CommonTools.hxx>
#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <connectivity/dbexception.hxx>
#include <rtl/ref.hxx>
@@ -34,7 +34,7 @@ namespace connectivity
/*
** MacabResultSetMetaData
*/
- typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> MacabResultSetMetaData_BASE;
+ typedef ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XResultSetMetaData> MacabResultSetMetaData_BASE;
class MacabResultSetMetaData : public MacabResultSetMetaData_BASE
{
diff --git a/connectivity/source/drivers/macab/MacabStatement.hxx b/connectivity/source/drivers/macab/MacabStatement.hxx
index 79d420e..af4f220 100644
--- a/connectivity/source/drivers/macab/MacabStatement.hxx
+++ b/connectivity/source/drivers/macab/MacabStatement.hxx
@@ -27,18 +27,18 @@
#include <connectivity/sqlparse.hxx>
#include <com/sun/star/sdbc/XStatement.hpp>
#include <com/sun/star/util/XCancellable.hpp>
-#include <cppuhelper/compbase4.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/proparrhlp.hxx>
namespace connectivity
{
namespace macab
{
- typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::sdbc::XStatement,
- ::com::sun::star::sdbc::XWarningsSupplier,
- ::com::sun::star::util::XCancellable,
- ::com::sun::star::sdbc::XCloseable> MacabCommonStatement_BASE;
+ typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XStatement,
+ ::com::sun::star::sdbc::XWarningsSupplier,
+ ::com::sun::star::util::XCancellable,
+ ::com::sun::star::sdbc::XCloseable> MacabCommonStatement_BASE;
// Class MacabCommonStatement
@@ -148,7 +148,7 @@ namespace connectivity
// Class MacabStatement
- typedef ::cppu::ImplInheritanceHelper1<
+ typedef ::cppu::ImplInheritanceHelper<
MacabCommonStatement, ::com::sun::star::lang::XServiceInfo > MacabStatement_BASE;
class MacabStatement : public MacabStatement_BASE
diff --git a/connectivity/source/drivers/mork/MDriver.hxx b/connectivity/source/drivers/mork/MDriver.hxx
index 4c83294..f5766c8 100644
--- a/connectivity/source/drivers/mork/MDriver.hxx
+++ b/connectivity/source/drivers/mork/MDriver.hxx
@@ -26,7 +26,7 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/weak.hxx>
#include <rtl/ustring.hxx>
#include <sal/types.h>
@@ -47,7 +47,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL
create(css::uno::Reference< css::uno::XComponentContext > const &);
class MorkDriver:
- public cppu::WeakImplHelper2< css::lang::XServiceInfo, css::sdbc::XDriver >,
+ public cppu::WeakImplHelper< css::lang::XServiceInfo, css::sdbc::XDriver >,
private boost::noncopyable
{
public:
diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx
index 6be1c27..bcb6d47 100644
--- a/connectivity/source/drivers/mork/MResultSet.hxx
+++ b/connectivity/source/drivers/mork/MResultSet.hxx
@@ -31,7 +31,7 @@
#include <com/sun/star/sdbcx/XRowLocate.hpp>
#include <com/sun/star/sdbcx/XDeleteRows.hpp>
#include <com/sun/star/sdbc/XRowUpdate.hpp>
-#include <cppuhelper/compbase12.hxx>
+#include <cppuhelper/compbase.hxx>
#include <comphelper/proparrhlp.hxx>
#include <tools/gen.hxx>
#include "MStatement.hxx"
@@ -49,18 +49,18 @@ namespace connectivity
/*
** java_sql_ResultSet
*/
- typedef ::cppu::WeakComponentImplHelper12< ::com::sun::star::sdbc::XResultSet,
- ::com::sun::star::sdbc::XRow,
- ::com::sun::star::sdbc::XResultSetMetaDataSupplier,
- ::com::sun::star::util::XCancellable,
- ::com::sun::star::sdbc::XWarningsSupplier,
- ::com::sun::star::sdbc::XCloseable,
- ::com::sun::star::sdbc::XColumnLocate,
- ::com::sun::star::sdbc::XResultSetUpdate,
- ::com::sun::star::sdbc::XRowUpdate,
- ::com::sun::star::sdbcx::XRowLocate,
- ::com::sun::star::sdbcx::XDeleteRows,
- ::com::sun::star::lang::XServiceInfo> OResultSet_BASE;
+ typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XResultSet,
+ ::com::sun::star::sdbc::XRow,
+ ::com::sun::star::sdbc::XResultSetMetaDataSupplier,
+ ::com::sun::star::util::XCancellable,
+ ::com::sun::star::sdbc::XWarningsSupplier,
+ ::com::sun::star::sdbc::XCloseable,
+ ::com::sun::star::sdbc::XColumnLocate,
+ ::com::sun::star::sdbc::XResultSetUpdate,
+ ::com::sun::star::sdbc::XRowUpdate,
+ ::com::sun::star::sdbcx::XRowLocate,
+ ::com::sun::star::sdbcx::XDeleteRows,
+ ::com::sun::star::lang::XServiceInfo> OResultSet_BASE;
typedef sal_Int64 TVoidPtr;
diff --git a/connectivity/source/drivers/mork/MResultSetMetaData.hxx b/connectivity/source/drivers/mork/MResultSetMetaData.hxx
index 8e17892..56e7f08 100644
--- a/connectivity/source/drivers/mork/MResultSetMetaData.hxx
+++ b/connectivity/source/drivers/mork/MResultSetMetaData.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MRESULTSETMETADATA_HXX
#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <vector>
#include <rtl/ref.hxx>
#include "MConnection.hxx"
@@ -34,7 +34,7 @@ namespace connectivity
//************ 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
{
diff --git a/connectivity/source/drivers/mork/MStatement.hxx b/connectivity/source/drivers/mork/MStatement.hxx
index 2818aeb..275264b 100644
--- a/connectivity/source/drivers/mork/MStatement.hxx
+++ b/connectivity/source/drivers/mork/MStatement.hxx
@@ -26,7 +26,7 @@
#include <com/sun/star/sdbc/XCloseable.hpp>
#include <com/sun/star/sdbc/SQLWarning.hpp>
#include <comphelper/proparrhlp.hxx>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
#include <comphelper/uno3.hxx>
#include <connectivity/CommonTools.hxx>
#include <list>
@@ -47,9 +47,9 @@ namespace connectivity
{
class OResultSet;
- typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XStatement,
- ::com::sun::star::sdbc::XWarningsSupplier,
- ::com::sun::star::sdbc::XCloseable> OCommonStatement_IBASE;
+ typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XStatement,
+ ::com::sun::star::sdbc::XWarningsSupplier,
+ ::com::sun::star::sdbc::XCloseable> OCommonStatement_IBASE;
//************ Class: OCommonStatement
diff --git a/connectivity/source/drivers/mozab/MDriver.hxx b/connectivity/source/drivers/mozab/MDriver.hxx
index fc2555c..5b3d89f 100644
--- a/connectivity/source/drivers/mozab/MDriver.hxx
+++ b/connectivity/source/drivers/mozab/MDriver.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/sdbc/XDriver.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <connectivity/CommonTools.hxx>
#include <osl/module.h>
@@ -41,8 +41,8 @@ namespace connectivity
typedef const void* (SAL_CALL * OGetSdbcScheme_Function)( short );
- typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::sdbc::XDriver,
- ::com::sun::star::lang::XServiceInfo > ODriver_BASE;
+ typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XDriver,
+ ::com::sun::star::lang::XServiceInfo > ODriver_BASE;
enum EDriverType
{
diff --git a/connectivity/source/drivers/mozab/MResultSet.hxx b/connectivity/source/drivers/mozab/MResultSet.hxx
index 3c1ac24..50475d2 100644
--- a/connectivity/source/drivers/mozab/MResultSet.hxx
+++ b/connectivity/source/drivers/mozab/MResultSet.hxx
@@ -31,7 +31,7 @@
#include <com/sun/star/sdbcx/XRowLocate.hpp>
#include <com/sun/star/sdbcx/XDeleteRows.hpp>
#include <com/sun/star/sdbc/XRowUpdate.hpp>
-#include <cppuhelper/compbase12.hxx>
+#include <cppuhelper/compbase.hxx>
#include <comphelper/proparrhlp.hxx>
#include "MStatement.hxx"
#include <connectivity/CommonTools.hxx>
@@ -49,18 +49,18 @@ namespace connectivity
/*
** java_sql_ResultSet
*/
- typedef ::cppu::WeakComponentImplHelper12< ::com::sun::star::sdbc::XResultSet,
- ::com::sun::star::sdbc::XRow,
- ::com::sun::star::sdbc::XResultSetMetaDataSupplier,
- ::com::sun::star::util::XCancellable,
- ::com::sun::star::sdbc::XWarningsSupplier,
- ::com::sun::star::sdbc::XCloseable,
- ::com::sun::star::sdbc::XColumnLocate,
- ::com::sun::star::sdbc::XResultSetUpdate,
- ::com::sun::star::sdbc::XRowUpdate,
- ::com::sun::star::sdbcx::XRowLocate,
- ::com::sun::star::sdbcx::XDeleteRows,
- ::com::sun::star::lang::XServiceInfo> OResultSet_BASE;
+ typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XResultSet,
+ ::com::sun::star::sdbc::XRow,
+ ::com::sun::star::sdbc::XResultSetMetaDataSupplier,
+ ::com::sun::star::util::XCancellable,
+ ::com::sun::star::sdbc::XWarningsSupplier,
+ ::com::sun::star::sdbc::XCloseable,
+ ::com::sun::star::sdbc::XColumnLocate,
+ ::com::sun::star::sdbc::XResultSetUpdate,
+ ::com::sun::star::sdbc::XRowUpdate,
+ ::com::sun::star::sdbcx::XRowLocate,
+ ::com::sun::star::sdbcx::XDeleteRows,
+ ::com::sun::star::lang::XServiceInfo> OResultSet_BASE;
typedef sal_Int64 TVoidPtr;
diff --git a/connectivity/source/drivers/mozab/MResultSetMetaData.hxx b/connectivity/source/drivers/mozab/MResultSetMetaData.hxx
index 27a0b44..d62e42c 100644
--- a/connectivity/source/drivers/mozab/MResultSetMetaData.hxx
+++ b/connectivity/source/drivers/mozab/MResultSetMetaData.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MRESULTSETMETADATA_HXX
#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <vector>
#include <rtl/ref.hxx>
#include "MConnection.hxx"
@@ -34,7 +34,7 @@ namespace connectivity
//************ 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
{
diff --git a/connectivity/source/drivers/mozab/MStatement.hxx b/connectivity/source/drivers/mozab/MStatement.hxx
index 28bffc1..9cef354 100644
--- a/connectivity/source/drivers/mozab/MStatement.hxx
+++ b/connectivity/source/drivers/mozab/MStatement.hxx
@@ -26,7 +26,7 @@
#include <com/sun/star/sdbc/XCloseable.hpp>
#include <com/sun/star/sdbc/SQLWarning.hpp>
#include <comphelper/proparrhlp.hxx>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
#include <comphelper/uno3.hxx>
#include <connectivity/CommonTools.hxx>
#include <list>
@@ -47,9 +47,9 @@ namespace connectivity
{
class OResultSet;
- typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XStatement,
- ::com::sun::star::sdbc::XWarningsSupplier,
- ::com::sun::star::sdbc::XCloseable> OCommonStatement_IBASE;
+ typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XStatement,
+ ::com::sun::star::sdbc::XWarningsSupplier,
+ ::com::sun::star::sdbc::XCloseable> OCommonStatement_IBASE;
//************ Class: OCommonStatement
diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
index 81637f4..6df693a 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
@@ -21,7 +21,7 @@
#include <com/sun/star/mozilla/XMozillaBootstrap.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <osl/module.h>
@@ -31,8 +31,8 @@ namespace connectivity
{
namespace mozab
{
- typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::mozilla::XMozillaBootstrap,
- ::com::sun::star::lang::XServiceInfo > OMozillaBootstrap_BASE;
+ typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::mozilla::XMozillaBootstrap,
+ ::com::sun::star::lang::XServiceInfo > OMozillaBootstrap_BASE;
class ProfileAccess;
class ProfileManager;
class MozillaBootstrap : public OMozillaBootstrap_BASE
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx
index c412593..c74d2d5 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx
@@ -23,7 +23,7 @@
#include <osl/thread.hxx>
#include "MNSInclude.hxx"
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/mozilla/XCodeProxy.hpp>
#include <com/sun/star/mozilla/XProxyRunner.hpp>
@@ -69,7 +69,7 @@ namespace connectivity
}
};
typedef RunArgs RunArgs;
- typedef ::cppu::WeakImplHelper1< ::com::sun::star::mozilla::XCodeProxy > MNSMozabProxy_BASE;
+ typedef ::cppu::WeakImplHelper< ::com::sun::star::mozilla::XCodeProxy > MNSMozabProxy_BASE;
class MNSMozabProxy : public MNSMozabProxy_BASE
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx
index 6f252d7..c79498c 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx
@@ -20,12 +20,12 @@
#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MOZILLASRC_MNSTERMINATELISTENER_HXX
#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MOZILLASRC_MNSTERMINATELISTENER_HXX
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/frame/XTerminateListener.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
//class to implement the XTerminateListener interface
-class MNSTerminateListener : public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XTerminateListener >
+class MNSTerminateListener : public ::cppu::WeakImplHelper< ::com::sun::star::frame::XTerminateListener >
{
private:
diff --git a/connectivity/source/drivers/postgresql/pq_array.hxx b/connectivity/source/drivers/postgresql/pq_array.hxx
index a774c8c..c5ab9ee 100644
--- a/connectivity/source/drivers/postgresql/pq_array.hxx
+++ b/connectivity/source/drivers/postgresql/pq_array.hxx
@@ -36,7 +36,7 @@
#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_POSTGRESQL_PQ_ARRAY_HXX
#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_POSTGRESQL_PQ_ARRAY_HXX
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/sdbc/XArray.hpp>
#include "pq_connection.hxx"
@@ -44,7 +44,7 @@
namespace pq_sdbc_driver
{
-class Array : public cppu::WeakImplHelper1< com::sun::star::sdbc::XArray >
+class Array : public cppu::WeakImplHelper< com::sun::star::sdbc::XArray >
{
com::sun::star::uno::Sequence< com::sun::star::uno::Any > m_data;
com::sun::star::uno::Reference< com::sun::star::uno::XInterface > m_owner;
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index c20f706..15b00b3 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -57,7 +57,7 @@
#include <osl/module.h>
#include <cppuhelper/implementationentry.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/script/Converter.hpp>
@@ -103,7 +103,7 @@ namespace pq_sdbc_driver
// Helper class for statement lifetime management
-class ClosableReference : public cppu::WeakImplHelper1< com::sun::star::uno::XReference >
+class ClosableReference : public cppu::WeakImplHelper< com::sun::star::uno::XReference >
{
Connection *m_conn;
::rtl::ByteSequence m_id;
diff --git a/connectivity/source/drivers/postgresql/pq_connection.hxx b/connectivity/source/drivers/postgresql/pq_connection.hxx
index 848dc70..ac725ed 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.hxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.hxx
@@ -55,7 +55,7 @@
#include <salhelper/simplereferenceobject.hxx>
#include <cppuhelper/weakref.hxx>
-#include <cppuhelper/compbase6.hxx>
+#include <cppuhelper/compbase.hxx>
#include <boost/functional/hash.hpp>
#include <libpq-fe.h>
@@ -129,7 +129,7 @@ struct ConnectionSettings
};
-typedef cppu::WeakComponentImplHelper6<
+typedef cppu::WeakComponentImplHelper<
com::sun::star::sdbc::XConnection,
com::sun::star::sdbc::XWarningsSupplier,
com::sun::star::lang::XInitialization,
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx
index a61ac4a..1e04c0a 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx
@@ -40,13 +40,13 @@
#include "pq_connection.hxx"
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
namespace pq_sdbc_driver
{
class DatabaseMetaData :
- public ::cppu::WeakImplHelper1 < com::sun::star::sdbc::XDatabaseMetaData >
+ public ::cppu::WeakImplHelper< com::sun::star::sdbc::XDatabaseMetaData >
{
::rtl::Reference< RefCountedMutex > m_refMutex;
ConnectionSettings *m_pSettings;
diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx
index 82dd2d3..28fe284 100644
--- a/connectivity/source/drivers/postgresql/pq_driver.cxx
+++ b/connectivity/source/drivers/postgresql/pq_driver.cxx
@@ -36,8 +36,7 @@
#include <comphelper/processfactory.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/compbase1.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/implementationentry.hxx>
#include <cppuhelper/supportsservice.hxx>
@@ -45,8 +44,6 @@
using osl::MutexGuard;
-using cppu::WeakComponentImplHelper2;
-
using com::sun::star::lang::XSingleComponentFactory;
using com::sun::star::lang::XServiceInfo;
using com::sun::star::lang::XComponent;
@@ -184,7 +181,7 @@ Reference< XInterface > DriverCreateInstance( const Reference < XComponentContex
class OOneInstanceComponentFactory :
public MutexHolder,
- public WeakComponentImplHelper2< XSingleComponentFactory, XServiceInfo >
+ public cppu::WeakComponentImplHelper< XSingleComponentFactory, XServiceInfo >
{
public:
OOneInstanceComponentFactory(
@@ -192,7 +189,7 @@ public:
cppu::ComponentFactoryFunc fptr,
const Sequence< OUString > & serviceNames,
const Reference< XComponentContext > & defaultContext) :
- WeakComponentImplHelper2< XSingleComponentFactory, XServiceInfo >( this->m_mutex ),
+ cppu::WeakComponentImplHelper< XSingleComponentFactory, XServiceInfo >( this->m_mutex ),
m_create( fptr ),
m_serviceNames( serviceNames ),
m_implName( rImplementationName_ ),
diff --git a/connectivity/source/drivers/postgresql/pq_driver.hxx b/connectivity/source/drivers/postgresql/pq_driver.hxx
index b100776..5b55c99 100644
--- a/connectivity/source/drivers/postgresql/pq_driver.hxx
+++ b/connectivity/source/drivers/postgresql/pq_driver.hxx
@@ -39,8 +39,7 @@
#include <osl/mutex.hxx>
-#include <cppuhelper/compbase2.hxx>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -60,11 +59,11 @@ namespace pq_sdbc_driver
struct MutexHolder { osl::Mutex m_mutex; };
// use this to switch off sdbc support !
-// typedef cppu::WeakComponentImplHelper2<
+// typedef cppu::WeakComponentImplHelper<
// com::sun::star::sdbc::XDriver,
// com::sun::star::lang::XServiceInfo
// > DriverBase ;
-typedef cppu::WeakComponentImplHelper3<
+typedef cppu::WeakComponentImplHelper<
com::sun::star::sdbc::XDriver,
com::sun::star::lang::XServiceInfo,
com::sun::star::sdbcx::XDataDefinitionSupplier > DriverBase ;
diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx
index e70d5b0..5b47a28 100644
--- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx
+++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx
@@ -43,7 +43,7 @@
#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
namespace pq_sdbc_driver
{
@@ -65,7 +65,7 @@ typedef std::vector< ColDesc > ColDescVector;
class ResultSetMetaData :
- public ::cppu::WeakImplHelper1 < com::sun::star::sdbc::XResultSetMetaData >
+ public ::cppu::WeakImplHelper< com::sun::star::sdbc::XResultSetMetaData >
{
::rtl::Reference< RefCountedMutex > m_refMutex;
ConnectionSettings **m_ppSettings;
diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx
index 7addf98..7b89f71 100644
--- a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx
+++ b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx
@@ -37,7 +37,7 @@
#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_POSTGRESQL_PQ_SEQUENCERESULTSETMETADATA_HXX
#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_POSTGRESQL_PQ_SEQUENCERESULTSETMETADATA_HXX
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
#include "pq_connection.hxx"
@@ -46,7 +46,7 @@
namespace pq_sdbc_driver
{
class SequenceResultSetMetaData :
- public ::cppu::WeakImplHelper1 < com::sun::star::sdbc::XResultSetMetaData >
+ public ::cppu::WeakImplHelper< com::sun::star::sdbc::XResultSetMetaData >
{
::rtl::Reference< RefCountedMutex > m_refMutex;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > m_origin;
diff --git a/connectivity/source/drivers/postgresql/pq_statement.hxx b/connectivity/source/drivers/postgresql/pq_statement.hxx
index ac189de..6e008fc 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.hxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.hxx
@@ -37,6 +37,7 @@
#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_POSTGRESQL_PQ_STATEMENT_HXX
#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_POSTGRESQL_PQ_STATEMENT_HXX
#include <cppuhelper/propshlp.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/component.hxx>
#include <libpq-fe.h>
@@ -61,13 +62,13 @@ static const sal_Int32 STATEMENT_RESULT_SET_TYPE = 8;
#define STATEMENT_SIZE 9
-typedef ::cppu::WeakComponentImplHelper6< ::com::sun::star::sdbc::XStatement,
- ::com::sun::star::sdbc::XCloseable,
- ::com::sun::star::sdbc::XWarningsSupplier,
- ::com::sun::star::sdbc::XMultipleResults,
- ::com::sun::star::sdbc::XGeneratedResultSet,
- ::com::sun::star::sdbc::XResultSetMetaDataSupplier
- > Statement_BASE;
+typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XStatement,
+ ::com::sun::star::sdbc::XCloseable,
+ ::com::sun::star::sdbc::XWarningsSupplier,
+ ::com::sun::star::sdbc::XMultipleResults,
+ ::com::sun::star::sdbc::XGeneratedResultSet,
+ ::com::sun::star::sdbc::XResultSetMetaDataSupplier
+ > Statement_BASE;
class Statement : public Statement_BASE,
public cppu::OPropertySetHelper
diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
index e11ed1a..33a1c27 100644
--- a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
@@ -42,7 +42,7 @@
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/sdbc/ColumnValue.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include "pq_xcolumns.hxx"
#include "pq_xcolumn.hxx"
@@ -232,7 +232,7 @@ OUString columnMetaData2SDBCX(
}
-// class CommentChanger : public cppu::WeakImplHelper1< XPropertyChangeListener >
+// class CommentChanger : public cppu::WeakImplHelper< XPropertyChangeListener >
// {
// ::rtl::Reference< RefCountedMutex > m_refMutex;
// ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > m_connection;
diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
index 66f917e..c597fc7 100644
--- a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
@@ -40,7 +40,7 @@
#include <com/sun/star/sdbc/XParameters.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include "pq_xcontainer.hxx"
#include "pq_statics.hxx"
@@ -235,7 +235,7 @@ sal_Int32 Container::getCount()
}
-class ContainerEnumeration : public ::cppu::WeakImplHelper1< XEnumeration >
+class ContainerEnumeration : public ::cppu::WeakImplHelper< XEnumeration >
{
com::sun::star::uno::Sequence< com::sun::star::uno::Any > m_vec;
sal_Int32 m_index;
diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx
index 1fe97dc..71227e7 100644
--- a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx
@@ -47,7 +47,7 @@
#include <com/sun/star/util/XRefreshable.hpp>
-#include <cppuhelper/compbase8.hxx>
+#include <cppuhelper/compbase.hxx>
#include <unordered_map>
#include <vector>
@@ -94,7 +94,7 @@ typedef std::unordered_map
::std::equal_to< OUString >
> String2IntMap;
-typedef ::cppu::WeakComponentImplHelper8
+typedef ::cppu::WeakComponentImplHelper
<
com::sun::star::container::XNameAccess,
com::sun::star::container::XIndexAccess,
diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
index 0e5d508..5f1074d 100644
--- a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
@@ -35,7 +35,7 @@
#include <com/sun/star/sdbc/XWarningsSupplier.hpp>
#include <com/sun/star/sdbc/XResultSetUpdate.hpp>
#include <com/sun/star/sdbc/XRowUpdate.hpp>
-#include <cppuhelper/compbase9.hxx>
+#include <cppuhelper/compbase.hxx>
#include <comphelper/proparrhlp.hxx>
#include <connectivity/CommonTools.hxx>
#include <comphelper/propertycontainer.hxx>
@@ -46,15 +46,15 @@
namespace connectivity
{
- typedef ::cppu::WeakComponentImplHelper9< ::com::sun::star::sdbc::XResultSet,
- ::com::sun::star::sdbc::XRow,
- ::com::sun::star::sdbc::XResultSetMetaDataSupplier,
- ::com::sun::star::util::XCancellable,
- ::com::sun::star::sdbc::XWarningsSupplier,
- ::com::sun::star::sdbc::XCloseable,
- ::com::sun::star::lang::XInitialization,
- ::com::sun::star::lang::XServiceInfo,
- ::com::sun::star::sdbc::XColumnLocate> ODatabaseMetaDataResultSet_BASE;
+ typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XResultSet,
+ ::com::sun::star::sdbc::XRow,
+ ::com::sun::star::sdbc::XResultSetMetaDataSupplier,
+ ::com::sun::star::util::XCancellable,
+ ::com::sun::star::sdbc::XWarningsSupplier,
+ ::com::sun::star::sdbc::XCloseable,
+ ::com::sun::star::lang::XInitialization,
+ ::com::sun::star::lang::XServiceInfo,
+ ::com::sun::star::sdbc::XColumnLocate> ODatabaseMetaDataResultSet_BASE;
// typedef ORefVector<ORowSetValue> ORow;
// typedef ORefVector<ORow> ORows;
diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
index 5ecd3fd..b58839b 100644
--- a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
+++ b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_CONNECTIVITY_SOURCE_INC_FDATABASEMETADATARESULTSETMETADATA_HXX
#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <vector>
#include "FDatabaseMetaDataResultSet.hxx"
#include "OColumn.hxx"
@@ -33,7 +33,7 @@ namespace connectivity
//************ Class: ODatabaseMetaDataResultSetMetaData
- typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> ODatabaseMetaResultSetMetaData_BASE;
+ typedef ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XResultSetMetaData> ODatabaseMetaResultSetMetaData_BASE;
class OOO_DLLPUBLIC_DBTOOLS ODatabaseMetaDataResultSetMetaData : public ODatabaseMetaResultSetMetaData_BASE
{
diff --git a/connectivity/source/inc/ParameterSubstitution.hxx b/connectivity/source/inc/ParameterSubstitution.hxx
index ab6214e..ecb2c59 100644
--- a/connectivity/source/inc/ParameterSubstitution.hxx
+++ b/connectivity/source/inc/ParameterSubstitution.hxx
@@ -25,13 +25,13 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
namespace connectivity
{
- typedef ::cppu::WeakImplHelper3< ::com::sun::star::util::XStringSubstitution
- ,::com::sun::star::lang::XServiceInfo
- ,::com::sun::star::lang::XInitialization > ParameterSubstitution_BASE;
+ typedef ::cppu::WeakImplHelper< ::com::sun::star::util::XStringSubstitution
+ ,::com::sun::star::lang::XServiceInfo
+ ,::com::sun::star::lang::XInitialization > ParameterSubstitution_BASE;
class ParameterSubstitution : public ParameterSubstitution_BASE
{
::osl::Mutex m_aMutex;
diff --git a/connectivity/source/inc/TConnection.hxx b/connectivity/source/inc/TConnection.hxx
index fcc589f..cfba2583 100644
--- a/connectivity/source/inc/TConnection.hxx
+++ b/connectivity/source/inc/TConnection.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/sdbc/XWarningsSupplier.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase.hxx>
#include "propertyids.hxx"
#include <connectivity/CommonTools.hxx>
#include <connectivity/dbtoolsdllapi.hxx>
@@ -33,11 +33,11 @@
namespace connectivity
{
- typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::sdbc::XConnection,
- ::com::sun::star::sdbc::XWarningsSupplier,
- ::com::sun::star::lang::XServiceInfo,
- ::com::sun::star::lang::XUnoTunnel
- > OMetaConnection_BASE;
+ typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XConnection,
+ ::com::sun::star::sdbc::XWarningsSupplier,
+ ::com::sun::star::lang::XServiceInfo,
+ ::com::sun::star::lang::XUnoTunnel
+ > OMetaConnection_BASE;
typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > TConditions;
diff --git a/connectivity/source/inc/TDatabaseMetaDataBase.hxx b/connectivity/source/inc/TDatabaseMetaDataBase.hxx
index c05cc30..20cba62 100644
--- a/connectivity/source/inc/TDatabaseMetaDataBase.hxx
+++ b/connectivity/source/inc/TDatabaseMetaDataBase.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_CONNECTIVITY_SOURCE_INC_TDATABASEMETADATABASE_HXX
#include <com/sun/star/sdbc/XDatabaseMetaData2.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <com/sun/star/lang/XEventListener.hpp>
#include "FDatabaseMetaDataResultSet.hxx"
@@ -33,8 +33,8 @@ namespace connectivity
typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > TConditions;
class OOO_DLLPUBLIC_DBTOOLS ODatabaseMetaDataBase :
public comphelper::OBaseMutex,
- public ::cppu::WeakImplHelper2< ::com::sun::star::sdbc::XDatabaseMetaData2,
- ::com::sun::star::lang::XEventListener>
+ public ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XDatabaseMetaData2,
+ ::com::sun::star::lang::XEventListener>
{
private:
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aConnectionInfo;
diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
index b9d740e..715b28b 100644
--- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
@@ -29,7 +29,7 @@
#include <com/sun/star/sdbc/XWarningsSupplier.hpp>
#include <com/sun/star/sdbc/XResultSetUpdate.hpp>
#include <com/sun/star/sdbc/XRowUpdate.hpp>
-#include <cppuhelper/compbase7.hxx>
+#include <cppuhelper/compbase.hxx>
#include <comphelper/proparrhlp.hxx>
#include "ado/AStatement.hxx"
#include <comphelper/broadcasthelper.hxx>
@@ -42,13 +42,13 @@ namespace connectivity
/*
** java_sql_ResultSet
*/
- typedef ::cppu::WeakComponentImplHelper7< ::com::sun::star::sdbc::XResultSet,
- ::com::sun::star::sdbc::XRow,
- ::com::sun::star::sdbc::XResultSetMetaDataSupplier,
- ::com::sun::star::util::XCancellable,
- ::com::sun::star::sdbc::XWarningsSupplier,
- ::com::sun::star::sdbc::XCloseable,
- ::com::sun::star::sdbc::XColumnLocate> ODatabaseMetaDataResultSet_BASE;
+ typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XResultSet,
+ ::com::sun::star::sdbc::XRow,
+ ::com::sun::star::sdbc::XResultSetMetaDataSupplier,
+ ::com::sun::star::util::XCancellable,
+ ::com::sun::star::sdbc::XWarningsSupplier,
+ ::com::sun::star::sdbc::XCloseable,
+ ::com::sun::star::sdbc::XColumnLocate> ODatabaseMetaDataResultSet_BASE;
class ODatabaseMetaDataResultSet : public comphelper::OBaseMutex,
public ODatabaseMetaDataResultSet_BASE,
diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
index da55c26..99e5969 100644
--- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ADATABASEMETADATARESULTSETMETADATA_HXX
#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <vector>
#include "ado/Awrapado.hxx"
#include "ado/ADatabaseMetaDataResultSet.hxx"
@@ -34,7 +34,7 @@ namespace connectivity
//************ Class: ResultSetMetaData
- typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> ODatabaseMetaResultSetMetaData_BASE;
+ typedef ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XResultSetMetaData> ODatabaseMetaResultSetMetaData_BASE;
class ODatabaseMetaDataResultSetMetaData : public ODatabaseMetaResultSetMetaData_BASE
{
diff --git a/connectivity/source/inc/ado/ADriver.hxx b/connectivity/source/inc/ado/ADriver.hxx
index 3195666..5a05a92 100644
--- a/connectivity/source/inc/ado/ADriver.hxx
+++ b/connectivity/source/inc/ado/ADriver.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/sdbc/XDriver.hpp>
#include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
#include <connectivity/CommonTools.hxx>
namespace com { namespace sun { namespace star { namespace lang {
@@ -37,9 +37,9 @@ namespace connectivity
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ODriver_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception );
- typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XDriver,
- ::com::sun::star::sdbcx::XDataDefinitionSupplier,
- ::com::sun::star::lang::XServiceInfo
+ typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XDriver,
+ ::com::sun::star::sdbcx::XDataDefinitionSupplier,
+ ::com::sun::star::lang::XServiceInfo
> ODriver_BASE;
class ODriver : public ODriver_BASE
{
diff --git a/connectivity/source/inc/ado/AResultSet.hxx b/connectivity/source/inc/ado/AResultSet.hxx
index f9d1312..e11ec8e 100644
--- a/connectivity/source/inc/ado/AResultSet.hxx
+++ b/connectivity/source/inc/ado/AResultSet.hxx
@@ -31,7 +31,7 @@
#include <com/sun/star/sdbcx/XRowLocate.hpp>
#include <com/sun/star/sdbcx/XDeleteRows.hpp>
#include <com/sun/star/sdbc/XRowUpdate.hpp>
-#include <cppuhelper/compbase12.hxx>
+#include <cppuhelper/compbase.hxx>
#include <comphelper/proparrhlp.hxx>
#include "ado/AStatement.hxx"
#include <comphelper/broadcasthelper.hxx>
@@ -44,18 +44,18 @@ namespace connectivity
/*
** java_sql_ResultSet
*/
- typedef ::cppu::WeakComponentImplHelper12< ::com::sun::star::sdbc::XResultSet,
- ::com::sun::star::sdbc::XRow,
- ::com::sun::star::sdbc::XResultSetMetaDataSupplier,
- ::com::sun::star::util::XCancellable,
- ::com::sun::star::sdbc::XWarningsSupplier,
- ::com::sun::star::sdbc::XResultSetUpdate,
- ::com::sun::star::sdbc::XRowUpdate,
- ::com::sun::star::sdbc::XCloseable,
- ::com::sun::star::sdbc::XColumnLocate,
- ::com::sun::star::sdbcx::XRowLocate,
- ::com::sun::star::sdbcx::XDeleteRows,
- ::com::sun::star::lang::XServiceInfo> OResultSet_BASE;
+ typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XResultSet,
+ ::com::sun::star::sdbc::XRow,
+ ::com::sun::star::sdbc::XResultSetMetaDataSupplier,
+ ::com::sun::star::util::XCancellable,
+ ::com::sun::star::sdbc::XWarningsSupplier,
+ ::com::sun::star::sdbc::XResultSetUpdate,
+ ::com::sun::star::sdbc::XRowUpdate,
+ ::com::sun::star::sdbc::XCloseable,
+ ::com::sun::star::sdbc::XColumnLocate,
+ ::com::sun::star::sdbcx::XRowLocate,
+ ::com::sun::star::sdbcx::XDeleteRows,
+ ::com::sun::star::lang::XServiceInfo> OResultSet_BASE;
class OResultSet : public comphelper::OBaseMutex,
public OResultSet_BASE,
diff --git a/connectivity/source/inc/ado/AResultSetMetaData.hxx b/connectivity/source/inc/ado/AResultSetMetaData.hxx
index 630426c..d5a32e0 100644
--- a/connectivity/source/inc/ado/AResultSetMetaData.hxx
+++ b/connectivity/source/inc/ado/AResultSetMetaData.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ARESULTSETMETADATA_HXX
#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <vector>
#include "ado/Awrapado.hxx"
#include "ado/AResultSet.hxx"
@@ -35,7 +35,7 @@ namespace connectivity
//************ 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
{
diff --git a/connectivity/source/inc/ado/AStatement.hxx b/connectivity/source/inc/ado/AStatement.hxx
index 45798fb..4db83c4 100644
--- a/connectivity/source/inc/ado/AStatement.hxx
+++ b/connectivity/source/inc/ado/AStatement.hxx
@@ -27,7 +27,7 @@
#include <com/sun/star/sdbc/XCloseable.hpp>
#include <com/sun/star/sdbc/SQLWarning.hpp>
#include <com/sun/star/util/XCancellable.hpp>
-#include <cppuhelper/compbase5.hxx>
+#include <cppuhelper/compbase.hxx>
#include <comphelper/proparrhlp.hxx>
#include <comphelper/uno3.hxx>
#include <comphelper/broadcasthelper.hxx>
@@ -40,11 +40,11 @@ namespace connectivity
{
namespace ado
{
- typedef ::cppu::WeakComponentImplHelper5< ::com::sun::star::sdbc::XStatement,
- ::com::sun::star::sdbc::XWarningsSupplier,
- ::com::sun::star::util::XCancellable,
- ::com::sun::star::sdbc::XCloseable,
- ::com::sun::star::sdbc::XMultipleResults> OStatement_BASE;
+ typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XStatement,
+ ::com::sun::star::sdbc::XWarningsSupplier,
+ ::com::sun::star::util::XCancellable,
+ ::com::sun::star::sdbc::XCloseable,
+ ::com::sun::star::sdbc::XMultipleResults> OStatement_BASE;
//************ Class: java.sql.Statement
diff --git a/connectivity/source/inc/file/FDriver.hxx b/connectivity/source/inc/file/FDriver.hxx
index 4237497..fb554fa 100644
--- a/connectivity/source/inc/file/FDriver.hxx
+++ b/connectivity/source/inc/file/FDriver.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/sdbc/XDriver.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
#include <connectivity/CommonTools.hxx>
#include "file/filedllapi.hxx"
@@ -31,9 +31,9 @@ namespace connectivity
{
namespace file
{
- typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XDriver,
- ::com::sun::star::lang::XServiceInfo,
- ::com::sun::star::sdbcx::XDataDefinitionSupplier> ODriver_BASE;
+ typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XDriver,
+ ::com::sun::star::lang::XServiceInfo,
+ ::com::sun::star::sdbcx::XDataDefinitionSupplier> ODriver_BASE;
class OOO_DLLPUBLIC_FILE SAL_NO_VTABLE OFileDriver : public ODriver_BASE
{
diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx
index 74d1d19..e09e23d 100644
--- a/connectivity/source/inc/file/FResultSet.hxx
+++ b/connectivity/source/inc/file/FResultSet.hxx
@@ -29,7 +29,7 @@
#include <com/sun/star/sdbc/XWarningsSupplier.hpp>
#include <com/sun/star/sdbc/XResultSetUpdate.hpp>
#include <com/sun/star/sdbc/XRowUpdate.hpp>
-#include <cppuhelper/compbase12.hxx>
+#include <cppuhelper/compbase.hxx>
#include <comphelper/proparrhlp.hxx>
#include "file/FStatement.hxx"
#include <connectivity/CommonTools.hxx>
@@ -47,18 +47,18 @@ namespace connectivity
{
namespace file
{
- typedef ::cppu::WeakComponentImplHelper12< ::com::sun::star::sdbc::XResultSet,
- ::com::sun::star::sdbc::XRow,
- ::com::sun::star::sdbc::XResultSetMetaDataSupplier,
- ::com::sun::star::util::XCancellable,
- ::com::sun::star::sdbc::XWarningsSupplier,
- ::com::sun::star::sdbc::XResultSetUpdate,
- ::com::sun::star::sdbc::XRowUpdate,
- ::com::sun::star::sdbc::XCloseable,
- ::com::sun::star::sdbc::XColumnLocate,
- ::com::sun::star::lang::XServiceInfo,
- ::com::sun::star::lang::XEventListener,
- ::com::sun::star::lang::XUnoTunnel> OResultSet_BASE;
+ typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XResultSet,
+ ::com::sun::star::sdbc::XRow,
+ ::com::sun::star::sdbc::XResultSetMetaDataSupplier,
+ ::com::sun::star::util::XCancellable,
+ ::com::sun::star::sdbc::XWarningsSupplier,
+ ::com::sun::star::sdbc::XResultSetUpdate,
+ ::com::sun::star::sdbc::XRowUpdate,
+ ::com::sun::star::sdbc::XCloseable,
+ ::com::sun::star::sdbc::XColumnLocate,
+ ::com::sun::star::lang::XServiceInfo,
+ ::com::sun::star::lang::XEventListener,
+ ::com::sun::star::lang::XUnoTunnel> OResultSet_BASE;
class OOO_DLLPUBLIC_FILE OResultSet :
public comphelper::OBaseMutex,
diff --git a/connectivity/source/inc/file/FResultSetMetaData.hxx b/connectivity/source/inc/file/FResultSetMetaData.hxx
index 3d62d94..0b54b4b 100644
--- a/connectivity/source/inc/file/FResultSetMetaData.hxx
+++ b/connectivity/source/inc/file/FResultSetMetaData.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FRESULTSETMETADATA_HXX
#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <connectivity/CommonTools.hxx>
#include <rtl/ref.hxx>
#include "file/filedllapi.hxx"
@@ -34,7 +34,7 @@ namespace connectivity
//************ Class: ResultSetMetaData
- typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE;
+ typedef ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE;
class OOO_DLLPUBLIC_FILE OResultSetMetaData :
public OResultSetMetaData_BASE
diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx
index 8f5bf90..356a40e 100644
--- a/connectivity/source/inc/file/FStatement.hxx
+++ b/connectivity/source/inc/file/FStatement.hxx
@@ -28,7 +28,7 @@
#include <com/sun/star/sdbc/SQLWarning.hpp>
#include <com/sun/star/util/XCancellable.hpp>
#include <comphelper/proparrhlp.hxx>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/implbase2.hxx>
#include <comphelper/uno3.hxx>
#include <connectivity/CommonTools.hxx>
@@ -47,9 +47,9 @@ namespace connectivity
{
class OResultSet;
class OFileTable;
- typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XWarningsSupplier,
- ::com::sun::star::util::XCancellable,
- ::com::sun::star::sdbc::XCloseable> OStatement_BASE;
+ typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XWarningsSupplier,
+ ::com::sun::star::util::XCancellable,
+ ::com::sun::star::sdbc::XCloseable> OStatement_BASE;
//************ Class: java.sql.Statement
diff --git a/connectivity/source/inc/hsqldb/HConnection.hxx b/connectivity/source/inc/hsqldb/HConnection.hxx
index 3fbe63c..d97437b 100644
--- a/connectivity/source/inc/hsqldb/HConnection.hxx
+++ b/connectivity/source/inc/hsqldb/HConnection.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/sdbc/XDriver.hpp>
#include <com/sun/star/sdb/application/XTableUIProvider.hpp>
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
-#include <cppuhelper/compbase2.hxx>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list