summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Raykowski <raykowj@gmail.com>2018-02-12 23:43:00 -0900
committerKatarina Behrens <Katarina.Behrens@cib.de>2018-02-14 10:28:20 +0100
commit106f66e921da871c26ce6b642f9f67024417b93d (patch)
tree1d392ee19abac04b1dba45414aac032846397b41
parente0d32e7fc9abd0c5718398f6ed80a75c392e746a (diff)
tdf#115620 Prevent "Find Text" changing "Navigate By"
Change-Id: I46ab436e98f0d24e51277f22b2a707dfd5e2937c Reviewed-on: https://gerrit.libreoffice.org/49690 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit eb975197b62204062393979e33438a3a4e2d27c1) Reviewed-on: https://gerrit.libreoffice.org/49696 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
-rw-r--r--sw/source/uibase/uiview/viewsrch.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx
index e6fc466dfc9a..463bd92054df 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -198,6 +198,7 @@ void SwView::ExecSearch(SfxRequest& rReq)
case FN_REPEAT_SEARCH:
case FID_SEARCH_NOW:
{
+ sal_uInt16 nMoveType = SwView::GetMoveType();
{
if(FID_SEARCH_NOW == nSlot && !rReq.IsAPI())
SwView::SetMoveType(NID_SRCH_REP);
@@ -396,6 +397,7 @@ void SwView::ExecSearch(SfxRequest& rReq)
}
#endif
m_bFound = false;
+ SwView::SetMoveType(nMoveType);
return;
}
@@ -425,6 +427,7 @@ void SwView::ExecSearch(SfxRequest& rReq)
rReq.Done();
m_eLastSearchCommand = m_pSrchItem->GetCommand();
+ SwView::SetMoveType(nMoveType);
}
break;
case FID_SEARCH_SEARCHSET: