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

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Sat Jul 31 19:57:57 UTC 2021


 sc/source/core/tool/editutil.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 2b525409ffd97f534114089aa73d0a931ba49c48
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Sat Jul 31 18:48:53 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Jul 31 21:57:23 2021 +0200

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

diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index de1205af7d23..63cbfe5736f0 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -45,6 +45,7 @@
 #include <scmod.hxx>
 #include <inputopt.hxx>
 #include <compiler.hxx>
+#include <mutex>
 
 using namespace com::sun::star;
 
@@ -113,8 +114,8 @@ OUString ScEditUtil::GetString( const EditTextObject& rEditText, const ScDocumen
     if( !rEditText.HasField())
         return GetMultilineString( rEditText );
 
-    static osl::Mutex aMutex;
-    osl::MutexGuard aGuard( aMutex);
+    static std::mutex aMutex;
+    std::lock_guard aGuard( aMutex);
     // ScFieldEditEngine is needed to resolve field contents.
     if (pDoc)
     {


More information about the Libreoffice-commits mailing list