diff options
| author | Jim Raykowski <raykowj@gmail.com> | 2018-02-21 22:39:02 -0900 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-02-24 14:34:33 +0100 |
| commit | e4b76246055eb8d2b37dbf49684bb7c77068eeb1 (patch) | |
| tree | f3ad6d3cd8cc7a3502d7153669fbccc5a61efc1a | |
| parent | 974ef69c73a4e62b7513effa5c5b8d46ec0a1c80 (diff) | |
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@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
| -rw-r--r-- | sw/source/uibase/uiview/viewmdi.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
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: |