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

[Noel Grandin (via logerrit)]

 sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx |    2 +-
 sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit c1f2e972a758ba51a5c3e94f6c498f84766f586d
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Sun Aug 1 13:09:57 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun Aug 1 21:02:10 2021 +0200

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

diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
index 6a7772cd75de..d515d21cf580 100644
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
@@ -145,7 +145,7 @@ void QueueProcessor::ProcessOneRequest (
 {
     try
     {
-        ::osl::MutexGuard aGuard (maMutex);
+        std::lock_guard aGuard (maMutex);
 
         // Create a new preview bitmap and store it in the cache.
         if (mpCache != nullptr && mpCacheContext)
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
index f29d996c6fa8..0035bcbce7e1 100644
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
@@ -24,6 +24,7 @@
 #include "SlsBitmapFactory.hxx"
 
 #include <vcl/timer.hxx>
+#include <mutex>
 
 namespace sd::slidesorter::cache {
 
@@ -74,7 +75,7 @@ private:
     /** This mutex is used to guard the queue processor.  Be careful not to
         mix its use with that of the solar mutex.
     */
-    ::osl::Mutex maMutex;
+    std::mutex maMutex;
 
     Timer  maTimer;
     DECL_LINK(ProcessRequestHdl, Timer *, void);