diff options
author | Arnaud Versini <arnaud.versini@gmail.com> | 2017-06-05 12:34:39 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-05 13:41:38 +0200 |
commit | f2d40b8ba172d90be9a43c30cd5cbd62c0e8e548 (patch) | |
tree | 6fe8f206109cb97945fff7d9a01122b3e04949d4 /svx/source/inc | |
parent | 118bcbc83e38604189bec667a394a4acaec98f56 (diff) |
Remove all allocation of VCLExternalSolarLock.
This patch is graciously offered by Arnaud Versini.
Change-Id: I3ed5e1758d09542a2ca0533e3f4a6ceb2dbb6346
Reviewed-on: https://gerrit.libreoffice.org/38404
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-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, 7 insertions, 3 deletions
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx index 6783b5504752..83cd41dfff25 100644 --- a/svx/source/inc/charmapacc.hxx +++ b/svx/source/inc/charmapacc.hxx @@ -25,6 +25,7 @@ #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; @@ -38,7 +39,8 @@ 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 : public ::comphelper::OAccessibleComponentHelper, + class SvxShowCharSetVirtualAcc : private BaseVCLExternalSolarLock, + public ::comphelper::OAccessibleComponentHelper, public OAccessibleHelper_Base_2 { VclPtr<SvxShowCharSet> mpParent; // the vcl control @@ -120,7 +122,8 @@ namespace svx /** The table implementation of the vcl control. */ - class SvxShowCharSetAcc : public ::comphelper::OAccessibleSelectionHelper, + class SvxShowCharSetAcc : private BaseVCLExternalSolarLock, + public ::comphelper::OAccessibleSelectionHelper, public OAccessibleHelper_Base { ::std::vector< css::uno::Reference< css::accessibility::XAccessible > > m_aChildren; @@ -209,7 +212,8 @@ namespace svx /** The child implementation of the table. */ - class SvxShowCharSetItemAcc : public ::comphelper::OAccessibleComponentHelper, + class SvxShowCharSetItemAcc : private BaseVCLExternalSolarLock, + public ::comphelper::OAccessibleComponentHelper, public OAccessibleHelper_Base_3 { private: |