diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-05-23 13:39:02 +0200 |
|---|---|---|
| committer | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-05-23 18:16:48 +0200 |
| commit | 2e5db24f63edbfced178dc7ff274e9eeeea9de68 (patch) | |
| tree | f96f6bcf6a727ddc9102da4262d5e2d264673e8d /toolkit | |
| parent | 6a91ea82502c0b9e6632d625962bf9da006c4a2f (diff) | |
remove VCLExternalSolarLock* members from ..
.. classes with OAccessibleContextHelper base.
Change-Id: I3187e88bf485e78fb78550870a87db29d958dbc0
Reviewed-on: https://gerrit.libreoffice.org/37948
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/awt/vclxaccessiblecomponent.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx index ba5c170faa0d..524652c36737 100644 --- a/toolkit/source/awt/vclxaccessiblecomponent.cxx +++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx @@ -49,8 +49,6 @@ VCLXAccessibleComponent::VCLXAccessibleComponent( VCLXWindow* pVCLXWindow ) { m_xVCLXWindow = pVCLXWindow; - m_pSolarLock = static_cast< VCLExternalSolarLock* >( getExternalLock( ) ); - DBG_ASSERT( pVCLXWindow->GetWindow(), "VCLXAccessibleComponent - no window!" ); m_xEventSource = pVCLXWindow->GetWindow(); if ( m_xEventSource ) @@ -83,8 +81,7 @@ VCLXAccessibleComponent::~VCLXAccessibleComponent() ensureDisposed(); DisconnectEvents(); - delete m_pSolarLock; - m_pSolarLock = nullptr; + delete getExternalLock(); // This is not completely safe. If we assume that the base class dtor calls some method which // uses this lock, the we crash. However, as the base class' dtor does not have a chance to call _out_ // virtual methods, this is no problem as long as the base class is safe, i.e. does not use the external |