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

[Noel Grandin (via logerrit)]

 sot/source/sdstor/ucbstorage.cxx |   17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 983d0898b25f195258bb4934a62ae196d436fb0a
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Sun Aug 1 18:51:22 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun Aug 1 22:36:31 2021 +0200

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

diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 31db79361f5c..cf75b1cf63cf 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -62,6 +62,7 @@
 #include <sot/formats.hxx>
 #include <comphelper/classids.hxx>
 
+#include <mutex>
 #include <vector>
 
 namespace com::sun::star::ucb { class XCommandEnvironment; }
@@ -86,7 +87,7 @@ namespace {
 class FileStreamWrapper_Impl : public FileInputStreamWrapper_Base
 {
 protected:
-    ::osl::Mutex    m_aMutex;
+    std::mutex    m_aMutex;
     OUString        m_aURL;
     std::unique_ptr<SvStream> m_pSvStream;
 
@@ -145,7 +146,7 @@ sal_Int32 SAL_CALL FileStreamWrapper_Impl::readBytes(Sequence< sal_Int8 >& aData
     if (nBytesToRead < 0)
         throw BufferSizeExceededException(OUString(),static_cast<XWeak*>(this));
 
-    ::osl::MutexGuard aGuard( m_aMutex );
+    std::lock_guard aGuard( m_aMutex );
 
     if (aData.getLength() < nBytesToRead)
         aData.realloc(nBytesToRead);
@@ -189,7 +190,7 @@ void SAL_CALL FileStreamWrapper_Impl::skipBytes(sal_Int32 nBytesToSkip)
     if ( m_aURL.isEmpty() )
         return;
 
-    ::osl::MutexGuard aGuard( m_aMutex );
+    std::lock_guard aGuard( m_aMutex );
     checkError();
 
     m_pSvStream->SeekRel(nBytesToSkip);
@@ -202,7 +203,7 @@ sal_Int32 SAL_CALL FileStreamWrapper_Impl::available()
     if ( m_aURL.isEmpty() )
         return 0;
 
-    ::osl::MutexGuard aGuard( m_aMutex );
+    std::lock_guard aGuard( m_aMutex );
     checkConnected();
 
     sal_Int64 nAvailable = m_pSvStream->remainingSize();
@@ -217,7 +218,7 @@ void SAL_CALL FileStreamWrapper_Impl::closeInput()
     if ( m_aURL.isEmpty() )
         return;
 
-    ::osl::MutexGuard aGuard( m_aMutex );
+    std::lock_guard aGuard( m_aMutex );
     checkConnected();
     m_pSvStream.reset();
 #if OSL_DEBUG_LEVEL > 0
@@ -233,7 +234,7 @@ void SAL_CALL FileStreamWrapper_Impl::seek( sal_Int64 _nLocation )
     if ( m_aURL.isEmpty() )
         return;
 
-    ::osl::MutexGuard aGuard( m_aMutex );
+    std::lock_guard aGuard( m_aMutex );
     checkConnected();
 
     m_pSvStream->Seek(static_cast<sal_uInt32>(_nLocation));
@@ -246,7 +247,7 @@ sal_Int64 SAL_CALL FileStreamWrapper_Impl::getPosition(  )
     if ( m_aURL.isEmpty() )
         return 0;
 
-    ::osl::MutexGuard aGuard( m_aMutex );
+    std::lock_guard aGuard( m_aMutex );
     checkConnected();
 
     sal_uInt32 nPos = m_pSvStream->Tell();
@@ -260,7 +261,7 @@ sal_Int64 SAL_CALL FileStreamWrapper_Impl::getLength(  )
     if ( m_aURL.isEmpty() )
         return 0;
 
-    ::osl::MutexGuard aGuard( m_aMutex );
+    std::lock_guard aGuard( m_aMutex );
     checkConnected();
 
     checkError();