[Libreoffice-commits] core.git: sw/source

[Jim Raykowski]

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

New commits:
commit e4b76246055eb8d2b37dbf49684bb7c77068eeb1
Author: Jim Raykowski <raykowj at gmail.com>
Date:   Wed Feb 21 22:39:02 2018 -0900

    tdf#115880 end drawview text editing on move navigation
    
    and leave draw mode
    
    This fix provides a bonous fix for incorrect behaviour of Table move when
    a Drawing Object has focus.
    
    Change-Id: Id554f4f0bac547e65f47544f116f40f49d4d6135
    Reviewed-on: https://gerrit.libreoffice.org/50154
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx
index 64973b481103..22c9cda6af0d 100644
--- a/sw/source/uibase/uiview/viewmdi.cxx
+++ b/sw/source/uibase/uiview/viewmdi.cxx
@@ -309,6 +309,13 @@ IMPL_LINK( SwView, MoveNavigationHdl, void*, p, void )
         return;
     const bool bNext = *pbNext;
     SwWrtShell& rSh = GetWrtShell();
+    if ( NID_SRCH_REP != m_nMoveType)
+    {
+        if ( rSh.GetDrawView()->IsTextEdit() )
+            rSh.EndTextEdit();
+        if ( IsDrawMode() )
+            LeaveDrawCreate();
+    }
     switch( m_nMoveType )
     {
         case NID_PGE: