diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-10-23 14:58:43 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2019-10-24 14:15:53 +0200 |
| commit | 66397e67829f2f502b9b6799dab16fa9a5390020 (patch) | |
| tree | c7edcce0d5372a7ebed71c538bfb2d713c7bdabd /sd | |
| parent | ca477f5e0e3b8cd28f6beaf96a20e70064d73ea3 (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
plus commit...
put together the 'magic' flow-to constants
as a side note, there's no actual use of FORSPELLCHECKFLOWTO anywhere
that I can see
Change-Id: Ib3e56fceb90d869f157427f090cdffe986a5a588
Reviewed-on: https://gerrit.libreoffice.org/81397
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 7 | ||||
| -rw-r--r-- | sd/source/ui/view/Outliner.cxx | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index a9d7ca12e4fd..e178d93e7baf 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <cppuhelper/queryinterface.hxx> +#include <comphelper/accflowenum.hxx> #include <comphelper/processfactory.hxx> #include <sal/log.hxx> #include <tools/debug.hxx> @@ -743,9 +744,7 @@ css::uno::Sequence< css::uno::Any > { SolarMutexGuard g; - const sal_Int32 SPELLCHECKFLOWTO = 1; - const sal_Int32 FINDREPLACEFLOWTO = 2; - if ( nType == SPELLCHECKFLOWTO ) + if (nType == AccessibilityFlowTo::FORSPELLCHECKFLOWTO) { uno::Reference< css::drawing::XShape > xShape; rAny >>= xShape; @@ -787,7 +786,7 @@ css::uno::Sequence< css::uno::Any > goto Rt; } } - else if ( nType == FINDREPLACEFLOWTO ) + 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 a91d5f70d5d4..f2094296fa0f 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -509,7 +509,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); } } |