summaryrefslogtreecommitdiff
path: root/sc/source/ui/Accessibility
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-10-23 15:30:51 +0100
committerCaolán McNamara <caolanm@redhat.com>2019-10-23 21:51:39 +0200
commit12eb32fccec16a436a6c3eca725b9d6d449f8e19 (patch)
treef57507d003ef927e311bc877569839afd68943ae /sc/source/ui/Accessibility
parent00d06dee4b77cf52c927bd2c8687bb1a8d6c7904 (diff)
Resolves: tdf#128313 disambiguate flow-to search results
for a11y between find/replace where our result is a single thing, and find-all/replace-all where the result is potentially many things, which allows that searching in a selected calc column will flow-to the current cell, not the entire ~infinite set of cells in the column Change-Id: Ib3e56fceb90d869f157427f090cdffe986a5a588 Reviewed-on: https://gerrit.libreoffice.org/81396 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/ui/Accessibility')
-rw-r--r--sc/source/ui/Accessibility/AccessibleDocument.cxx14
1 files changed, 9 insertions, 5 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 5ad1c1d41a31..d4ffbbaac88b 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -2352,18 +2352,22 @@ css::uno::Sequence< css::uno::Any >
}
}
}
- else if (nType == AccessibilityFlowTo::FORFINDREPLACEFLOWTO)
+ else if (nType == AccessibilityFlowTo::FORFINDREPLACEFLOWTO_ITEM || nType == AccessibilityFlowTo::FORFINDREPLACEFLOWTO_RANGE)
{
bool bSuccess(false);
rAny >>= bSuccess;
if ( bSuccess )
{
- uno::Sequence< uno::Any> aSeq = GetScAccFlowToSequence();
- if ( aSeq.hasElements() )
+ if (nType == AccessibilityFlowTo::FORFINDREPLACEFLOWTO_RANGE)
{
- return aSeq;
+ uno::Sequence< uno::Any> aSeq = GetScAccFlowToSequence();
+ if ( aSeq.hasElements() )
+ {
+ return aSeq;
+ }
}
- else if( mpAccessibleSpreadsheet.is() )
+
+ if( mpAccessibleSpreadsheet.is() )
{
uno::Reference < XAccessible > xFindCellAcc = mpAccessibleSpreadsheet->GetActiveCell();
// add xFindCellAcc to the return the Sequence