diff options
| author | Noel Grandin <noel@peralex.com> | 2016-07-01 09:46:23 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-07-04 06:49:07 +0000 |
| commit | cd71034b26a404c8f9b763865ef6ebdd0adeebb7 (patch) | |
| tree | ff2aaa6a6d1849b51d883d48dfdef04b17817fcd /connectivity/source/cpool | |
| parent | 70bfe5f71c1d45c14ce831051480a11c58ffc34d (diff) | |
comphelper::OBaseMutex -> cppu::BaseMutex
convert usage of deprecated class, and remove the old class
Change-Id: I19fb9271090d19e5531622b58492e1a848d306e2
Reviewed-on: https://gerrit.libreoffice.org/26843
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'connectivity/source/cpool')
| -rw-r--r-- | connectivity/source/cpool/ZConnectionWrapper.hxx | 4 | ||||
| -rw-r--r-- | connectivity/source/cpool/ZPooledConnection.hxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/connectivity/source/cpool/ZConnectionWrapper.hxx b/connectivity/source/cpool/ZConnectionWrapper.hxx index 668d1fda7706..08053d064dc2 100644 --- a/connectivity/source/cpool/ZConnectionWrapper.hxx +++ b/connectivity/source/cpool/ZConnectionWrapper.hxx @@ -21,8 +21,8 @@ #define INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZCONNECTIONWRAPPER_HXX #include <cppuhelper/compbase.hxx> +#include <cppuhelper/basemutex.hxx> #include <com/sun/star/sdbc/XConnection.hpp> -#include <comphelper/broadcasthelper.hxx> #include <comphelper/uno3.hxx> #include <connectivity/ConnectionWrapper.hxx> @@ -35,7 +35,7 @@ namespace connectivity typedef ::cppu::WeakComponentImplHelper< css::sdbc::XConnection > OConnectionWeakWrapper_BASE; - class OConnectionWeakWrapper : public ::comphelper::OBaseMutex + class OConnectionWeakWrapper : public ::cppu::BaseMutex , public OConnectionWeakWrapper_BASE , public OConnectionWrapper { diff --git a/connectivity/source/cpool/ZPooledConnection.hxx b/connectivity/source/cpool/ZPooledConnection.hxx index 6b6c7456e182..ff108088efa0 100644 --- a/connectivity/source/cpool/ZPooledConnection.hxx +++ b/connectivity/source/cpool/ZPooledConnection.hxx @@ -20,9 +20,9 @@ #define INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZPOOLEDCONNECTION_HXX #include <cppuhelper/compbase.hxx> +#include <cppuhelper/basemutex.hxx> #include <com/sun/star/sdbc/XPooledConnection.hpp> #include <com/sun/star/lang/XEventListener.hpp> -#include <comphelper/broadcasthelper.hxx> #include <com/sun/star/reflection/XProxyFactory.hpp> @@ -35,7 +35,7 @@ namespace connectivity typedef ::cppu::WeakComponentImplHelper< css::sdbc::XPooledConnection ,css::lang::XEventListener> OPooledConnection_Base; - class OPooledConnection : public ::comphelper::OBaseMutex + class OPooledConnection : public ::cppu::BaseMutex ,public OPooledConnection_Base { css::uno::Reference< css::sdbc::XConnection > m_xRealConnection; // the connection fom driver |