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

[Noel Grandin (via logerrit)]

 include/svx/fmtools.hxx     |    3 ++-
 svx/source/form/fmtools.cxx |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 66fceca24ee0fccd03f23afc689d82c794a2d57e
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Jul 30 14:29:27 2021 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Jul 30 15:23:52 2021 +0200

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

diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx
index 1ead9069b4f0..869023f06f7f 100644
--- a/include/svx/fmtools.hxx
+++ b/include/svx/fmtools.hxx
@@ -31,6 +31,7 @@
 #include <rtl/ref.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <o3tl/sorted_vector.hxx>
+#include <mutex>
 
 namespace com::sun::star::awt { class XWindow; }
 namespace com::sun::star::beans { class XPropertySet; }
@@ -132,7 +133,7 @@ class SAL_WARN_UNUSED FmXDisposeListener
     friend class FmXDisposeMultiplexer;
 
     rtl::Reference<FmXDisposeMultiplexer> m_pAdapter;
-    osl::Mutex   m_aMutex;
+    std::mutex   m_aMutex;
 
 public:
     virtual ~FmXDisposeListener();
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index e9f641309d0b..e8e0a5e1a328 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -235,7 +235,7 @@ FmXDisposeListener::~FmXDisposeListener()
 
 void FmXDisposeListener::setAdapter(FmXDisposeMultiplexer* pAdapter)
 {
-    ::osl::MutexGuard aGuard(m_aMutex);
+    std::lock_guard aGuard(m_aMutex);
     m_pAdapter = pAdapter;
 }