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

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Tue Aug 3 06:51:02 UTC 2021


 svx/source/sdr/primitive2d/sdrprimitivetools.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 567ceb70388296521095c63280c79a522e74fae2
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Mon Aug 2 20:08:06 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Aug 3 08:50:31 2021 +0200

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

diff --git a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
index cf215a141b11..3612326f2307 100644
--- a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
+++ b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
@@ -18,9 +18,9 @@
  */
 
 #include <sdr/primitive2d/sdrprimitivetools.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/lazydelete.hxx>
 #include <vcl/BitmapTools.hxx>
+#include <mutex>
 
 
 // helper methods
@@ -31,9 +31,9 @@ namespace drawinglayer::primitive2d
         {
             static vcl::DeleteOnDeinit< BitmapEx > aRetVal(vcl::DeleteOnDeinitFlag::Empty);
             static basegfx::BColor aBColor;
-            static ::osl::Mutex aMutex;
+            static std::mutex aMutex;
 
-            ::osl::MutexGuard aGuard(aMutex);
+            std::lock_guard aGuard(aMutex);
 
             if(!aRetVal.get() || rBColor != aBColor)
             {


More information about the Libreoffice-commits mailing list