summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Raykowski <raykowj@gmail.com>2018-06-02 19:37:29 -0800
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2018-06-05 20:51:09 +0200
commitc25b63b430595e6470284644bf2f2197b3e8eed7 (patch)
treea29be681522cb3429ee77c93462b8edcfebbdbcf
parent70537c8295f1b0a0c58b061dfca6cbc9def0d65b (diff)
tdf#115600 Display messages in FindBar for Reminder navigation
Change-Id: I32882ef35c84e753b2e008d7f46915d73f3fe5df Reviewed-on: https://gerrit.libreoffice.org/55240 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
-rw-r--r--sw/source/uibase/uiview/viewmdi.cxx12
1 files changed, 12 insertions, 0 deletions
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;