diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-13 02:37:50 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 17:58:18 -0500 |
| commit | f883da353a2edf987ae2edecbb2c765a2fdd929d (patch) | |
| tree | 35ac3a05d26da414db5bd0e9d0d18f10a1f6385f /sd/source/ui/toolpanel | |
| parent | bac821b200dcc0c11ba6d03fd23ec3b07b15dea8 (diff) | |
use SolarMutexGuard to guard the SolarMutex
Diffstat (limited to 'sd/source/ui/toolpanel')
| -rw-r--r-- | sd/source/ui/toolpanel/TaskPaneFocusManager.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/toolpanel/ToolPanelFactory.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx b/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx index fbf5bccf5af1..9aaa29633185 100644 --- a/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx +++ b/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx @@ -78,7 +78,7 @@ FocusManager& FocusManager::Instance (void) { if (spInstance == NULL) { - ::vos::OGuard aGuard (::Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (spInstance == NULL) spInstance = new FocusManager (); } diff --git a/sd/source/ui/toolpanel/ToolPanelFactory.cxx b/sd/source/ui/toolpanel/ToolPanelFactory.cxx index 128e259e3816..ce758467e36e 100644 --- a/sd/source/ui/toolpanel/ToolPanelFactory.cxx +++ b/sd/source/ui/toolpanel/ToolPanelFactory.cxx @@ -143,7 +143,7 @@ namespace sd { namespace toolpanel //------------------------------------------------------------------------------------------------------------------ Reference< XUIElement > SAL_CALL ToolPanelFactory::createUIElement( const ::rtl::OUString& i_rResourceURL, const Sequence< PropertyValue >& i_rArgs ) throw (NoSuchElementException, IllegalArgumentException, RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; const PanelId ePanelId( toolpanel::GetStandardPanelId( i_rResourceURL ) ); if ( ePanelId == PID_UNKNOWN ) |