diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-16 03:20:00 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:38 -0500 |
| commit | d88b292704957818eff9a348a524b5c90b40031b (patch) | |
| tree | eabf039491304b2c13f3bd77ca0b6d58c3dba1b8 /svtools/source/toolpanel | |
| parent | 98b2c08dff4d00b3e7a2e001c326ebe27dae4549 (diff) | |
merge vosremoval-mutex.diff
In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
Diffstat (limited to 'svtools/source/toolpanel')
| -rw-r--r-- | svtools/source/toolpanel/paneltabbarpeer.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/toolpanel/toolpaneldeckpeer.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/toolpanel/toolpaneldrawerpeer.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/svtools/source/toolpanel/paneltabbarpeer.cxx b/svtools/source/toolpanel/paneltabbarpeer.cxx index 8fefc166a028..703ce138629a 100644 --- a/svtools/source/toolpanel/paneltabbarpeer.cxx +++ b/svtools/source/toolpanel/paneltabbarpeer.cxx @@ -75,7 +75,7 @@ namespace svt //------------------------------------------------------------------------------------------------------------------ Reference< XAccessibleContext > PanelTabBarPeer::CreateAccessibleContext() { - ::vos::OGuard aSolarGuard( GetMutex() ); + ::osl::SolarMutexGuard aSolarGuard( GetMutex() ); if ( m_pTabBar == NULL ) throw DisposedException( ::rtl::OUString(), *this ); @@ -91,7 +91,7 @@ namespace svt void SAL_CALL PanelTabBarPeer::dispose() throw(RuntimeException) { { - ::vos::OGuard aSolarGuard( GetMutex() ); + ::osl::SolarMutexGuard aSolarGuard( GetMutex() ); m_pTabBar = NULL; } VCLXWindow::dispose(); diff --git a/svtools/source/toolpanel/toolpaneldeckpeer.cxx b/svtools/source/toolpanel/toolpaneldeckpeer.cxx index 0aa996ad3fe1..d99dfcefe855 100644 --- a/svtools/source/toolpanel/toolpaneldeckpeer.cxx +++ b/svtools/source/toolpanel/toolpaneldeckpeer.cxx @@ -75,7 +75,7 @@ namespace svt //------------------------------------------------------------------------------------------------------------------ Reference< XAccessibleContext > ToolPanelDeckPeer::CreateAccessibleContext() { - ::vos::OGuard aSolarGuard( GetMutex() ); + ::osl::SolarMutexGuard aSolarGuard( GetMutex() ); if ( m_pDeck == NULL ) throw DisposedException( ::rtl::OUString(), *this ); @@ -89,7 +89,7 @@ namespace svt void SAL_CALL ToolPanelDeckPeer::dispose() throw(RuntimeException) { { - ::vos::OGuard aSolarGuard( GetMutex() ); + ::osl::SolarMutexGuard aSolarGuard( GetMutex() ); m_pDeck = NULL; } VCLXWindow::dispose(); diff --git a/svtools/source/toolpanel/toolpaneldrawerpeer.cxx b/svtools/source/toolpanel/toolpaneldrawerpeer.cxx index 4bf0e0fe5661..ce6d7300f23c 100644 --- a/svtools/source/toolpanel/toolpaneldrawerpeer.cxx +++ b/svtools/source/toolpanel/toolpaneldrawerpeer.cxx @@ -134,7 +134,7 @@ namespace svt //------------------------------------------------------------------------------------------------------------------ Reference< XAccessibleContext > ToolPanelDrawerPeer::CreateAccessibleContext() { - ::vos::OGuard aSolarGuard( GetMutex() ); + ::osl::SolarMutexGuard aSolarGuard( GetMutex() ); return new ToolPanelDrawerContext( *this ); } |