From 6b6a3547990eede6a2213b5a82bedd88a919563f Mon Sep 17 00:00:00 2001
From: Jim Raykowski <raykowj@gmail.com>
Date: Sun, 25 Feb 2018 09:13:41 -0900
Subject: tdf#115329 Fix Navigate By Table after Navigate By Drawing or Control

Change-Id: I2068d5d9c0ccebc83834d4db5a40225c972829ff
Reviewed-on: https://gerrit.libreoffice.org/50315
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
---
 sw/source/uibase/uiview/viewmdi.cxx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'sw')

diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx
index 22c9cda6af0d..1abdd08429ad 100644
--- a/sw/source/uibase/uiview/viewmdi.cxx
+++ b/sw/source/uibase/uiview/viewmdi.cxx
@@ -349,10 +349,17 @@ IMPL_LINK( SwView, MoveNavigationHdl, void*, p, void )
         break;
         case NID_DRW :
         case NID_CTRL:
-            rSh.GotoObj(bNext,
+        {
+            bool bSuccess = rSh.GotoObj(bNext,
                     m_nMoveType == NID_DRW ?
                         GotoObjFlags::DrawSimple :
                         GotoObjFlags::DrawControl);
+            if(bSuccess)
+            {
+                rSh.HideCursor();
+                rSh.EnterSelFrameMode();
+            }
+        }
         break;
         case NID_REG :
             rSh.EnterStdMode();
-- 
cgit