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 /basctl | |
| 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 'basctl')
4 files changed, 4 insertions, 10 deletions
diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx index 9a69d2d7ff2d..5502cde6d32b 100644 --- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx +++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx @@ -50,8 +50,7 @@ using namespace ::comphelper; AccessibleDialogControlShape::AccessibleDialogControlShape (DialogWindow* pDialogWindow, DlgEdObj* pDlgEdObj) - :OAccessibleExtendedComponentHelper( &m_aLock ) - ,m_pDialogWindow( pDialogWindow ) + :m_pDialogWindow( pDialogWindow ) ,m_pDlgEdObj( pDlgEdObj ) { if ( m_pDlgEdObj ) diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx index 1cedd99d61b8..6d306466052c 100644 --- a/basctl/source/accessibility/accessibledialogwindow.cxx +++ b/basctl/source/accessibility/accessibledialogwindow.cxx @@ -99,8 +99,7 @@ bool AccessibleDialogWindow::ChildDescriptor::operator<( const ChildDescriptor& AccessibleDialogWindow::AccessibleDialogWindow (basctl::DialogWindow* pDialogWindow) - : OAccessibleExtendedComponentHelper( &m_aLock) - , m_pDialogWindow(pDialogWindow) + : m_pDialogWindow(pDialogWindow) , m_pDlgEditor(nullptr) , m_pDlgEdModel(nullptr) { diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx b/basctl/source/inc/accessibledialogcontrolshape.hxx index aba1a83ec32c..4830032599d3 100644 --- a/basctl/source/inc/accessibledialogcontrolshape.hxx +++ b/basctl/source/inc/accessibledialogcontrolshape.hxx @@ -25,7 +25,6 @@ #include <comphelper/accessiblecomponenthelper.hxx> #include <cppuhelper/implbase3.hxx> #include <vcl/vclptr.hxx> -#include <toolkit/helper/externallock.hxx> namespace vcl { class Window; } @@ -47,8 +46,7 @@ typedef ::cppu::ImplHelper3< css::lang::XServiceInfo, css::beans::XPropertyChangeListener > AccessibleDialogControlShape_BASE; -class AccessibleDialogControlShape : private BaseVCLExternalSolarLock, - public comphelper::OAccessibleExtendedComponentHelper, +class AccessibleDialogControlShape : public comphelper::OAccessibleExtendedComponentHelper, public AccessibleDialogControlShape_BASE { friend class AccessibleDialogWindow; diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx index 2524e42deeee..badcabda17d3 100644 --- a/basctl/source/inc/accessibledialogwindow.hxx +++ b/basctl/source/inc/accessibledialogwindow.hxx @@ -27,7 +27,6 @@ #include <svl/lstner.hxx> #include <tools/link.hxx> #include <vcl/vclptr.hxx> -#include <toolkit/helper/externallock.hxx> class VclSimpleEvent; class VclWindowEvent; @@ -52,8 +51,7 @@ typedef ::cppu::ImplHelper3 < css::accessibility::XAccessibleSelection, css::lang::XServiceInfo > AccessibleDialogWindow_BASE; -class AccessibleDialogWindow : private BaseVCLExternalSolarLock, - public comphelper::OAccessibleExtendedComponentHelper, +class AccessibleDialogWindow : public comphelper::OAccessibleExtendedComponentHelper, public AccessibleDialogWindow_BASE, public SfxListener { |