a11y crash on accessing disposed TabControl during close of impress

Change-Id: I3064eb136ed3a6a32acd64bfb2f6fbe31595e1cf

1 files changed, 8 insertions, 3 deletions

diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
index 637e0b656e97..17762a1a1472 100644
--- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx
+++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
@@ -43,9 +43,14 @@ VCLXAccessibleTabControl::VCLXAccessibleTabControl( VCLXWindow* pVCLXWindow )
     :VCLXAccessibleComponent( pVCLXWindow )
 {
     m_pTabControl = static_cast< TabControl* >( GetWindow().get() );
-
-    if ( m_pTabControl )
-        m_aAccessibleChildren.assign( m_pTabControl->GetPageCount(), Reference< XAccessible >() );
+    if (!m_pTabControl)
+        return;
+    if (m_pTabControl->isDisposed())
+    {
+        m_pTabControl.clear();
+        return;
+    }
+    m_aAccessibleChildren.assign( m_pTabControl->GetPageCount(), Reference< XAccessible >() );
 }