diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-03 14:57:12 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-04 14:46:24 +0200 |
| commit | da21e9de6a71dcd1926f5bf167049bce0590515e (patch) | |
| tree | 9c56228d00596f3b7ad73c9f384bde03500e9332 /include/comphelper | |
| parent | 43d1b80a6758022c2187e077f50f3606dbe557bf (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 'include/comphelper')
| -rw-r--r-- | include/comphelper/accessiblecomponenthelper.hxx | 3 | ||||
| -rw-r--r-- | include/comphelper/accessiblecontexthelper.hxx | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/comphelper/accessiblecomponenthelper.hxx b/include/comphelper/accessiblecomponenthelper.hxx index d0eabc27b807..dc31550e8e5b 100644 --- a/include/comphelper/accessiblecomponenthelper.hxx +++ b/include/comphelper/accessiblecomponenthelper.hxx @@ -41,7 +41,6 @@ namespace comphelper class COMPHELPER_DLLPUBLIC OCommonAccessibleComponent : public OAccessibleContextHelper { protected: - OCommonAccessibleComponent(); /// see the respective base class ctor for an extensive comment on this, please OCommonAccessibleComponent( IMutex* _pExternalLock ); ~OCommonAccessibleComponent(); @@ -81,7 +80,6 @@ namespace comphelper ,public OAccessibleComponentHelper_Base { protected: - OAccessibleComponentHelper( ); /// see the respective base class ctor for an extensive comment on this, please OAccessibleComponentHelper( IMutex* _pExternalLock ); @@ -113,7 +111,6 @@ namespace comphelper ,public OAccessibleExtendedComponentHelper_Base { protected: - OAccessibleExtendedComponentHelper( ); /// see the respective base class ctor for an extensive comment on this, please OAccessibleExtendedComponentHelper( IMutex* _pExternalLock ); diff --git a/include/comphelper/accessiblecontexthelper.hxx b/include/comphelper/accessiblecontexthelper.hxx index e6c5c10ab20f..f01c9117c400 100644 --- a/include/comphelper/accessiblecontexthelper.hxx +++ b/include/comphelper/accessiblecontexthelper.hxx @@ -90,7 +90,6 @@ namespace comphelper OContextHelper_Impl* m_pImpl; protected: - OAccessibleContextHelper( ); ~OAccessibleContextHelper( ); /** ctor @@ -141,6 +140,7 @@ namespace comphelper ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > getAccessibleCreator( ) const; + private: /** forgets the reference to the external lock, if present. <p>This means any further locking will not be guard the external lock anymore, never.</p> |