From da21e9de6a71dcd1926f5bf167049bce0590515e Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 3 Oct 2013 14:57:12 +0200 Subject: require OAccessibleContextHelper to be initialized with SolarMutex OAccessibleContextHelper methods are locked by OExternalLockGuard which effectively only locks its ExternalMutex (i.e. SolarMutex); so ensure that all sub-classes actually pass in a SolarMutex by removing the default constructor. (since these classes are in comphelper they can only use the SolarMutex indirectly) This uncovers that AccessibleToolPanelDeckTabBarItem and OAccessibleControlContext did not pass in SolarMutex before. Change-Id: Ib9085eeee6225f7c74b158e72f04b1bf62622071 --- comphelper/source/misc/accessiblecomponenthelper.cxx | 18 ------------------ comphelper/source/misc/accessiblecontexthelper.cxx | 9 +-------- 2 files changed, 1 insertion(+), 26 deletions(-) (limited to 'comphelper') diff --git a/comphelper/source/misc/accessiblecomponenthelper.cxx b/comphelper/source/misc/accessiblecomponenthelper.cxx index 0a7c08c8c59d..816b24b30f3f 100644 --- a/comphelper/source/misc/accessiblecomponenthelper.cxx +++ b/comphelper/source/misc/accessiblecomponenthelper.cxx @@ -32,11 +32,6 @@ namespace comphelper //===================================================================== //= OCommonAccessibleComponent //===================================================================== - //--------------------------------------------------------------------- - OCommonAccessibleComponent::OCommonAccessibleComponent( ) - { - } - //--------------------------------------------------------------------- OCommonAccessibleComponent::OCommonAccessibleComponent( IMutex* _pExternalLock ) :OAccessibleContextHelper( _pExternalLock ) @@ -46,9 +41,6 @@ namespace comphelper //--------------------------------------------------------------------- OCommonAccessibleComponent::~OCommonAccessibleComponent( ) { - forgetExternalLock(); - // this ensures that the lock, which may be already destroyed as part of the derivee, - // is not used anymore } //-------------------------------------------------------------------- @@ -108,11 +100,6 @@ namespace comphelper //===================================================================== //= OAccessibleComponentHelper //===================================================================== - //--------------------------------------------------------------------- - OAccessibleComponentHelper::OAccessibleComponentHelper( ) - { - } - //--------------------------------------------------------------------- OAccessibleComponentHelper::OAccessibleComponentHelper( IMutex* _pExternalLock ) :OCommonAccessibleComponent( _pExternalLock ) @@ -157,11 +144,6 @@ namespace comphelper //===================================================================== //= OAccessibleExtendedComponentHelper //===================================================================== - //--------------------------------------------------------------------- - OAccessibleExtendedComponentHelper::OAccessibleExtendedComponentHelper( ) - { - } - //--------------------------------------------------------------------- OAccessibleExtendedComponentHelper::OAccessibleExtendedComponentHelper( IMutex* _pExternalLock ) :OCommonAccessibleComponent( _pExternalLock ) diff --git a/comphelper/source/misc/accessiblecontexthelper.cxx b/comphelper/source/misc/accessiblecontexthelper.cxx index bb9047d5ca82..3b7836377698 100644 --- a/comphelper/source/misc/accessiblecontexthelper.cxx +++ b/comphelper/source/misc/accessiblecontexthelper.cxx @@ -78,19 +78,12 @@ namespace comphelper //===================================================================== //= OAccessibleContextHelper //===================================================================== - //--------------------------------------------------------------------- - OAccessibleContextHelper::OAccessibleContextHelper( ) - :OAccessibleContextHelper_Base( GetMutex() ) - ,m_pImpl( NULL ) - { - m_pImpl = new OContextHelper_Impl(); - } - //--------------------------------------------------------------------- OAccessibleContextHelper::OAccessibleContextHelper( IMutex* _pExternalLock ) :OAccessibleContextHelper_Base( GetMutex() ) ,m_pImpl( NULL ) { + assert(_pExternalLock); m_pImpl = new OContextHelper_Impl(); m_pImpl->setExternalLock( _pExternalLock ); } -- cgit v1.2.3