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

[Caolán McNamara]

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

New commits:
commit 7847365292bf0c5e35cf94835b46e414dbe4692e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jun 23 11:52:07 2015 +0100

    fix a11y crash seen in save-as-template
    
    Change-Id: Ib00273452a67bd535e2f879d9801ae611e42cc7e
    (cherry picked from commit 42713c52c6e145362e0d1409d2db1bb1f048b1c3)
    (cherry picked from commit fc61dbd5fa32307081a26a1223ca3db65892bf44)
    Reviewed-on: https://gerrit.libreoffice.org/16427
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
index 268a6f3..ee4e1c4 100644
--- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx
+++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
@@ -377,10 +377,9 @@ Reference< XAccessible > VCLXAccessibleTabControl::getAccessibleChild( sal_Int32
     Reference< XAccessible > xChild = m_aAccessibleChildren[i];
     if ( !xChild.is() )
     {
-        if ( m_pTabControl )
+        sal_uInt16 nPageId = m_pTabControl ? m_pTabControl->GetPageId((sal_uInt16)i) : 0;
+        if (nPageId)
         {
-            sal_uInt16 nPageId = m_pTabControl->GetPageId( (sal_uInt16)i );
-
             xChild = new VCLXAccessibleTabPage( m_pTabControl, nPageId );
 
             // insert into tab page list