diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-07-13 11:21:57 +0900 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-17 07:17:37 +0000 |
| commit | 1a24285dd55c5c85272decc00dc8f93c9a917b8f (patch) | |
| tree | 0ac843f84ace01842ccf28ea222ed64fee234910 | |
| parent | a175788dcd3edd4c82f70458f0fa6e7b44d86526 (diff) | |
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@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
101 files changed, 443 insertions, 446 deletions
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx index b12f05a964eb..fbd00ec7211f 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 1d8d157e638b..a3feae5f497f 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 d8b3c41c0d07..6b85b6414700 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 f15487f8d77f..2c13235b8499 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 7cf98f6bd953..a4bae6c79839 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 758a5cd76235..0ed726c14fe3 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 92d49d956d98..420dfb86fc32 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 0d47a7954865..0a8aed4687b0 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 080f909683be..24131ed2e968 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 11ce298b821f..d02f3685891a 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 f1665d57c8c1..34ba585cb79a 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 bf8c2cfedf40..03c3a129a70f 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 1e90581ba755..47f0ad7bf026 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 fb43242bb9d0..5a25bdc1603d 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 d01707df8865..e1600c584ad1 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 be3d9ad2bc40..4c7b878fea04 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 d8ad5697d0aa..fc2412854227 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 29c4b2860427..7c86df68eb42 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 1eded7b15567..5680a76431c3 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 5fb23e515a9c..4e0b7f9214b5 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 21c51eb48be6..b21ad2e95c15 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 42cea307acbb..4ad311483ee2 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 a9ba3de46293..58f7ac377b06 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 fc347d485ef5..d1620a9b7fc9 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 f1755d3dba54..61321c9d486c 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 bd01eaf88437..9f31d23d464f 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 36ed86ea7d3a..97b6dfe21bc5 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 691da30f79dc..f97a779c3032 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 508cae0d83d8..e519b1c0fef2 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 ba4546afdb93..2cf0eb8fb799 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 61b4cb0746f2..4e048c7ee799 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 36dd27c5e760..1867fce1e0fb 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 79d420e38518..af4f220f3266 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 4c832948e702..f5766c812b53 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 6be1c27e4e78..bcb6d473a4b1 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 8e17892a8780..56e7f08e7739 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 2818aeb439b3..275264bdc2b8 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 fc2555cd1f08..5b3d89f8fe9b 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 3c1ac243af18..50475d284985 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 27a0b44bbf2c..d62e42c4c277 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 28bffc1396f9..9cef3544b9d0 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 81637f4f8c27..6df693a7229f 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 c41259394021..c74d2d5a1b4c 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 6f252d7a1c19..c79498cf5510 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 a774c8c981a6..c5ab9ee6f444 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 c20f706b365f..15b00b3102c9 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 848dc70a4edf..ac725edeed78 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 a61ac4a6e333..1e04c0a1bd42 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 82dd2d3db1a8..28fe28482ebe 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 b10077656135..5b55c99ce6bb 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 e70d5b04a733..5b47a2895f6f 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 7addf98add4d..7b89f71d5072 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 ac189ded3f81..6e008fc94601 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 e11ed1a6c7c8..33a1c27cad4e 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 66f917e1869c..c597fc7b6a74 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 1fe97dc4c44c..71227e74a2fd 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 0e5d5084d10c..5f1074df1bdc 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 5ecd3fd22f82..b58839b0347f 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 ab6214edd6be..ecb2c59e3734 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 fcc589f5efb4..cfba2583f65d 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 c05cc3076a12..20cba621c321 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 b9d740eec8f6..715b28beb2db 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 da55c26a921f..99e5969c9ae9 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 3195666e58d2..5a05a922319c 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 f9d1312f0205..e11ec8ede50a 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 630426ca6a2c..d5a32e044388 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 45798fb5f337..4db83c4aab38 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 42374972b569..fb554fa35630 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 74d1d195f757..e09e23d12b5d 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 3d62d944812b..0b54b4bc6e42 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 8f5bf903682a..356a40e997b1 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 3fbe63c6b657..d97437b8373b 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> +#include <cppuhelper/compbase.hxx> #include <comphelper/uno3.hxx> #include <cppuhelper/interfacecontainer.hxx> @@ -47,9 +47,9 @@ namespace connectivity // OHsqlConnection - wraps all methods to the real connection from the driver // but when disposed it doesn't dispose the real connection - typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::util::XFlushable - , ::com::sun::star::sdb::application::XTableUIProvider - > OHsqlConnection_BASE; + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::util::XFlushable + , ::com::sun::star::sdb::application::XTableUIProvider + > OHsqlConnection_BASE; class OHsqlConnection :public ::comphelper::OBaseMutex ,public OHsqlConnection_BASE diff --git a/connectivity/source/inc/hsqldb/HDriver.hxx b/connectivity/source/inc/hsqldb/HDriver.hxx index e7921a484b7f..021e0bf9b396 100644 --- a/connectivity/source/inc/hsqldb/HDriver.hxx +++ b/connectivity/source/inc/hsqldb/HDriver.hxx @@ -26,7 +26,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <cppuhelper/compbase5.hxx> +#include <cppuhelper/compbase.hxx> #include <comphelper/uno3.hxx> #include <comphelper/broadcasthelper.hxx> #include <connectivity/CommonTools.hxx> @@ -40,7 +40,7 @@ namespace connectivity { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ODriverDelegator_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ); - typedef ::cppu::WeakComponentImplHelper5< ::com::sun::star::sdbc::XDriver + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XDriver ,::com::sun::star::sdbcx::XDataDefinitionSupplier , ::com::sun::star::lang::XServiceInfo , ::com::sun::star::sdbcx::XCreateCatalog diff --git a/connectivity/source/inc/java/io/InputStream.hxx b/connectivity/source/inc/java/io/InputStream.hxx index c13a3db87cf9..7fe257f5e033 100644 --- a/connectivity/source/inc/java/io/InputStream.hxx +++ b/connectivity/source/inc/java/io/InputStream.hxx @@ -20,7 +20,7 @@ #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_IO_INPUTSTREAM_HXX #include "java/lang/Object.hxx" -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/io/XInputStream.hpp> namespace connectivity @@ -30,7 +30,7 @@ namespace connectivity //************ Class: java.io.InputStream class java_io_InputStream : public java_lang_Object, - public ::cppu::WeakImplHelper1< ::com::sun::star::io::XInputStream> + public ::cppu::WeakImplHelper< ::com::sun::star::io::XInputStream> { protected: // static Data for the Class diff --git a/connectivity/source/inc/java/io/Reader.hxx b/connectivity/source/inc/java/io/Reader.hxx index 7dec76447f42..91a6a1b66d2f 100644 --- a/connectivity/source/inc/java/io/Reader.hxx +++ b/connectivity/source/inc/java/io/Reader.hxx @@ -21,7 +21,7 @@ #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_IO_READER_HXX #include "java/lang/Object.hxx" -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/io/XInputStream.hpp> #include <boost/optional.hpp> @@ -31,7 +31,7 @@ namespace connectivity //************ Class: java.io.InputStream class java_io_Reader : public java_lang_Object, - public ::cppu::WeakImplHelper1< ::com::sun::star::io::XInputStream> + public ::cppu::WeakImplHelper< ::com::sun::star::io::XInputStream> { protected: // static Data for the Class diff --git a/connectivity/source/inc/java/sql/Array.hxx b/connectivity/source/inc/java/sql/Array.hxx index ed5cb1c3f65c..057dda4c3cad 100644 --- a/connectivity/source/inc/java/sql/Array.hxx +++ b/connectivity/source/inc/java/sql/Array.hxx @@ -21,7 +21,7 @@ #include "java/lang/Object.hxx" #include <com/sun/star/sdbc/XArray.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> namespace connectivity { @@ -30,7 +30,7 @@ namespace connectivity //************ Class: java.sql.SQLWarning class java_sql_Array : public java_lang_Object, - public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XArray> + public ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XArray> { protected: // Static data for the class diff --git a/connectivity/source/inc/java/sql/Blob.hxx b/connectivity/source/inc/java/sql/Blob.hxx index de79fbb0fb41..d57e830a25ff 100644 --- a/connectivity/source/inc/java/sql/Blob.hxx +++ b/connectivity/source/inc/java/sql/Blob.hxx @@ -22,7 +22,7 @@ #include "java/lang/Object.hxx" #include <com/sun/star/sdbc/XBlob.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> namespace connectivity { @@ -31,7 +31,7 @@ namespace connectivity //************ Class: java.sql.SQLWarning class java_sql_Blob : public java_lang_Object, - public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XBlob> + public ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XBlob> { protected: // Static data for the class diff --git a/connectivity/source/inc/java/sql/Clob.hxx b/connectivity/source/inc/java/sql/Clob.hxx index 25d1cee62a44..d1a0fedbe8bc 100644 --- a/connectivity/source/inc/java/sql/Clob.hxx +++ b/connectivity/source/inc/java/sql/Clob.hxx @@ -22,7 +22,7 @@ #include "java/lang/Object.hxx" #include <com/sun/star/sdbc/XClob.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> namespace connectivity { @@ -31,7 +31,7 @@ namespace connectivity //************ Class: java.sql.SQLWarning class java_sql_Clob : public java_lang_Object, - public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XClob> + public ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XClob> { protected: // Static data for the class diff --git a/connectivity/source/inc/java/sql/Driver.hxx b/connectivity/source/inc/java/sql/Driver.hxx index 068a9aefd475..233a83b046a3 100644 --- a/connectivity/source/inc/java/sql/Driver.hxx +++ b/connectivity/source/inc/java/sql/Driver.hxx @@ -22,7 +22,7 @@ #include <com/sun/star/sdbc/XDriver.hpp> #include "java/lang/Object.hxx" -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <comphelper/logging.hxx> @@ -31,7 +31,7 @@ namespace connectivity { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL java_sql_Driver_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ); - class java_sql_Driver : public ::cppu::WeakImplHelper2< ::com::sun::star::sdbc::XDriver,::com::sun::star::lang::XServiceInfo> + class java_sql_Driver : public ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XDriver,::com::sun::star::lang::XServiceInfo> { css::uno::Reference<css::uno::XComponentContext> m_aContext; ::comphelper::ResourceBasedEventLogger m_aLogger; diff --git a/connectivity/source/inc/java/sql/JStatement.hxx b/connectivity/source/inc/java/sql/JStatement.hxx index 716e14d8a15f..18cdc4e8e354 100644 --- a/connectivity/source/inc/java/sql/JStatement.hxx +++ b/connectivity/source/inc/java/sql/JStatement.hxx @@ -28,7 +28,7 @@ #include <com/sun/star/util/XCancellable.hpp> #include <com/sun/star/sdbc/XGeneratedResultSet.hpp> #include <comphelper/proparrhlp.hxx> -#include <cppuhelper/compbase6.hxx> +#include <cppuhelper/compbase.hxx> #include <comphelper/uno3.hxx> #include <connectivity/CommonTools.hxx> #include <connectivity/OSubComponent.hxx> @@ -41,12 +41,12 @@ namespace connectivity { - typedef ::cppu::WeakComponentImplHelper6< ::com::sun::star::sdbc::XStatement, - ::com::sun::star::sdbc::XWarningsSupplier, - ::com::sun::star::util::XCancellable, - ::com::sun::star::sdbc::XCloseable, - ::com::sun::star::sdbc::XGeneratedResultSet, - ::com::sun::star::sdbc::XMultipleResults> java_sql_Statement_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::XGeneratedResultSet, + ::com::sun::star::sdbc::XMultipleResults> java_sql_Statement_BASE; //************ Class: java.sql.Statement diff --git a/connectivity/source/inc/java/sql/Ref.hxx b/connectivity/source/inc/java/sql/Ref.hxx index d591bd7cc79f..efde6ee412ff 100644 --- a/connectivity/source/inc/java/sql/Ref.hxx +++ b/connectivity/source/inc/java/sql/Ref.hxx @@ -22,7 +22,7 @@ #include "java/lang/Object.hxx" #include <com/sun/star/sdbc/XRef.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> namespace connectivity { @@ -30,7 +30,7 @@ namespace connectivity //************ Class: java.sql.Ref class java_sql_Ref : public java_lang_Object, - public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XRef> + public ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XRef> { protected: // Static data for the class diff --git a/connectivity/source/inc/java/sql/ResultSet.hxx b/connectivity/source/inc/java/sql/ResultSet.hxx index 56fe7f364951..bde06d229845 100644 --- a/connectivity/source/inc/java/sql/ResultSet.hxx +++ b/connectivity/source/inc/java/sql/ResultSet.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/compbase10.hxx> +#include <cppuhelper/compbase.hxx> #include <comphelper/proparrhlp.hxx> #include <connectivity/CommonTools.hxx> #include "java/sql/JStatement.hxx" @@ -42,16 +42,16 @@ namespace connectivity /* ** java_sql_ResultSet */ - typedef ::cppu::WeakComponentImplHelper10< ::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> java_sql_ResultSet_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> java_sql_ResultSet_BASE; class java_sql_Connection; class java_sql_ResultSet : public comphelper::OBaseMutex, diff --git a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx b/connectivity/source/inc/java/sql/ResultSetMetaData.hxx index c9d8b20c28d7..c29c5779be6e 100644 --- a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx +++ b/connectivity/source/inc/java/sql/ResultSetMetaData.hxx @@ -21,7 +21,7 @@ #include "java/lang/Object.hxx" #include <com/sun/star/sdbc/XResultSetMetaData.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include "java/sql/ConnectionLog.hxx" namespace connectivity @@ -30,7 +30,7 @@ namespace connectivity //************ Class: java.sql.ResultSetMetaData class java_sql_Connection; - class java_sql_ResultSetMetaData : public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData>, + class java_sql_ResultSetMetaData : public ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XResultSetMetaData>, public java_lang_Object { protected: diff --git a/connectivity/source/inc/mysql/YDriver.hxx b/connectivity/source/inc/mysql/YDriver.hxx index 1634092d68fd..ac14cf42f21a 100644 --- a/connectivity/source/inc/mysql/YDriver.hxx +++ b/connectivity/source/inc/mysql/YDriver.hxx @@ -28,7 +28,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <cppuhelper/compbase3.hxx> +#include <cppuhelper/compbase.hxx> #include <comphelper/uno3.hxx> #include <comphelper/broadcasthelper.hxx> #include <connectivity/CommonTools.hxx> @@ -44,10 +44,10 @@ namespace connectivity { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ODriverDelegator_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxMSF) throw( ::com::sun::star::uno::Exception ); - typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XDriver - , ::com::sun::star::sdbcx::XDataDefinitionSupplier - , ::com::sun::star::lang::XServiceInfo - > ODriverDelegator_BASE; + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XDriver + , ::com::sun::star::sdbcx::XDataDefinitionSupplier + , ::com::sun::star::lang::XServiceInfo + > ODriverDelegator_BASE; typedef ::std::pair< ::com::sun::star::uno::WeakReferenceHelper,OMetaConnection*> TWeakConnectionPair; typedef ::std::pair< ::com::sun::star::uno::WeakReferenceHelper,TWeakConnectionPair> TWeakPair; diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx index c572c3ac869f..1685c248b031 100644 --- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx @@ -32,7 +32,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 "odbc/OStatement.hxx" #include "odbc/ODatabaseMetaData.hxx" @@ -47,13 +47,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 OOO_DLLPUBLIC_ODBCBASE ODatabaseMetaDataResultSet : public comphelper::OBaseMutex, diff --git a/connectivity/source/inc/odbc/ODriver.hxx b/connectivity/source/inc/odbc/ODriver.hxx index d1709a8cc7dc..a1e0b1f45a54 100644 --- a/connectivity/source/inc/odbc/ODriver.hxx +++ b/connectivity/source/inc/odbc/ODriver.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/odbc.hxx> #include "odbc/odbcbasedllapi.hxx" #include <connectivity/CommonTools.hxx> @@ -34,7 +34,7 @@ namespace connectivity { namespace odbc { - 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; class OOO_DLLPUBLIC_ODBCBASE SAL_NO_VTABLE ODBCDriver : public ODriver_BASE { diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx index dabc759923bc..89fe749a6bad 100644 --- a/connectivity/source/inc/odbc/OResultSet.hxx +++ b/connectivity/source/inc/odbc/OResultSet.hxx @@ -32,7 +32,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> #include <comphelper/proparrhlp.hxx> #include "odbc/OFunctions.hxx" #include "odbc/OStatement.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::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> 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::sdbcx::XRowLocate, + ::com::sun::star::sdbcx::XDeleteRows, + ::com::sun::star::sdbc::XCloseable, + ::com::sun::star::sdbc::XColumnLocate, + ::com::sun::star::lang::XServiceInfo> OResultSet_BASE; typedef ::std::pair<sal_Int64,sal_Int32> TVoidPtr; diff --git a/connectivity/source/inc/odbc/OResultSetMetaData.hxx b/connectivity/source/inc/odbc/OResultSetMetaData.hxx index f6fc037398d1..e6333e430228 100644 --- a/connectivity/source/inc/odbc/OResultSetMetaData.hxx +++ b/connectivity/source/inc/odbc/OResultSetMetaData.hxx @@ -21,7 +21,7 @@ #define INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_ORESULTSETMETADATA_HXX #include <com/sun/star/sdbc/XResultSetMetaData.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include "odbc/OFunctions.hxx" #include "odbc/odbcbasedllapi.hxx" #include <vector> @@ -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_ODBCBASE OResultSetMetaData : public OResultSetMetaData_BASE diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx index 3f40d2bdc9f4..248a1f2765d5 100644 --- a/connectivity/source/inc/odbc/OStatement.hxx +++ b/connectivity/source/inc/odbc/OStatement.hxx @@ -29,7 +29,7 @@ #include <com/sun/star/sdbc/XGeneratedResultSet.hpp> #include <com/sun/star/util/XCancellable.hpp> #include <comphelper/proparrhlp.hxx> -#include <cppuhelper/compbase6.hxx> +#include <cppuhelper/compbase.hxx> #include <comphelper/uno3.hxx> #include <connectivity/CommonTools.hxx> #include "odbc/OFunctions.hxx" @@ -44,12 +44,12 @@ namespace connectivity namespace odbc { - typedef ::cppu::WeakComponentImplHelper6< ::com::sun::star::sdbc::XStatement, - ::com::sun::star::sdbc::XWarningsSupplier, - ::com::sun::star::util::XCancellable, - ::com::sun::star::sdbc::XCloseable, - ::com::sun::star::sdbc::XGeneratedResultSet, - ::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::XGeneratedResultSet, + ::com::sun::star::sdbc::XMultipleResults> OStatement_BASE; class OResultSet; diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx index 787f4348d481..38175e6c2f16 100644 --- a/connectivity/source/manager/mdrivermanager.cxx +++ b/connectivity/source/manager/mdrivermanager.cxx @@ -27,7 +27,7 @@ #include <tools/diagnose_ex.h> #include <comphelper/processfactory.hxx> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/weakref.hxx> #include <osl/diagnose.h> @@ -56,7 +56,7 @@ void throwNoSuchElementException() throw(NoSuchElementException) throw NoSuchElementException(); } -class ODriverEnumeration : public ::cppu::WeakImplHelper1< XEnumeration > +class ODriverEnumeration : public ::cppu::WeakImplHelper< XEnumeration > { friend class OSDBCDriverManager; diff --git a/connectivity/source/manager/mdrivermanager.hxx b/connectivity/source/manager/mdrivermanager.hxx index 0f40800d2250..3aa5b57e1292 100644 --- a/connectivity/source/manager/mdrivermanager.hxx +++ b/connectivity/source/manager/mdrivermanager.hxx @@ -32,7 +32,7 @@ #include <com/sun/star/sdbc/XDriverAccess.hpp> #include <com/sun/star/lang/XSingleComponentFactory.hpp> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <comphelper/logging.hxx> #include <osl/mutex.hxx> #include <connectivity/DriversConfig.hxx> @@ -52,10 +52,10 @@ namespace drivermanager // OSDBCDriverManager - the one-instance service for managing SDBC drivers - typedef ::cppu::WeakImplHelper3 < ::com::sun::star::sdbc::XDriverManager2 - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::uno::XNamingService - > OSDBCDriverManager_Base; + typedef ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XDriverManager2 + , ::com::sun::star::lang::XServiceInfo + , ::com::sun::star::uno::XNamingService + > OSDBCDriverManager_Base; class OSDBCDriverManager : public OSDBCDriverManager_Base { diff --git a/connectivity/workben/skeleton/SResultSet.hxx b/connectivity/workben/skeleton/SResultSet.hxx index a27e420286b5..433964b8ef0f 100644 --- a/connectivity/workben/skeleton/SResultSet.hxx +++ b/connectivity/workben/skeleton/SResultSet.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> #include <comphelper/proparrhlp.hxx> #include "SStatement.hxx" #include <connectivity/CommonTools.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::sdbcx::XRowLocate, - ::com::sun::star::sdbcx::XDeleteRows, - ::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::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> OResultSet_BASE; typedef sal_Int64 TVoidPtr; diff --git a/include/connectivity/BlobHelper.hxx b/include/connectivity/BlobHelper.hxx index 193efc0276ed..af93d460785e 100644 --- a/include/connectivity/BlobHelper.hxx +++ b/include/connectivity/BlobHelper.hxx @@ -21,11 +21,11 @@ #include <connectivity/dbtoolsdllapi.hxx> #include <com/sun/star/sdbc/XBlob.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> namespace connectivity { - class OOO_DLLPUBLIC_DBTOOLS BlobHelper : public ::cppu::WeakImplHelper1< com::sun::star::sdbc::XBlob > + class OOO_DLLPUBLIC_DBTOOLS BlobHelper : public ::cppu::WeakImplHelper< com::sun::star::sdbc::XBlob > { ::com::sun::star::uno::Sequence< sal_Int8 > m_aValue; public: diff --git a/include/connectivity/conncleanup.hxx b/include/connectivity/conncleanup.hxx index 265f058e25bf..8fcad620db8c 100644 --- a/include/connectivity/conncleanup.hxx +++ b/include/connectivity/conncleanup.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_CONNCLEANUP_HXX #define INCLUDED_CONNECTIVITY_CONNCLEANUP_HXX -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sdbc/XRowSet.hpp> #include <com/sun/star/sdbc/XConnection.hpp> @@ -34,9 +34,9 @@ namespace dbtools //= OAutoConnectionDisposer - typedef ::cppu::WeakImplHelper2 < ::com::sun::star::beans::XPropertyChangeListener, - ::com::sun::star::sdbc::XRowSetListener - > OAutoConnectionDisposer_Base; + typedef ::cppu::WeakImplHelper < ::com::sun::star::beans::XPropertyChangeListener, + ::com::sun::star::sdbc::XRowSetListener + > OAutoConnectionDisposer_Base; class OOO_DLLPUBLIC_DBTOOLS OAutoConnectionDisposer : public OAutoConnectionDisposer_Base { diff --git a/include/connectivity/paramwrapper.hxx b/include/connectivity/paramwrapper.hxx index 2096260afbb2..328eed4c8315 100644 --- a/include/connectivity/paramwrapper.hxx +++ b/include/connectivity/paramwrapper.hxx @@ -32,7 +32,7 @@ #include <comphelper/broadcasthelper.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/propshlp.hxx> -#include <cppuhelper/compbase2.hxx> +#include <cppuhelper/compbase.hxx> #include <memory> #include <vector> @@ -128,9 +128,9 @@ namespace param //= ParameterWrapperContainer - typedef ::cppu::WeakComponentImplHelper2 < ::com::sun::star::container::XIndexAccess - , ::com::sun::star::container::XEnumerationAccess - > ParameterWrapperContainer_Base; + typedef ::cppu::WeakComponentImplHelper < ::com::sun::star::container::XIndexAccess + , ::com::sun::star::container::XEnumerationAccess + > ParameterWrapperContainer_Base; /// class for the parameter event @see approveParameter class OOO_DLLPUBLIC_DBTOOLS ParameterWrapperContainer : diff --git a/include/connectivity/sdbcx/VCatalog.hxx b/include/connectivity/sdbcx/VCatalog.hxx index 264cc33e1568..19c99add23f4 100644 --- a/include/connectivity/sdbcx/VCatalog.hxx +++ b/include/connectivity/sdbcx/VCatalog.hxx @@ -27,7 +27,7 @@ #include <com/sun/star/sdbcx/XGroupsSupplier.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdbc/XRow.hpp> -#include <cppuhelper/compbase5.hxx> +#include <cppuhelper/compbase.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <connectivity/CommonTools.hxx> #include <connectivity/OSubComponent.hxx> @@ -45,11 +45,11 @@ namespace connectivity // other drivers can be derived their catalog from this class when they want to support sdbcx // it holds already tables, views, groups and users - typedef ::cppu::WeakComponentImplHelper5< ::com::sun::star::sdbcx::XTablesSupplier, - ::com::sun::star::sdbcx::XViewsSupplier, - ::com::sun::star::sdbcx::XUsersSupplier, - ::com::sun::star::sdbcx::XGroupsSupplier, - ::com::sun::star::lang::XServiceInfo> OCatalog_BASE; + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbcx::XTablesSupplier, + ::com::sun::star::sdbcx::XViewsSupplier, + ::com::sun::star::sdbcx::XUsersSupplier, + ::com::sun::star::sdbcx::XGroupsSupplier, + ::com::sun::star::lang::XServiceInfo> OCatalog_BASE; class OOO_DLLPUBLIC_DBTOOLS SAL_NO_VTABLE OCatalog : diff --git a/include/connectivity/sdbcx/VColumn.hxx b/include/connectivity/sdbcx/VColumn.hxx index 317436242e7b..ac28d3ae192a 100644 --- a/include/connectivity/sdbcx/VColumn.hxx +++ b/include/connectivity/sdbcx/VColumn.hxx @@ -22,7 +22,7 @@ #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> #include <com/sun/star/container/XNamed.hpp> #include <comphelper/IdPropArrayHelper.hxx> -#include <cppuhelper/compbase2.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/implbase1.hxx> #include <connectivity/CommonTools.hxx> #include <comphelper/broadcasthelper.hxx> @@ -37,8 +37,8 @@ namespace connectivity class OColumn; typedef ::comphelper::OIdPropertyArrayUsageHelper<OColumn> OColumn_PROP; - typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::container::XNamed, - ::com::sun::star::lang::XServiceInfo> OColumnDescriptor_BASE; + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::container::XNamed, + ::com::sun::star::lang::XServiceInfo> OColumnDescriptor_BASE; typedef ::cppu::ImplHelper1< ::com::sun::star::sdbcx::XDataDescriptorFactory > OColumn_BASE; diff --git a/include/connectivity/sdbcx/VGroup.hxx b/include/connectivity/sdbcx/VGroup.hxx index b4223b01d42f..de7c588303d0 100644 --- a/include/connectivity/sdbcx/VGroup.hxx +++ b/include/connectivity/sdbcx/VGroup.hxx @@ -27,7 +27,7 @@ #include <com/sun/star/sdbcx/XAuthorizable.hpp> #include <com/sun/star/container/XNamed.hpp> #include <comphelper/proparrhlp.hxx> -#include <cppuhelper/compbase4.hxx> +#include <cppuhelper/compbase.hxx> #include <comphelper/broadcasthelper.hxx> #include <connectivity/sdbcx/VCollection.hxx> #include <comphelper/propertycontainer.hxx> @@ -42,10 +42,10 @@ namespace connectivity { typedef OCollection OUsers; - typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::sdbcx::XUsersSupplier, - ::com::sun::star::sdbcx::XAuthorizable, - ::com::sun::star::container::XNamed, - ::com::sun::star::lang::XServiceInfo> OGroup_BASE; + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbcx::XUsersSupplier, + ::com::sun::star::sdbcx::XAuthorizable, + ::com::sun::star::container::XNamed, + ::com::sun::star::lang::XServiceInfo> OGroup_BASE; class OOO_DLLPUBLIC_DBTOOLS OGroup : public comphelper::OBaseMutex, diff --git a/include/connectivity/sdbcx/VTable.hxx b/include/connectivity/sdbcx/VTable.hxx index 4f1882cfb539..82c28184bb01 100644 --- a/include/connectivity/sdbcx/VTable.hxx +++ b/include/connectivity/sdbcx/VTable.hxx @@ -27,7 +27,7 @@ #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdbcx/XKeysSupplier.hpp> #include <comphelper/IdPropArrayHelper.hxx> -#include <cppuhelper/compbase4.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/implbase4.hxx> #include <comphelper/broadcasthelper.hxx> #include <com/sun/star/container/XNamed.hpp> @@ -45,10 +45,10 @@ namespace connectivity class OTable; class OCollection; - typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::sdbcx::XColumnsSupplier, - ::com::sun::star::sdbcx::XKeysSupplier, - ::com::sun::star::container::XNamed, - ::com::sun::star::lang::XServiceInfo> OTableDescriptor_BASE; + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbcx::XColumnsSupplier, + ::com::sun::star::sdbcx::XKeysSupplier, + ::com::sun::star::container::XNamed, + ::com::sun::star::lang::XServiceInfo> OTableDescriptor_BASE; typedef ::cppu::ImplHelper4< ::com::sun::star::sdbcx::XDataDescriptorFactory, ::com::sun::star::sdbcx::XIndexesSupplier, diff --git a/include/connectivity/sdbcx/VUser.hxx b/include/connectivity/sdbcx/VUser.hxx index 3b8287323a55..0917ed669a22 100644 --- a/include/connectivity/sdbcx/VUser.hxx +++ b/include/connectivity/sdbcx/VUser.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/sdbcx/XUser.hpp> #include <com/sun/star/sdbcx/XGroupsSupplier.hpp> #include <comphelper/proparrhlp.hxx> -#include <cppuhelper/compbase4.hxx> +#include <cppuhelper/compbase.hxx> #include <connectivity/CommonTools.hxx> #include <comphelper/broadcasthelper.hxx> #include <connectivity/sdbcx/VCollection.hxx> @@ -39,10 +39,10 @@ namespace connectivity { typedef OCollection OGroups; - typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::sdbcx::XUser, - ::com::sun::star::sdbcx::XGroupsSupplier, - ::com::sun::star::container::XNamed, - ::com::sun::star::lang::XServiceInfo> OUser_BASE; + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbcx::XUser, + ::com::sun::star::sdbcx::XGroupsSupplier, + ::com::sun::star::container::XNamed, + ::com::sun::star::lang::XServiceInfo> OUser_BASE; class OOO_DLLPUBLIC_DBTOOLS OUser : public comphelper::OBaseMutex, diff --git a/include/connectivity/sdbcx/VView.hxx b/include/connectivity/sdbcx/VView.hxx index d7088939603e..c5ec6a170968 100644 --- a/include/connectivity/sdbcx/VView.hxx +++ b/include/connectivity/sdbcx/VView.hxx @@ -24,21 +24,20 @@ #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #include <comphelper/proparrhlp.hxx> -#include <cppuhelper/compbase1.hxx> #include <connectivity/CommonTools.hxx> #include <cppuhelper/interfacecontainer.h> #include <com/sun/star/container/XNamed.hpp> #include <connectivity/sdbcx/VDescriptor.hxx> #include <connectivity/dbtoolsdllapi.hxx> #include <comphelper/IdPropArrayHelper.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> namespace connectivity { namespace sdbcx { - typedef ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServiceInfo, + typedef ::cppu::WeakImplHelper< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::container::XNamed> OView_BASE; |