summaryrefslogtreecommitdiff
path: root/sd
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 /sd
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 'sd')
-rw-r--r--sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx2
-rw-r--r--sd/source/ui/view/Outliner.cxx2
2 files changed, 2 insertions, 2 deletions
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<SvxSearchDialog*>(pChildWin->GetController().get());
- pSearchDlg->SetDocWin( pViewShell->GetActiveWindow() );
+ pSearchDlg->SetDocWin( pViewShell->GetActiveWindow(), nCommand );
pSearchDlg->SetSrchFlag(false);
}
}