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

[Noel Grandin (via logerrit)]

 basctl/source/basicide/baside2.hxx  |    3 ++-
 basctl/source/basicide/baside2b.cxx |    6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit a5e270ba999050b97c7ff50339dd649547057d54
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Fri Dec 17 18:51:36 2021 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun Dec 19 12:53:48 2021 +0100

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

diff --git a/basctl/source/basicide/baside2.hxx 
b/basctl/source/basicide/baside2.hxx
index e59c148bc3b5..8d07cd81ddc1 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -20,6 +20,7 @@
 #pragma once
 
 #include <memory>
+#include <mutex>
 #include <layout.hxx>
 #include "breakpoint.hxx"
 #include "linenumberwindow.hxx"
@@ -73,7 +74,7 @@ private:
     ModulWindow&                     rModulWindow;
 
     rtl::Reference< ChangesListener > listener_;
-    osl::Mutex                        mutex_;
+    std::mutex                        mutex_;
     css::uno::Reference< css::beans::XMultiPropertySet >
                                       notifier_;
 
diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 9da55fa318a8..54be8d956b64 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -202,7 +202,7 @@ private:
 
     virtual void SAL_CALL disposing(lang::EventObject const &) override
     {
-        osl::MutexGuard g(editor_.mutex_);
+        std::unique_lock g(editor_.mutex_);
         editor_.notifier_.clear();
     }
 
@@ -255,7 +255,7 @@ EditorWindow::EditorWindow (vcl::Window* pParent, 
ModulWindow* pModulWindow) :
         officecfg::Office::Common::Font::SourceViewFont::get(),
         UNO_QUERY_THROW);
     {
-        osl::MutexGuard g(mutex_);
+        std::unique_lock g(mutex_);
         notifier_ = n;
     }
     const Sequence<OUString> aPropertyNames{"FontHeight", "FontName"};
@@ -278,7 +278,7 @@ void EditorWindow::dispose()
 
     Reference< beans::XMultiPropertySet > n;
     {
-        osl::MutexGuard g(mutex_);
+        std::unique_lock g(mutex_);
         n = notifier_;
     }
     if (n.is()) {