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

[Julien Nabet]

 accessibility/source/extended/AccessibleGridControl.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c6f2be29a856044a98615c3209c247de586757f9
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Mon Dec 19 22:33:12 2016 +0100

    tdf#104767: Fix calculus of child index in commitTableEvent (accessibility)
    
    bt:
    1  0x00002aaade2fea5b in accessibility::AccessibleGridControlTableBase::ensureIsValidIndex (this=0x5555586abdb0, nChildIndex=11)
        at /home/julien/lo/libreoffice/accessibility/source/extended/AccessibleGridControlTableBase.cxx:257
    2  0x00002aaade2f97f2 in accessibility::AccessibleGridControlTable::getAccessibleChild (this=0x5555586abdb0, nChildIndex=11)
        at /home/julien/lo/libreoffice/accessibility/source/extended/AccessibleGridControlTable.cxx:60
    3  0x00002aaade2ee054 in accessibility::AccessibleGridControl::commitTableEvent (this=0x555557e97500, _nEventId=5, _rNewValue=uno::Any(void), _rOldValue=uno::Any(void))
        at /home/julien/lo/libreoffice/accessibility/source/extended/AccessibleGridControl.cxx:354
    
    Seems a regression from https://cgit.freedesktop.org/libreoffice/core/commit/?id=0f32ba56a1e775e8ecd6c827ebd48f7f2fb51c81
    
    Change-Id: Ia973eb381832da27ecc39fc5273f67a685d5a7bb
    Reviewed-on: https://gerrit.libreoffice.org/32205
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit 4e1c423358f60f7516a1682c97837edd21addcf3)
    Reviewed-on: https://gerrit.libreoffice.org/32209
    (cherry picked from commit 899ea62194d59a69e04823962a3170f762a02e9b)
    Reviewed-on: https://gerrit.libreoffice.org/32210
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx
index 5ba4001..cdfd606 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -351,7 +351,7 @@ void AccessibleGridControl::commitTableEvent(sal_Int16 _nEventId,const Any& _rNe
             if (nCurrentRow > -1 && nCurrentCol > -1)
             {
                 sal_Int32 nColumnCount = m_aTable.GetColumnCount();
-                xChild = m_xImpl->m_pTable->getAccessibleChild(nCurrentRow * nCurrentCol + nColumnCount);
+                xChild = m_xImpl->m_pTable->getAccessibleChild(nCurrentRow * nColumnCount + nCurrentCol);
             }
             m_xImpl->m_pTable->commitEvent(_nEventId, makeAny(xChild),_rOldValue);
         }