diff options
Diffstat (limited to 'connectivity/source/cpool')
| -rw-r--r-- | connectivity/source/cpool/ZConnectionPool.hxx | 4 | ||||
| -rw-r--r-- | connectivity/source/cpool/ZConnectionWrapper.hxx | 6 | ||||
| -rw-r--r-- | connectivity/source/cpool/ZDriverWrapper.hxx | 6 | ||||
| -rw-r--r-- | connectivity/source/cpool/ZPoolCollection.hxx | 12 | ||||
| -rw-r--r-- | connectivity/source/cpool/ZPooledConnection.hxx | 6 |
5 files changed, 17 insertions, 17 deletions
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 |