From c6f2be29a856044a98615c3209c247de586757f9 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Mon, 19 Dec 2016 22:33:12 +0100 Subject: tdf#104767: Fix calculus of child index in commitTableEvent (accessibility) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Tested-by: Julien Nabet (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 Reviewed-by: Tamás Zolnai --- accessibility/source/extended/AccessibleGridControl.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'accessibility') diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx index 5ba4001ead37..cdfd606077d8 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); } -- cgit