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 /accessibility | |
| 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 'accessibility')
| -rw-r--r-- | accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx index 86c8680effe3..8b7a2fdb0bdf 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx @@ -29,6 +29,7 @@ #include <svtools/toolpanel/paneltabbar.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <unotools/accessiblerelationsethelper.hxx> +#include <toolkit/helper/externallock.hxx> #include <tools/diagnose_ex.h> #include <vcl/svapp.hxx> #include <osl/mutex.hxx> @@ -263,7 +264,10 @@ namespace accessibility //------------------------------------------------------------------------------------------------------------------ AccessibleToolPanelDeckTabBarItem::AccessibleToolPanelDeckTabBarItem( const Reference< XAccessible >& i_rAccessibleParent, ::svt::IToolPanelDeck& i_rPanelDeck, ::svt::PanelTabBar& i_rTabBar, const size_t i_nItemPos ) - :m_pImpl( new AccessibleToolPanelDeckTabBarItem_Impl( *this, i_rAccessibleParent, i_rPanelDeck, i_rTabBar, i_nItemPos ) ) + : ::comphelper::OAccessibleExtendedComponentHelper( + new VCLExternalSolarLock) + , m_pImpl(new AccessibleToolPanelDeckTabBarItem_Impl(*this, + i_rAccessibleParent, i_rPanelDeck, i_rTabBar, i_nItemPos)) { } |