[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sw/source

[Libreoffice Gerrit user]

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

New commits:
commit bb43add6896e9689c08c191f6ab6d87c420b0584
Author:     Jim Raykowski <raykowj at gmail.com>
AuthorDate: Sun May 13 08:30:15 2018 -0800
Commit:     Miklos Vajna <vmiklos at collabora.co.uk>
CommitDate: Wed Aug 8 11:07:56 2018 +0200

    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 at collabora.co.uk>
    Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit 215e5adf4977a175bb8cc89dcbd48ef443ac8f10)
    Reviewed-on: https://gerrit.libreoffice.org/58304
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

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:
         {