summaryrefslogtreecommitdiff
path: root/sw/source/uibase/uiview
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 /sw/source/uibase/uiview
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 'sw/source/uibase/uiview')
-rw-r--r--sw/source/uibase/uiview/viewsrch.cxx11
1 files changed, 6 insertions, 5 deletions
diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx
index 9db45fe9d4ba..9bc9944ca36c 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -236,7 +236,8 @@ void SwView::ExecSearch(SfxRequest& rReq)
s_pSrchItem = static_cast<SvxSearchItem*>( pArgs->Get(SID_SEARCH_ITEM).Clone() );
}
}
- switch (s_pSrchItem->GetCommand())
+ SvxSearchCmd eCommand = s_pSrchItem->GetCommand();
+ switch (eCommand)
{
case SvxSearchCmd::FIND:
{
@@ -253,7 +254,7 @@ void SwView::ExecSearch(SfxRequest& rReq)
pSrchDlg = GetSearchDialog();
if (pSrchDlg)
{
- pSrchDlg->SetDocWin(m_pEditWin);
+ pSrchDlg->SetDocWin(m_pEditWin, eCommand);
pSrchDlg->SetSrchFlag(false);
}
}
@@ -286,7 +287,7 @@ void SwView::ExecSearch(SfxRequest& rReq)
pSrchDlg = GetSearchDialog();
if (pSrchDlg)
{
- pSrchDlg->SetDocWin(m_pEditWin);
+ pSrchDlg->SetDocWin(m_pEditWin, eCommand);
pSrchDlg->SetSrchFlag(false);
}
}
@@ -344,7 +345,7 @@ void SwView::ExecSearch(SfxRequest& rReq)
pSrchDlg = GetSearchDialog();
if (pSrchDlg)
{
- pSrchDlg->SetDocWin(m_pEditWin);
+ pSrchDlg->SetDocWin(m_pEditWin, eCommand);
pSrchDlg->SetSrchFlag(false);
}
}
@@ -412,7 +413,7 @@ void SwView::ExecSearch(SfxRequest& rReq)
pSrchDlg = GetSearchDialog();
if (pSrchDlg)
{
- pSrchDlg->SetDocWin(m_pEditWin);
+ pSrchDlg->SetDocWin(m_pEditWin, eCommand);
pSrchDlg->SetSrchFlag(false);
}
#endif