[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - accessibility/source

[Caolán McNamara]

 accessibility/source/standard/vclxaccessibletabcontrol.cxx |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit ef191c51ee9912ebc0ef3c59f6d9a86ff09723b1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jan 12 14:03:43 2017 +0000

    a11y crash on accessing disposed TabControl during close of impress
    
    Change-Id: I3064eb136ed3a6a32acd64bfb2f6fbe31595e1cf
    (cherry picked from commit ff30d20c1ae3a30717123c267d52eb2b3105a1b7)
    Reviewed-on: https://gerrit.libreoffice.org/33007
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
index e9ee495..f086077 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 >() );
 }