Kaydet (Commit) c25b63b4 authored tarafından Jim Raykowski's avatar Jim Raykowski Kaydeden (comit) Thorsten Behrens

tdf#115600 Display messages in FindBar for Reminder navigation

Change-Id: I32882ef35c84e753b2e008d7f46915d73f3fe5df
Reviewed-on: https://gerrit.libreoffice.org/55240Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarThorsten Behrens <Thorsten.Behrens@CIB.de>
üst 70537c82
...@@ -51,6 +51,8 @@ ...@@ -51,6 +51,8 @@
#include <PostItMgr.hxx> #include <PostItMgr.hxx>
#include <AnnotationWin.hxx> #include <AnnotationWin.hxx>
#include <svx/srchdlg.hxx>
sal_uInt16 SwView::m_nMoveType = NID_PGE; sal_uInt16 SwView::m_nMoveType = NID_PGE;
sal_Int32 SwView::m_nActMark = 0; sal_Int32 SwView::m_nActMark = 0;
...@@ -414,20 +416,30 @@ IMPL_LINK( SwView, MoveNavigationHdl, void*, p, void ) ...@@ -414,20 +416,30 @@ IMPL_LINK( SwView, MoveNavigationHdl, void*, p, void )
// move // move
if(!vNavMarks.empty()) if(!vNavMarks.empty())
{ {
SvxSearchDialogWrapper::SetSearchLabel( SearchLabel::Empty );
if(bNext) if(bNext)
{ {
m_nActMark++; m_nActMark++;
if (m_nActMark >= MAX_MARKS || m_nActMark >= static_cast<sal_Int32>(vNavMarks.size())) if (m_nActMark >= MAX_MARKS || m_nActMark >= static_cast<sal_Int32>(vNavMarks.size()))
{
m_nActMark = 0; m_nActMark = 0;
SvxSearchDialogWrapper::SetSearchLabel( SearchLabel::EndWrapped );
}
} }
else else
{ {
m_nActMark--; m_nActMark--;
if (m_nActMark < 0 || m_nActMark >= static_cast<sal_Int32>(vNavMarks.size())) if (m_nActMark < 0 || m_nActMark >= static_cast<sal_Int32>(vNavMarks.size()))
{
m_nActMark = vNavMarks.size()-1; m_nActMark = vNavMarks.size()-1;
SvxSearchDialogWrapper::SetSearchLabel( SearchLabel::StartWrapped );
}
} }
rSh.GotoMark(vNavMarks[m_nActMark]); rSh.GotoMark(vNavMarks[m_nActMark]);
} }
else
SvxSearchDialogWrapper::SetSearchLabel( SearchLabel::NavElementNotFound );
} }
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment