diff options
Diffstat (limited to 'extensions/source/propctrlr')
-rw-r--r-- | extensions/source/propctrlr/browserlistbox.cxx | 8 | ||||
-rw-r--r-- | extensions/source/propctrlr/propcontroller.cxx | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index ad44f2585b2c..6ba05e432185 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -244,7 +244,7 @@ namespace pcr //-------------------------------------------------------------------- void SAL_CALL PropertyControlContext_Impl::dispose() { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( impl_isDisposed_nothrow() ) return; @@ -255,7 +255,7 @@ namespace pcr //-------------------------------------------------------------------- void PropertyControlContext_Impl::setNotificationMode( NotifcationMode _eMode ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; m_eMode = _eMode; } @@ -265,7 +265,7 @@ namespace pcr ::comphelper::AnyEventRef pEvent; { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; impl_checkAlive_throw(); pEvent = new ControlEvent( _rxControl, _eType ); @@ -315,7 +315,7 @@ namespace pcr //-------------------------------------------------------------------- void PropertyControlContext_Impl::processEvent( const ::comphelper::AnyEvent& _rEvent ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( impl_isDisposed_nothrow() ) return; diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index f4791a316137..16fedd434cad 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -283,7 +283,7 @@ namespace pcr //-------------------------------------------------------------------- void SAL_CALL OPropertyBrowserController::inspect( const Sequence< Reference< XInterface > >& _rObjects ) throw (com::sun::star::util::VetoException, RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); if ( m_bSuspendingPropertyHandlers || !suspendAll_nothrow() ) @@ -371,7 +371,7 @@ namespace pcr //------------------------------------------------------------------------ void SAL_CALL OPropertyBrowserController::attachFrame( const Reference< XFrame >& _rxFrame ) throw(RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); if (_rxFrame.is() && haveView()) @@ -536,7 +536,7 @@ namespace pcr //------------------------------------------------------------------------ void SAL_CALL OPropertyBrowserController::dispose( ) throw(RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; // stop inspecting the current object stopInspection( false ); @@ -1724,7 +1724,7 @@ namespace pcr //------------------------------------------------------------------------ void SAL_CALL OPropertyBrowserController::setHelpSectionText( const ::rtl::OUString& _rHelpText ) throw (NoSupportException, RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); if ( !haveView() ) |