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

[Noel Grandin (via logerrit)]

 package/source/zipapi/blowfishcontext.cxx |    4 ++--
 package/source/zipapi/blowfishcontext.hxx |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 966ae2345ce09b73c2d8ea47abb983030cc580bf
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Sun Jul 18 19:03:42 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Jul 20 19:36:59 2021 +0200

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

diff --git a/package/source/zipapi/blowfishcontext.cxx b/package/source/zipapi/blowfishcontext.cxx
index 506c6267aa28..d11a9f0d3c01 100644
--- a/package/source/zipapi/blowfishcontext.cxx
+++ b/package/source/zipapi/blowfishcontext.cxx
@@ -62,7 +62,7 @@ BlowfishCFB8CipherContext::~BlowfishCFB8CipherContext()
 
 uno::Sequence< sal_Int8 > SAL_CALL BlowfishCFB8CipherContext::convertWithCipherContext( const uno::Sequence< ::sal_Int8 >& aData )
 {
-    ::osl::MutexGuard aGuard( m_aMutex );
+    std::lock_guard aGuard( m_aMutex );
     if ( !m_pCipher )
         throw lang::DisposedException();
 
@@ -96,7 +96,7 @@ uno::Sequence< sal_Int8 > SAL_CALL BlowfishCFB8CipherContext::convertWithCipherC
 
 uno::Sequence< ::sal_Int8 > SAL_CALL BlowfishCFB8CipherContext::finalizeCipherContextAndDispose()
 {
-    ::osl::MutexGuard aGuard( m_aMutex );
+    std::lock_guard aGuard( m_aMutex );
     if ( !m_pCipher )
         throw lang::DisposedException();
 
diff --git a/package/source/zipapi/blowfishcontext.hxx b/package/source/zipapi/blowfishcontext.hxx
index 11f44eed10ba..c0b603c15298 100644
--- a/package/source/zipapi/blowfishcontext.hxx
+++ b/package/source/zipapi/blowfishcontext.hxx
@@ -22,11 +22,11 @@
 #include <com/sun/star/xml/crypto/XCipherContext.hpp>
 
 #include <cppuhelper/implbase.hxx>
-#include <osl/mutex.hxx>
+#include <mutex>
 
 class BlowfishCFB8CipherContext : public cppu::WeakImplHelper< css::xml::crypto::XCipherContext >
 {
-    ::osl::Mutex m_aMutex;
+    std::mutex m_aMutex;
     void* m_pCipher;
     bool m_bEncrypt;