summaryrefslogtreecommitdiff
path: root/comphelper/source/misc/instancelocker.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'comphelper/source/misc/instancelocker.cxx')
-rw-r--r--comphelper/source/misc/instancelocker.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/comphelper/source/misc/instancelocker.cxx b/comphelper/source/misc/instancelocker.cxx
index 43991cec43b1..c995499d8410 100644
--- a/comphelper/source/misc/instancelocker.cxx
+++ b/comphelper/source/misc/instancelocker.cxx
@@ -211,7 +211,7 @@ OLockListener::~OLockListener()
void OLockListener::Dispose()
{
- ::osl::ResettableMutexGuard aGuard( m_aMutex );
+ osl::MutexGuard aGuard( m_aMutex );
if ( m_bDisposed )
return;
@@ -251,7 +251,7 @@ void OLockListener::Dispose()
void SAL_CALL OLockListener::disposing( const lang::EventObject& aEvent )
{
- ::osl::ResettableMutexGuard aGuard( m_aMutex );
+ osl::ClearableMutexGuard aGuard( m_aMutex );
// object is disposed
if ( aEvent.Source == m_xInstance )
@@ -276,7 +276,7 @@ void SAL_CALL OLockListener::disposing( const lang::EventObject& aEvent )
void SAL_CALL OLockListener::queryClosing( const lang::EventObject& aEvent, sal_Bool )
{
// GetsOwnership parameter is always ignored, the user of the service must close the object always
- ::osl::ResettableMutexGuard aGuard( m_aMutex );
+ osl::ClearableMutexGuard aGuard( m_aMutex );
if ( !m_bDisposed && aEvent.Source == m_xInstance && ( m_nMode & embed::Actions::PREVENT_CLOSE ) )
{
try
@@ -304,7 +304,7 @@ void SAL_CALL OLockListener::queryClosing( const lang::EventObject& aEvent, sal_
void SAL_CALL OLockListener::notifyClosing( const lang::EventObject& aEvent )
{
- ::osl::ResettableMutexGuard aGuard( m_aMutex );
+ osl::ClearableMutexGuard aGuard( m_aMutex );
// object is closed, no reason to listen
if ( aEvent.Source == m_xInstance )
@@ -334,7 +334,7 @@ void SAL_CALL OLockListener::notifyClosing( const lang::EventObject& aEvent )
void SAL_CALL OLockListener::queryTermination( const lang::EventObject& aEvent )
{
- ::osl::ResettableMutexGuard aGuard( m_aMutex );
+ osl::ClearableMutexGuard aGuard( m_aMutex );
if ( aEvent.Source == m_xInstance && ( m_nMode & embed::Actions::PREVENT_TERMINATION ) )
{
try
@@ -362,7 +362,7 @@ void SAL_CALL OLockListener::queryTermination( const lang::EventObject& aEvent )
void SAL_CALL OLockListener::notifyTermination( const lang::EventObject& aEvent )
{
- ::osl::ResettableMutexGuard aGuard( m_aMutex );
+ osl::ClearableMutexGuard aGuard( m_aMutex );
// object is terminated, no reason to listen
if ( aEvent.Source == m_xInstance )
@@ -397,7 +397,7 @@ void SAL_CALL OLockListener::notifyTermination( const lang::EventObject& aEvent
void OLockListener::Init()
{
- ::osl::ResettableMutexGuard aGuard( m_aMutex );
+ osl::ClearableMutexGuard aGuard( m_aMutex );
if ( m_bDisposed || m_bInitialized )
return;