sc/source/ui/Accessibility/AccessibleDocument.cxx | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
New commits:
commit 0f37cc57228e4f0fc6355776e77bbc959d3b3e86
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Sep 16 12:17:16 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Sep 16 14:42:17 2019 +0200
tdf#127561 avoid shapes with currently invalid positions
where getAccessibleCellAt would throw and just ignore
the shape, seems to be a temporary problem and the correct
position becomes known later.
Change-Id: I736be9675a03e0a1cb98ceb29caf2d7869c84535
Reviewed-on: https://gerrit.libreoffice.org/78981
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx
b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 489ee8a69434..76e7f21f25ca 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -1136,9 +1136,15 @@ uno::Reference<XAccessibleRelationSet>
ScChildrenShapes::GetRelationSet(const Sc
uno::Reference<XAccessible> xAccessible =
mpAccessibleDocument->GetAccessibleSpreadsheet(); // should be the current table
if (pData->xRelationCell && xAccessible.is())
{
- uno::Reference<XAccessibleTable> xAccTable
(xAccessible->getAccessibleContext(), uno::UNO_QUERY);
- if (xAccTable.is())
- xAccessible =
xAccTable->getAccessibleCellAt(pData->xRelationCell->Row(),
pData->xRelationCell->Col());
+ sal_Int32 nRow = pData->xRelationCell->Row();
+ sal_Int32 nColumn = pData->xRelationCell->Col();
+ bool bPositionUnset = nRow == -1 && nColumn == -1;
+ if (!bPositionUnset)
+ {
+ uno::Reference<XAccessibleTable>
xAccTable(xAccessible->getAccessibleContext(), uno::UNO_QUERY);
+ if (xAccTable.is())
+ xAccessible = xAccTable->getAccessibleCellAt(nRow,
nColumn);
+ }
}
AccessibleRelation aRelation;
aRelation.TargetSet.realloc(1);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
