[Libreoffice-commits] core.git: oox/source

[Noel Grandin (via logerrit)]

 oox/source/helper/propertymap.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b1d2383a3311811a283bea720d3f0f1bfcb0fc3c
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Sun Jul 18 15:06:50 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun Jul 18 21:33:26 2021 +0200

    osl::Mutex->std::mutex in GenericPropertySet
    
    Change-Id: Iee437489d40d038349f9faf860f2eca971932c6d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119142
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index 15d8f65f1175..e069efe3c537 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -45,7 +45,7 @@ using ::com::sun::star::text::WritingMode;
 #include <com/sun/star/drawing/HomogenMatrix3.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <osl/diagnose.h>
-#include <osl/mutex.hxx>
+#include <mutex>
 #include <sal/log.hxx>
 #include <oox/token/properties.hxx>
 #include <oox/token/propertynames.hxx>
@@ -109,7 +109,7 @@ public:
     virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override;
 
 private:
-    osl::Mutex mMutex;
+    std::mutex mMutex;
     PropertyNameMap     maPropMap;
 };
 
@@ -125,7 +125,7 @@ Reference< XPropertySetInfo > SAL_CALL GenericPropertySet::getPropertySetInfo()
 
 void SAL_CALL GenericPropertySet::setPropertyValue( const OUString& rPropertyName, const Any& rValue )
 {
-    ::osl::MutexGuard aGuard( mMutex );
+    std::lock_guard aGuard( mMutex );
     maPropMap[ rPropertyName ] = rValue;
 }