diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-08-04 19:09:28 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-08-05 18:22:20 +0200 |
| commit | 2f2616a886cbf7bc06816d6b4a6f6b991f896d51 (patch) | |
| tree | 59ee000fabe76ed1a3db7bc7fafa748fa2bd2158 /sw | |
| parent | d43c1b9b88eeb800eaff4d63605892dc859d4f72 (diff) | |
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@collabora.co.uk>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/dbui/mmoutputtypepage.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
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()) |