summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Raykowski <raykowj@gmail.com>2018-05-13 08:30:15 -0800
committerMiklos Vajna <vmiklos@collabora.co.uk>2018-08-08 11:07:56 +0200
commitbb43add6896e9689c08c191f6ab6d87c420b0584 (patch)
tree5b9954e79dc3d61799a7cb7984af2db7079c4f80
parent3c20597ada7f74a4a96dec841264593fdbf0bcd5 (diff)
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> (cherry picked from commit 215e5adf4977a175bb8cc89dcbd48ef443ac8f10) Reviewed-on: https://gerrit.libreoffice.org/58304 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r--sw/source/uibase/uiview/viewmdi.cxx16
1 files changed, 16 insertions, 0 deletions
diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx
index 08af720f9e4a..bc76c064adeb 100644
--- a/sw/source/uibase/uiview/viewmdi.cxx
+++ b/sw/source/uibase/uiview/viewmdi.cxx
@@ -389,10 +389,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:
{