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

[Noel Grandin (via logerrit)]

 sw/source/ui/dbui/mmoutputtypepage.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 2f2616a886cbf7bc06816d6b4a6f6b991f896d51
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Wed Aug 4 19:09:28 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Aug 5 18:22:20 2021 +0200

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

diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index 660c9ea74384..10db4fe24b85 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -34,6 +34,7 @@
 #include <mmresultdialogs.hxx>
 #include <maildispatcher.hxx>
 #include <imaildsplistener.hxx>
+#include <mutex>
 
 using namespace ::com::sun::star;
 
@@ -73,7 +74,7 @@ IMPL_LINK_NOARG(SwMailMergeOutputTypePage, TypeHdl_Impl, weld::Toggleable&, void
 struct SwSendMailDialog_Impl
 {
     friend class SwSendMailDialog;
-    ::osl::Mutex                                aDescriptorMutex;
+    std::mutex                                  aDescriptorMutex;
 
     std::vector< SwMailDescriptor >             aDescriptors;
     sal_uInt32                                  nCurrentDescriptor;
@@ -103,7 +104,7 @@ struct SwSendMailDialog_Impl
 
 const SwMailDescriptor* SwSendMailDialog_Impl::GetNextDescriptor()
 {
-    ::osl::MutexGuard aGuard(aDescriptorMutex);
+    std::scoped_lock aGuard(aDescriptorMutex);
     if(nCurrentDescriptor < aDescriptors.size())
     {
         ++nCurrentDescriptor;
@@ -267,7 +268,7 @@ SwSendMailDialog::~SwSendMailDialog()
 
 void SwSendMailDialog::AddDocument( SwMailDescriptor const & rDesc )
 {
-    ::osl::MutexGuard aGuard(m_pImpl->aDescriptorMutex);
+    std::scoped_lock aGuard(m_pImpl->aDescriptorMutex);
     m_pImpl->aDescriptors.push_back(rDesc);
     // if the dialog is already running then continue sending of documents
     if(m_pImpl->xMailDispatcher.is())