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 /include/toolkit | |
| 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 'include/toolkit')
| -rw-r--r-- | include/toolkit/awt/vclxaccessiblecomponent.hxx | 5 | ||||
| -rw-r--r-- | include/toolkit/controls/accessiblecontrolcontext.hxx | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx index 520dadab867b..e29520198bef 100644 --- a/include/toolkit/awt/vclxaccessiblecomponent.hxx +++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx @@ -30,6 +30,8 @@ #include <cppuhelper/implbase1.hxx> #include <comphelper/accimplaccess.hxx> #include <comphelper/accessiblecomponenthelper.hxx> +#include <toolkit/helper/externallock.hxx> + #include <tools/link.hxx> #include <vcl/vclptr.hxx> @@ -51,7 +53,8 @@ typedef ::cppu::ImplHelper1< css::lang::XServiceInfo > VCLXAccessibleComponent_BASE; class TOOLKIT_DLLPUBLIC VCLXAccessibleComponent - :public comphelper::OAccessibleExtendedComponentHelper + :private BaseVCLExternalSolarLock + ,public comphelper::OAccessibleExtendedComponentHelper ,public ::comphelper::OAccessibleImplementationAccess ,public VCLXAccessibleComponent_BASE { diff --git a/include/toolkit/controls/accessiblecontrolcontext.hxx b/include/toolkit/controls/accessiblecontrolcontext.hxx index cbd304a1334d..7642433642ee 100644 --- a/include/toolkit/controls/accessiblecontrolcontext.hxx +++ b/include/toolkit/controls/accessiblecontrolcontext.hxx @@ -27,6 +27,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/awt/XWindow.hpp> #include <vcl/vclptr.hxx> +#include <toolkit/helper/externallock.hxx> namespace vcl { class Window; } @@ -48,7 +49,8 @@ namespace toolkit is being disposed.</p> */ class OAccessibleControlContext - :public ::comphelper::OAccessibleImplementationAccess + :private BaseVCLExternalSolarLock + ,public ::comphelper::OAccessibleImplementationAccess ,public OAccessibleControlContext_Base ,public OAccessibleControlContext_IBase { |