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 /svtools | |
| 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 'svtools')
| -rw-r--r-- | svtools/inc/vclxaccessibleheaderbaritem.hxx | 7 | ||||
| -rw-r--r-- | svtools/source/control/vclxaccessibleheaderbaritem.cxx | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/svtools/inc/vclxaccessibleheaderbaritem.hxx b/svtools/inc/vclxaccessibleheaderbaritem.hxx index ac3c30cea15e..03701de59c8e 100644 --- a/svtools/inc/vclxaccessibleheaderbaritem.hxx +++ b/svtools/inc/vclxaccessibleheaderbaritem.hxx @@ -26,8 +26,6 @@ #include <tools/link.hxx> -#include <toolkit/helper/externallock.hxx> - #include <vcl/vclptr.hxx> #include <vector> @@ -49,9 +47,8 @@ typedef ::cppu::ImplHelper2< css::accessibility::XAccessible, css::lang::XServiceInfo > VCLXAccessibleHeaderBarItem_BASE; -class VCLXAccessibleHeaderBarItem : private BaseVCLExternalSolarLock, - public comphelper::OAccessibleExtendedComponentHelper, - public VCLXAccessibleHeaderBarItem_BASE +class VCLXAccessibleHeaderBarItem : public comphelper::OAccessibleExtendedComponentHelper, + public VCLXAccessibleHeaderBarItem_BASE { private: VclPtr<HeaderBar> m_pHeadBar; diff --git a/svtools/source/control/vclxaccessibleheaderbaritem.cxx b/svtools/source/control/vclxaccessibleheaderbaritem.cxx index 2d6c7fa9feb8..2e7bad01f9e8 100644 --- a/svtools/source/control/vclxaccessibleheaderbaritem.cxx +++ b/svtools/source/control/vclxaccessibleheaderbaritem.cxx @@ -31,7 +31,6 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <toolkit/awt/vclxfont.hxx> -#include <toolkit/helper/externallock.hxx> #include <toolkit/helper/convert.hxx> #include <vector> @@ -47,8 +46,7 @@ using namespace ::comphelper; VCLXAccessibleHeaderBarItem::VCLXAccessibleHeaderBarItem( HeaderBar* pHeadBar, sal_Int32 _nIndexInParent ) - :OAccessibleExtendedComponentHelper( &m_aLock ) - ,m_pHeadBar( pHeadBar ) + :m_pHeadBar( pHeadBar ) ,m_nIndexInParent(_nIndexInParent + 1) { |