diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-03-05 15:27:13 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-03-06 06:42:38 +0000 |
| commit | b0244ef9e44c5c1dc9faf9705f2ae1dba499d62c (patch) | |
| tree | 1fbb699be59b4c8f7e6be7ce7936181e9a1bfd0e /dbaccess | |
| parent | 43860c10b7d776a7767ef81b1cc833c35feea3c2 (diff) | |
BaseMutex->std::mutex in OPropertyForward
Change-Id: I9918bd4fbedb2f6517278c010b6ee66ba7f9c851
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148277
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/core/inc/PropertyForward.hxx | 6 | ||||
| -rw-r--r-- | dbaccess/source/core/misc/PropertyForward.cxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/dbaccess/source/core/inc/PropertyForward.hxx b/dbaccess/source/core/inc/PropertyForward.hxx index daf31758d000..ec51c672544a 100644 --- a/dbaccess/source/core/inc/PropertyForward.hxx +++ b/dbaccess/source/core/inc/PropertyForward.hxx @@ -23,8 +23,8 @@ #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <cppuhelper/implbase.hxx> -#include <cppuhelper/basemutex.hxx> +#include <mutex> #include <vector> namespace dbaccess @@ -33,9 +33,9 @@ namespace dbaccess // OPropertyForward typedef ::cppu::WeakImplHelper< css::beans::XPropertyChangeListener > OPropertyForward_Base; - class OPropertyForward :public ::cppu::BaseMutex - ,public OPropertyForward_Base + class OPropertyForward : public OPropertyForward_Base { + std::mutex m_aMutex; css::uno::Reference< css::beans::XPropertySet > m_xSource; css::uno::Reference< css::beans::XPropertySet > m_xDest; css::uno::Reference< css::beans::XPropertySetInfo > m_xDestInfo; diff --git a/dbaccess/source/core/misc/PropertyForward.cxx b/dbaccess/source/core/misc/PropertyForward.cxx index 07e1068f695f..b02ce82cea53 100644 --- a/dbaccess/source/core/misc/PropertyForward.cxx +++ b/dbaccess/source/core/misc/PropertyForward.cxx @@ -69,7 +69,7 @@ namespace dbaccess void SAL_CALL OPropertyForward::propertyChange( const PropertyChangeEvent& evt ) { - ::osl::MutexGuard aGuard( m_aMutex ); + std::unique_lock aGuard( m_aMutex ); if ( !m_xDestContainer.is() ) throw DisposedException( OUString(), *this ); @@ -111,7 +111,7 @@ namespace dbaccess void SAL_CALL OPropertyForward::disposing( const css::lang::EventObject& /*_rSource*/ ) { - ::osl::MutexGuard aGuard(m_aMutex); + std::unique_lock aGuard(m_aMutex); if ( !m_xSource.is() ) throw DisposedException( OUString(), *this ); @@ -125,7 +125,7 @@ namespace dbaccess void OPropertyForward::setDefinition( const css::uno::Reference< css::beans::XPropertySet>& _xDest ) { - ::osl::MutexGuard aGuard( m_aMutex ); + std::unique_lock aGuard( m_aMutex ); if ( m_bInInsert ) return; |