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

[Jim Raykowski]

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

New commits:
commit c25b63b430595e6470284644bf2f2197b3e8eed7
Author: Jim Raykowski <raykowj at gmail.com>
Date:   Sat Jun 2 19:37:29 2018 -0800

    tdf#115600 Display messages in FindBar for Reminder navigation
    
    Change-Id: I32882ef35c84e753b2e008d7f46915d73f3fe5df
    Reviewed-on: https://gerrit.libreoffice.org/55240
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx
index b4124d268c5f..2944568079a1 100644
--- a/sw/source/uibase/uiview/viewmdi.cxx
+++ b/sw/source/uibase/uiview/viewmdi.cxx
@@ -51,6 +51,8 @@
 #include <PostItMgr.hxx>
 #include <AnnotationWin.hxx>
 
+#include <svx/srchdlg.hxx>
+
 sal_uInt16  SwView::m_nMoveType = NID_PGE;
 sal_Int32 SwView::m_nActMark = 0;
 
@@ -414,20 +416,30 @@ IMPL_LINK( SwView, MoveNavigationHdl, void*, p, void )
             // move
             if(!vNavMarks.empty())
             {
+                SvxSearchDialogWrapper::SetSearchLabel( SearchLabel::Empty );
+
                 if(bNext)
                 {
                     m_nActMark++;
                     if (m_nActMark >= MAX_MARKS || m_nActMark >= static_cast<sal_Int32>(vNavMarks.size()))
+                    {
                         m_nActMark = 0;
+                        SvxSearchDialogWrapper::SetSearchLabel( SearchLabel::EndWrapped );
+                    }
                 }
                 else
                 {
                     m_nActMark--;
                     if (m_nActMark < 0 || m_nActMark >= static_cast<sal_Int32>(vNavMarks.size()))
+                    {
                         m_nActMark = vNavMarks.size()-1;
+                        SvxSearchDialogWrapper::SetSearchLabel( SearchLabel::StartWrapped );
+                    }
                 }
                 rSh.GotoMark(vNavMarks[m_nActMark]);
             }
+            else
+                SvxSearchDialogWrapper::SetSearchLabel( SearchLabel::NavElementNotFound );
         }
         break;