[Libreoffice-commits] core.git: include/ucbhelper ucbhelper/source

[Noel Grandin (via logerrit)]

 include/ucbhelper/propertyvalueset.hxx         |    4 ++--
 ucbhelper/source/provider/propertyvalueset.cxx |   10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit a22772c4393f4b0a3d1a838f074c4d51be762388
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Fri Dec 17 18:10:08 2021 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Dec 18 18:18:56 2021 +0100

    osl::Mutex->std::mutex in ucbhelper::PropertyValueSet
    
    Change-Id: Ie4d3392e26a24ff3ffd9869809bb48bee7fcc2bd
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127067
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/include/ucbhelper/propertyvalueset.hxx 
b/include/ucbhelper/propertyvalueset.hxx
index 680aa0cd8879..ea088e910694 100644
--- a/include/ucbhelper/propertyvalueset.hxx
+++ b/include/ucbhelper/propertyvalueset.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/beans/Property.hpp>
 #include <cppuhelper/implbase.hxx>
 
-#include <osl/mutex.hxx>
+#include <mutex>
 #include <ucbhelper/ucbhelperdllapi.h>
 #include <memory>
 
@@ -61,7 +61,7 @@ class UCBHELPER_DLLPUBLIC PropertyValueSet final :
 {
     css::uno::Reference< css::uno::XComponentContext >   m_xContext;
     css::uno::Reference< css::script::XTypeConverter >   m_xTypeConverter;
-    osl::Mutex      m_aMutex;
+    std::mutex      m_aMutex;
     std::unique_ptr<PropertyValues>                      m_pValues;
     bool        m_bWasNull;
     bool        m_bTriedToGetTypeConverter;
diff --git a/ucbhelper/source/provider/propertyvalueset.cxx 
b/ucbhelper/source/provider/propertyvalueset.cxx
index 0255a14337a6..1c2345a8c4c0 100644
--- a/ucbhelper/source/provider/propertyvalueset.cxx
+++ b/ucbhelper/source/provider/propertyvalueset.cxx
@@ -158,7 +158,7 @@ PropertyValueSet::~PropertyValueSet()
 template <class T, T ucbhelper_impl::PropertyValue::*_member_name_>
 T PropertyValueSet::getValue(PropsSet nTypeName, sal_Int32 columnIndex)
 {
-    osl::MutexGuard aGuard( m_aMutex );
+    std::unique_lock aGuard( m_aMutex );
 
     T aValue {};   /* default ctor */
 
@@ -352,7 +352,7 @@ Any SAL_CALL PropertyValueSet::getObject(
                                     sal_Int32 columnIndex,
                                          const Reference< XNameAccess >& )
 {
-    osl::MutexGuard aGuard( m_aMutex );
+    std::unique_lock aGuard( m_aMutex );
 
     Any aValue;
 
@@ -510,7 +510,7 @@ Reference< XArray > SAL_CALL PropertyValueSet::getArray( 
sal_Int32 columnIndex )
 // virtual
 sal_Int32 SAL_CALL PropertyValueSet::findColumn( const OUString& columnName )
 {
-    osl::MutexGuard aGuard( m_aMutex );
+    std::unique_lock aGuard( m_aMutex );
 
     if ( !columnName.isEmpty() )
     {
@@ -530,7 +530,7 @@ sal_Int32 SAL_CALL PropertyValueSet::findColumn( const 
OUString& columnName )
 
 const Reference< XTypeConverter >& PropertyValueSet::getTypeConverter()
 {
-    osl::MutexGuard aGuard( m_aMutex );
+    std::unique_lock aGuard( m_aMutex );
 
     if ( !m_bTriedToGetTypeConverter && !m_xTypeConverter.is() )
     {
@@ -548,7 +548,7 @@ const Reference< XTypeConverter >& 
PropertyValueSet::getTypeConverter()
 template <class T, T ucbhelper_impl::PropertyValue::*_member_name_>
 void PropertyValueSet::appendValue(const OUString& rPropName, PropsSet 
nTypeName, const T& rValue)
 {
-    osl::MutexGuard aGuard( m_aMutex );
+    std::unique_lock aGuard( m_aMutex );
 
     ucbhelper_impl::PropertyValue aNewValue;
     aNewValue.sPropertyName = rPropName;