commit 7847365292bf0c5e35cf94835b46e414dbe4692e
author Caolán McNamara <caolanm@redhat.com> Tue Jun 23 11:52:07 2015 +0100
committer Michael Stahl <mstahl@redhat.com> Thu Jun 25 10:03:57 2015 +0000
tree 533eea2921b33694ba118c5153686a27afe72c28
parent 24bc22fcb0550c3ebf74db3642ab32b8e818205c

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@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

accessibility/source/standard/vclxaccessibletabcontrol.cxx

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