summaryrefslogtreecommitdiff
path: root/comphelper
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-10-03 14:57:12 +0200
committerMichael Stahl <mstahl@redhat.com>2013-10-04 14:46:24 +0200
commitda21e9de6a71dcd1926f5bf167049bce0590515e (patch)
tree9c56228d00596f3b7ad73c9f384bde03500e9332 /comphelper
parent43d1b80a6758022c2187e077f50f3606dbe557bf (diff)
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
Diffstat (limited to 'comphelper')
-rw-r--r--comphelper/source/misc/accessiblecomponenthelper.cxx18
-rw-r--r--comphelper/source/misc/accessiblecontexthelper.cxx9
2 files changed, 1 insertions, 26 deletions
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
@@ -33,11 +33,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
}
//--------------------------------------------------------------------
@@ -109,11 +101,6 @@ namespace comphelper
//= OAccessibleComponentHelper
//=====================================================================
//---------------------------------------------------------------------
- OAccessibleComponentHelper::OAccessibleComponentHelper( )
- {
- }
-
- //---------------------------------------------------------------------
OAccessibleComponentHelper::OAccessibleComponentHelper( IMutex* _pExternalLock )
:OCommonAccessibleComponent( _pExternalLock )
{
@@ -158,11 +145,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
@@ -79,18 +79,11 @@ 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 );
}