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

[Noel Grandin (via logerrit)]

 svx/source/xml/xmleohlp.cxx |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit db9d23d71978e32213234a9402798719f1872400
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Mon Aug 2 20:09:11 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Aug 3 08:51:36 2021 +0200

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

diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index 679f1cb55a49..c58c60527d21 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -44,6 +44,7 @@
 #include <svx/xmleohlp.hxx>
 #include <map>
 #include <memory>
+#include <mutex>
 #include <string_view>
 
 using namespace ::osl;
@@ -64,7 +65,7 @@ constexpr OUStringLiteral XML_EMBEDDEDOBJECTGRAPHIC_URL_BASE = u"vnd.sun.star.Gr
 
 class OutputStorageWrapper_Impl : public ::cppu::WeakImplHelper<XOutputStream>
 {
-    ::osl::Mutex    maMutex;
+    std::mutex    maMutex;
     Reference < XOutputStream > xOut;
     TempFile aTempFile;
     bool bStreamClosed : 1;
@@ -100,19 +101,19 @@ SvStream *OutputStorageWrapper_Impl::GetStream()
 void SAL_CALL OutputStorageWrapper_Impl::writeBytes(
         const Sequence< sal_Int8 >& aData)
 {
-    MutexGuard          aGuard( maMutex );
+    std::lock_guard          aGuard( maMutex );
     xOut->writeBytes( aData );
 }
 
 void SAL_CALL OutputStorageWrapper_Impl::flush()
 {
-    MutexGuard          aGuard( maMutex );
+    std::lock_guard          aGuard( maMutex );
     xOut->flush();
 }
 
 void SAL_CALL OutputStorageWrapper_Impl::closeOutput()
 {
-    MutexGuard          aGuard( maMutex );
+    std::lock_guard          aGuard( maMutex );
     xOut->closeOutput();
     bStreamClosed = true;
 }