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/querydesign | |
| parent | c0101e88414a7f75f13735c2abc58544f133c69c (diff) | |
use SolarMutexGuard to guard the SolarMutex
Diffstat (limited to 'dbaccess/source/ui/querydesign')
| -rw-r--r-- | dbaccess/source/ui/querydesign/JoinController.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/querycontroller.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index 333d584292a1..b820d80acbae 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -363,7 +363,7 @@ sal_Bool SAL_CALL OJoinController::suspend(sal_Bool _bSuspend) throw( RuntimeExc if ( getBroadcastHelper().bInDispose || getBroadcastHelper().bDisposed ) return sal_True; - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); if ( getView() && getView()->IsInModalMode() ) return sal_False; diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index fe938ac6b004..fa48701f6768 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -1079,7 +1079,7 @@ void OQueryController::onLoadedMenu(const Reference< ::com::sun::star::frame::XL { if ( !editingCommand() ) { - ::vos::OGuard aSolarGuard(Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); String aDefaultName = String( ModuleRes( editingView() ? STR_VIEW_TITLE : STR_QRY_TITLE ) ); sName = aDefaultName.GetToken(0,' '); @@ -1160,7 +1160,7 @@ void OQueryController::impl_onModifyChanged() // ----------------------------------------------------------------------------- void SAL_CALL OQueryController::disposing( const EventObject& Source ) throw(RuntimeException) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if ( getContainer() && Source.Source.is() ) { @@ -1636,7 +1636,7 @@ bool OQueryController::doSaveAsDoc(sal_Bool _bSaveAs) // ----------------------------------------------------------------------------- short OQueryController::saveModified() { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); short nRet = RET_YES; if ( !isConnected() || !isModified() ) |