[Libreoffice-commits] core.git: sw/source

[Jim Raykowski]

 sw/source/uibase/uiview/viewsrch.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit eb975197b62204062393979e33438a3a4e2d27c1
Author: Jim Raykowski <raykowj at gmail.com>
Date:   Mon Feb 12 23:43:00 2018 -0900

    tdf#115620 Prevent "Find Text" changing "Navigate By"
    
    Change-Id: I46ab436e98f0d24e51277f22b2a707dfd5e2937c
    Reviewed-on: https://gerrit.libreoffice.org/49690
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx
index f377f35acdfe..d2932070dc89 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: