diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-13 01:38:41 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 17:54:56 -0500 |
commit | 921136c6933f9142a9371eccf98799d72ee1e6cd (patch) | |
tree | d60d245582e1abf58b4fc4d5eccddc86e5fd7cc0 /dbaccess/source/ui/app/AppControllerGen.cxx | |
parent | Merge commit 'ooo/OOO330_m12' (diff) | |
download | core-921136c6933f9142a9371eccf98799d72ee1e6cd.tar.gz core-921136c6933f9142a9371eccf98799d72ee1e6cd.zip |
use SolarMutexGuard to guard the SolarMutex
Diffstat (limited to 'dbaccess/source/ui/app/AppControllerGen.cxx')
-rw-r--r-- | dbaccess/source/ui/app/AppControllerGen.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx index 26a645b43ae1..6d30c639b0df 100644 --- a/dbaccess/source/ui/app/AppControllerGen.cxx +++ b/dbaccess/source/ui/app/AppControllerGen.cxx @@ -216,7 +216,7 @@ void OApplicationController::openDialog( const ::rtl::OUString& _sServiceName ) { try { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); WaitObject aWO(getView()); @@ -306,7 +306,7 @@ void OApplicationController::openDirectSQLDialog() // ----------------------------------------------------------------------------- void SAL_CALL OApplicationController::propertyChange( const PropertyChangeEvent& evt ) throw (RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); if ( evt.PropertyName == PROPERTY_USER ) { @@ -393,7 +393,7 @@ Reference< XConnection > SAL_CALL OApplicationController::getActiveConnection() // ----------------------------------------------------------------------------- void SAL_CALL OApplicationController::connect( ) throw (SQLException, RuntimeException) { - ::vos::OGuard aSolarGuard(Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); SQLExceptionInfo aError; @@ -432,7 +432,7 @@ beans::Pair< ::sal_Int32, ::rtl::OUString > SAL_CALL OApplicationController::ide // ----------------------------------------------------------------------------- ::sal_Bool SAL_CALL OApplicationController::closeSubComponents( ) throw (RuntimeException) { - ::vos::OGuard aSolarGuard(Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); return m_pSubComponentManager->closeSubComponents(); } @@ -517,7 +517,7 @@ Reference< XComponent > SAL_CALL OApplicationController::loadComponent( ::sal_In Reference< XComponent > SAL_CALL OApplicationController::loadComponentWithArguments( ::sal_Int32 _ObjectType, const ::rtl::OUString& _ObjectName, ::sal_Bool _ForEditing, const Sequence< PropertyValue >& _Arguments ) throw (IllegalArgumentException, NoSuchElementException, SQLException, RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); impl_validateObjectTypeAndName_throw( _ObjectType, _ObjectName ); @@ -542,7 +542,7 @@ Reference< XComponent > SAL_CALL OApplicationController::createComponent( ::sal_ // ----------------------------------------------------------------------------- Reference< XComponent > SAL_CALL OApplicationController::createComponentWithArguments( ::sal_Int32 i_nObjectType, const Sequence< PropertyValue >& i_rArguments, Reference< XComponent >& o_DocumentDefinition ) throw (IllegalArgumentException, SQLException, RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); impl_validateObjectTypeAndName_throw( i_nObjectType, ::boost::optional< ::rtl::OUString >() ); @@ -572,7 +572,7 @@ void SAL_CALL OApplicationController::releaseContextMenuInterceptor( const Refer // ----------------------------------------------------------------------------- void OApplicationController::previewChanged( sal_Int32 _nMode ) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); if ( m_xDataSource.is() && !isDataSourceReadOnly() ) |