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>

4 files changed, 2 insertions, 12 deletions

diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
index 83b25d5cfa9c..c56bb1c70ab0 100644
--- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx
+++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
@@ -55,8 +55,6 @@ AccessibleDialogControlShape::AccessibleDialogControlShape (DialogWindow* pDialo
     ,m_pDialogWindow( pDialogWindow )
     ,m_pDlgEdObj( pDlgEdObj )
 {
-    m_pExternalLock = static_cast< VCLExternalSolarLock* >( getExternalLock() );
-
     if ( m_pDlgEdObj )
         m_xControlModel.set( m_pDlgEdObj->GetUnoControlModel(), UNO_QUERY );
 
@@ -74,8 +72,7 @@ AccessibleDialogControlShape::~AccessibleDialogControlShape()
     if ( m_xControlModel.is() )
         m_xControlModel->removePropertyChangeListener( OUString(), static_cast< beans::XPropertyChangeListener* >( this ) );
 
-    delete m_pExternalLock;
-    m_pExternalLock = nullptr;
+    delete getExternalLock();
 }
 
 
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx
index f04094088e73..b44509e0c1c2 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -105,8 +105,6 @@ AccessibleDialogWindow::AccessibleDialogWindow (basctl::DialogWindow* pDialogWin
     , m_pDlgEditor(nullptr)
     , m_pDlgEdModel(nullptr)
 {
-    m_pExternalLock = static_cast< VCLExternalSolarLock* >( getExternalLock() );
-
     if ( m_pDialogWindow )
     {
         SdrPage& rPage = m_pDialogWindow->GetPage();
@@ -143,8 +141,7 @@ AccessibleDialogWindow::~AccessibleDialogWindow()
     if ( m_pDlgEdModel )
         EndListening( *m_pDlgEdModel );
 
-    delete m_pExternalLock;
-    m_pExternalLock = nullptr;
+    delete getExternalLock();
 }
 
 
diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx b/basctl/source/inc/accessibledialogcontrolshape.hxx
index b370e85b6c2d..4830032599d3 100644
--- a/basctl/source/inc/accessibledialogcontrolshape.hxx
+++ b/basctl/source/inc/accessibledialogcontrolshape.hxx
@@ -27,7 +27,6 @@
 #include <vcl/vclptr.hxx>
 
 namespace vcl { class Window; }
-class VCLExternalSolarLock;
 
 namespace utl {
     class AccessibleStateSetHelper;
@@ -53,7 +52,6 @@ class AccessibleDialogControlShape :    public comphelper::OAccessibleExtendedCo
     friend class AccessibleDialogWindow;
 
 private:
-    VCLExternalSolarLock*   m_pExternalLock;
     VclPtr<DialogWindow>    m_pDialogWindow;
     DlgEdObj*               m_pDlgEdObj;
     bool                    m_bFocused;
diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx
index 57c16698699e..badcabda17d3 100644
--- a/basctl/source/inc/accessibledialogwindow.hxx
+++ b/basctl/source/inc/accessibledialogwindow.hxx
@@ -28,7 +28,6 @@
 #include <tools/link.hxx>
 #include <vcl/vclptr.hxx>
 
-class VCLExternalSolarLock;
 class VclSimpleEvent;
 class VclWindowEvent;
 
@@ -77,7 +76,6 @@ private:
     typedef std::vector< ChildDescriptor > AccessibleChildren;
 
     AccessibleChildren             m_aAccessibleChildren;
-    VCLExternalSolarLock*          m_pExternalLock;
     VclPtr<basctl::DialogWindow>   m_pDialogWindow;
     DlgEditor*                     m_pDlgEditor;
     DlgEdModel*                    m_pDlgEdModel;