diff options
| author | Eike Rathke <erack@redhat.com> | 2018-07-04 11:34:02 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2018-07-04 14:11:08 +0200 |
| commit | 5d774434743fbc40a5d19daadc9d5b73d2552c41 (patch) | |
| tree | 560087483b2f54052c161389db5dfb5e1de35727 /sc/source/ui/view | |
| parent | d05b7b32d9ecb6fcb4a268eb68cdcee09bafa6dd (diff) | |
Resolves: tdf#117458 let Enter move left/right again, tdf#68290 follow-up
Regression from
commit b0a391d62c1df7525069a02913a52af940d92ecc
CommitDate: Tue Jan 30 23:12:04 2018 +0100
Circular movement of cursor in a table with hidden columns/rows, tdf#68290 related
where for nMoveX case nNewX - nCurX and nNewY - nCurY were both 0.
Also don't abuse the bMarked flag for GetNextPos() as bUnprotected
if nothing is marked, in which case also bKeepSel doesn't make
sense.
Change-Id: I59af09f1cfa397e68ce16d151ba7eee6e6598a75
Reviewed-on: https://gerrit.libreoffice.org/56935
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
Diffstat (limited to 'sc/source/ui/view')
| -rw-r--r-- | sc/source/ui/view/tabview3.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index b79ea4ff0079..393735d3df6b 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -1388,10 +1388,10 @@ void ScTabView::MoveCursorEnter( bool bShift ) // bShift -> up/down } else { + pDoc->GetNextPos( nNewX, nNewY, nTab, nMoveX, nMoveY, false, true, rMark ); + if ( nMoveY != 0 && !nMoveX ) { - pDoc->GetNextPos( nNewX, nNewY, nTab, nMoveX, nMoveY, true, false, rMark ); - // after Tab and Enter back to the starting column again SCCOL nTabCol = aViewData.GetTabStartCol(); if (nTabCol != SC_TABSTART_NONE) @@ -1400,7 +1400,7 @@ void ScTabView::MoveCursorEnter( bool bShift ) // bShift -> up/down } } - MoveCursorRel( nNewX - nCurX, nNewY - nCurY, SC_FOLLOW_LINE, false, true ); + MoveCursorRel( nNewX - nCurX, nNewY - nCurY, SC_FOLLOW_LINE, false); } } |