diff options
4 files changed, 7 insertions, 22 deletions
diff --git a/accessibility/source/extended/AccessibleToolPanelDeck.cxx b/accessibility/source/extended/AccessibleToolPanelDeck.cxx index d3d12c40209e..ce2b05b86b85 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeck.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeck.cxx @@ -129,7 +129,7 @@ namespace accessibility { public: MethodGuard( AccessibleToolPanelDeck_Impl& i_rImpl ) - :m_aGuard( Application::GetSolarMutex() ) + :m_aGuard() { i_rImpl.checkDisposed(); } @@ -137,13 +137,8 @@ namespace accessibility { } - void clear() - { - m_aGuard.clear(); - } - private: - ::vos::OClearableGuard m_aGuard; + SolarMutexGuard m_aGuard; }; } diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx index 8a633101efd0..a305b19cde6e 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx @@ -296,7 +296,7 @@ namespace accessibility { public: MethodGuard( AccessibleToolPanelTabBar_Impl& i_rImpl ) - :m_aGuard( Application::GetSolarMutex() ) + :m_aGuard() { i_rImpl.checkDisposed(); } @@ -304,13 +304,8 @@ namespace accessibility { } - void clear() - { - m_aGuard.clear(); - } - private: - ::vos::OClearableGuard m_aGuard; + SolarMutexGuard m_aGuard; }; } diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx index de459ae8cdb9..2ad3ee0f3266 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx @@ -258,7 +258,7 @@ namespace accessibility { public: ItemMethodGuard( AccessibleToolPanelDeckTabBarItem_Impl& i_rImpl ) - :m_aGuard( Application::GetSolarMutex() ) + :m_aGuard() { i_rImpl.checkDisposed(); } @@ -266,13 +266,8 @@ namespace accessibility { } - void clear() - { - m_aGuard.clear(); - } - private: - ::vos::OClearableGuard m_aGuard; + SolarMutexGuard m_aGuard; }; //================================================================================================================== diff --git a/basctl/source/basicide/doceventnotifier.cxx b/basctl/source/basicide/doceventnotifier.cxx index c204a6ea7109..b8afffe21d88 100644 --- a/basctl/source/basicide/doceventnotifier.cxx +++ b/basctl/source/basicide/doceventnotifier.cxx @@ -177,7 +177,7 @@ namespace basctl // the listener implementations usually require the SolarMutex, so lock it here. // But ensure the proper order of locking the solar and the own mutex aGuard.clear(); - ::vos::OClearableGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard2( m_aMutex ); if ( impl_isDisposed_nothrow() ) |