ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

osl::Mutex->std::mutex in OHierarchyElement_Impl

Browse Source 
Change-Id: I458cab160f337019402659b5fb738ba85f73ea1b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147190
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2023-02-17 07:33:24 +00:00
parent f8dc080dd0
commit cf4e1e0bb8
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package/source/xstor/ohierarchyholder.cxx
+6 -6
View File
@@ -80,7 +80,7 @@ std::vector<OUString> OHierarchyHolder_Impl::GetListPathFromString( std::u16stri
uno::Reference< embed::XExtendedStorageStream > OHierarchyElement_Impl::GetStreamHierarchically( sal_Int32 nStorageMode, std::vector<OUString>& aListPath, sal_Int32 nStreamMode, const ::comphelper::SequenceAsHashMap& aEncryptionData )
{
::osl::MutexGuard aGuard( m_aMutex );
std::unique_lock aGuard( m_aMutex );
if ( !( nStorageMode & embed::ElementModes::WRITE ) && ( nStreamMode & embed::ElementModes::WRITE ) )
throw io::IOException("invalid storage/stream mode combo");
@@ -162,7 +162,7 @@ uno::Reference< embed::XExtendedStorageStream > OHierarchyElement_Impl::GetStrea
void OHierarchyElement_Impl::RemoveStreamHierarchically( std::vector<OUString>& aListPath )
{
::osl::MutexGuard aGuard( m_aMutex );
std::unique_lock aGuard( m_aMutex );
if ( aListPath.empty() )
throw uno::RuntimeException();
@@ -211,7 +211,7 @@ void OHierarchyElement_Impl::Commit()
uno::Reference< embed::XStorage > xOwnStor;
{
::osl::MutexGuard aGuard( m_aMutex );
std::unique_lock aGuard( m_aMutex );
aParent = m_rParent;
xOwnStor = m_xOwnStorage;
}
@@ -229,7 +229,7 @@ void OHierarchyElement_Impl::TestForClosing()
{
::rtl::Reference< OHierarchyElement_Impl > xKeepAlive( this );
{
::osl::MutexGuard aGuard( m_aMutex );
std::unique_lock aGuard( m_aMutex );
if ( m_aOpenStreams.empty() && m_aChildren.empty() )
{
@@ -259,7 +259,7 @@ void SAL_CALL OHierarchyElement_Impl::disposing( const lang::EventObject& Source
try
{
{
osl::MutexGuard aGuard(m_aMutex);
std::unique_lock aGuard(m_aMutex);
uno::Reference< embed::XExtendedStorageStream > xStream(Source.Source, uno::UNO_QUERY);
m_aOpenStreams.erase(std::remove_if(m_aOpenStreams.begin(), m_aOpenStreams.end(),
@@ -281,7 +281,7 @@ void SAL_CALL OHierarchyElement_Impl::disposing( const lang::EventObject& Source
void OHierarchyElement_Impl::RemoveElement( const ::rtl::Reference< OHierarchyElement_Impl >& aRef )
{
{
::osl::MutexGuard aGuard( m_aMutex );
std::unique_lock aGuard( m_aMutex );
OHierarchyElementList_Impl::iterator aIter = m_aChildren.begin();
while (aIter != m_aChildren.end())
{
package/source/xstor/ohierarchyholder.hxx
+2 -2
View File
@@ -29,7 +29,7 @@
#include <comphelper/sequenceashashmap.hxx>
#include <rtl/ref.hxx>
#include <mutex>
#include <unordered_map>
#include <utility>
#include <vector>
@@ -44,7 +44,7 @@ typedef ::std::vector< css::uno::WeakReference< css::embed::XExtendedStorageStre
class OHierarchyElement_Impl : public cppu::WeakImplHelper< css::embed::XTransactionListener >
{
::osl::Mutex m_aMutex;
std::mutex m_aMutex;
::rtl::Reference< OHierarchyElement_Impl > m_rParent;
css::uno::Reference< css::embed::XStorage > m_xOwnStorage;