ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
New commits: commit f376d68736d9a0f08b2a6ae5c126b0bb5570ff4b Author: Noel Grandin <noelgran...@gmail.com> AuthorDate: Thu Aug 5 20:29:45 2021 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Thu Aug 5 22:29:23 2021 +0200 osl::Mutex->std::mutex in InteractionSupplyPassword Change-Id: I98d54c8ab1c193a3eb43898a7be68986dd581447 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120085 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx index a5a8f742b41d..fe853d84c45b 100644 --- a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx +++ b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx @@ -18,8 +18,6 @@ */ -#include <osl/mutex.hxx> - #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/task/DocumentPasswordRequest.hpp> #include <com/sun/star/task/XInteractionPassword.hpp> @@ -30,6 +28,8 @@ #include "tdoc_passwordrequest.hxx" +#include <mutex> + using namespace com::sun::star; using namespace tdoc_ucp; @@ -65,7 +65,7 @@ namespace tdoc_ucp virtual OUString SAL_CALL getPassword() override; private: - osl::Mutex m_aMutex; + std::mutex m_aMutex; OUString m_aPassword; }; @@ -148,14 +148,14 @@ void SAL_CALL InteractionSupplyPassword::select() void SAL_CALL InteractionSupplyPassword::setPassword( const OUString& aPasswd ) { - osl::MutexGuard aGuard( m_aMutex ); + std::scoped_lock aGuard( m_aMutex ); m_aPassword = aPasswd; } // virtual OUString SAL_CALL InteractionSupplyPassword::getPassword() { - osl::MutexGuard aGuard( m_aMutex ); + std::scoped_lock aGuard( m_aMutex ); return m_aPassword; }