From 215e5adf4977a175bb8cc89dcbd48ef443ac8f10 Mon Sep 17 00:00:00 2001 From: Jim Raykowski <raykowj@gmail.com> Date: Sun, 13 May 2018 08:30:15 -0800 Subject: tdf#117553 Change navigate behavior when in footnote frame This patch changes navigate behavior to move to prev/next footnote text when in footnote frame. Change-Id: If206098d8817b74ab484a1039371c058d321fda2 Reviewed-on: https://gerrit.libreoffice.org/54195 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> --- sw/source/uibase/uiview/viewmdi.cxx | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'sw/source/uibase') diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx index 5038bae46bf8..7bd549d0f7d2 100644 --- a/sw/source/uibase/uiview/viewmdi.cxx +++ b/sw/source/uibase/uiview/viewmdi.cxx @@ -391,10 +391,26 @@ IMPL_LINK( SwView, MoveNavigationHdl, void*, p, void ) bNext ? rSh.GoNextCursor() : rSh.GoPrevCursor(); break; case NID_FTN: + { + bool bFrameTypeFootnote(rSh.GetFrameType(nullptr, false) & FrameTypeFlags::FOOTNOTE); + + if (bFrameTypeFootnote) + { + rSh.LockView(true); + rSh.GotoFootnoteAnchor(); + } + rSh.EnterStdMode(); bNext ? rSh.GotoNextFootnoteAnchor() : rSh.GotoPrevFootnoteAnchor(); + + if (bFrameTypeFootnote) + { + rSh.LockView(false); + rSh.GotoFootnoteText(); + } + } break; case NID_MARK: { -- cgit