diff options
| author | Arnaud Versini <arnaud.versini@gmail.com> | 2017-06-05 16:12:27 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-12 08:45:48 +0200 |
| commit | a7532d8f061986c2e828df32f47f1fee1a339a14 (patch) | |
| tree | a7a1421a1476e246e620a03c6188b312db015c06 /svx/source/inc | |
| parent | 0b8c2c72c988488895d74d1bb36e60378283a4da (diff) | |
Remove VCLExternalSolarLock and IMutex.
Next step is to remove OContextEntryGuard.
Change-Id: I9460fb67fba6f3bfb3c809b730c33f38d225a64e
Reviewed-on: https://gerrit.libreoffice.org/38411
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source/inc')
| -rw-r--r-- | svx/source/inc/charmapacc.hxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx index 83cd41dfff25..6783b5504752 100644 --- a/svx/source/inc/charmapacc.hxx +++ b/svx/source/inc/charmapacc.hxx @@ -25,7 +25,6 @@ #include <comphelper/accessibleselectionhelper.hxx> #include <com/sun/star/accessibility/XAccessibleAction.hpp> #include <com/sun/star/accessibility/XAccessibleTable.hpp> -#include <toolkit/helper/externallock.hxx> #include <vector> class SvxShowCharSet; @@ -39,8 +38,7 @@ namespace svx /** The class SvxShowCharSetVirtualAcc is used as a virtual class which contains the table and the scrollbar. In the vcl control, the table and the scrollbar exists in one class. This is not feasible for the accessibility api. */ - class SvxShowCharSetVirtualAcc : private BaseVCLExternalSolarLock, - public ::comphelper::OAccessibleComponentHelper, + class SvxShowCharSetVirtualAcc : public ::comphelper::OAccessibleComponentHelper, public OAccessibleHelper_Base_2 { VclPtr<SvxShowCharSet> mpParent; // the vcl control @@ -122,8 +120,7 @@ namespace svx /** The table implementation of the vcl control. */ - class SvxShowCharSetAcc : private BaseVCLExternalSolarLock, - public ::comphelper::OAccessibleSelectionHelper, + class SvxShowCharSetAcc : public ::comphelper::OAccessibleSelectionHelper, public OAccessibleHelper_Base { ::std::vector< css::uno::Reference< css::accessibility::XAccessible > > m_aChildren; @@ -212,8 +209,7 @@ namespace svx /** The child implementation of the table. */ - class SvxShowCharSetItemAcc : private BaseVCLExternalSolarLock, - public ::comphelper::OAccessibleComponentHelper, + class SvxShowCharSetItemAcc : public ::comphelper::OAccessibleComponentHelper, public OAccessibleHelper_Base_3 { private: |