From 12eb32fccec16a436a6c3eca725b9d6d449f8e19 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 23 Oct 2019 15:30:51 +0100 Subject: Resolves: tdf#128313 disambiguate flow-to search results MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Tested-by: Caolán McNamara --- sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 2 +- sd/source/ui/view/Outliner.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index 800cad560d3c..04da532ca255 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -784,7 +784,7 @@ css::uno::Sequence< css::uno::Any > goto Rt; } } - else if (nType == AccessibilityFlowTo::FORFINDREPLACEFLOWTO) + else if (nType == AccessibilityFlowTo::FORFINDREPLACEFLOWTO_ITEM || nType == AccessibilityFlowTo::FORFINDREPLACEFLOWTO_RANGE) { sal_Int32 nChildCount = getSelectedAccessibleChildCount(); if ( nChildCount ) diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 56e0a89a9c6d..7fab5d32c3ba 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -491,7 +491,7 @@ bool SdOutliner::StartSearchAndReplace (const SvxSearchItem* pSearchItem) { SvxSearchDialog* pSearchDlg = static_cast(pChildWin->GetController().get()); - pSearchDlg->SetDocWin( pViewShell->GetActiveWindow() ); + pSearchDlg->SetDocWin( pViewShell->GetActiveWindow(), nCommand ); pSearchDlg->SetSrchFlag(false); } } -- cgit