[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - svx/source

[Tamás Zolnai]

 svx/source/table/tablecontroller.cxx |   18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

New commits:
commit 1308ee8106da02d0f287ef5d77ff970bb65a72fa
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
Date:   Mon Jul 10 20:04:52 2017 +0200

    tdf#109050: Moving table object with ALT+Arrow keys does not work properly
    
    ALT+up/down behaves differently inside a table: cursor is moved
    to the left/right neighbouring cell instead of up/down. However
    when the whole table is selected a different behavior is expected:
    moving the table as an object.
    
    Change-Id: I82c7a3cc7d215b21f19fbf08dcdb7318a7e75289
    Reviewed-on: https://gerrit.libreoffice.org/39810
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    (cherry picked from commit f5637ae74ad6bb517255510a8ae786fd2a3cf977)
    Reviewed-on: https://gerrit.libreoffice.org/39838
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index fc5acd491ba8..1d5f929424a3 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -1570,15 +1570,19 @@ SvxTableController::TblAction SvxTableController::getKeyboardAction(const KeyEve
 
         if( !bMod1 && bMod2 )
         {
-            if( (nCode == awt::Key::UP) || (nCode == awt::Key::NUM8) )
+            if(bTextEdit || mbCellSelectionMode)
             {
-                nAction = TblAction::GotoLeftCell;
-            }
-            else if( (nCode == awt::Key::DOWN) || (nCode == awt::Key::NUM2) )
-            {
-                nAction = TblAction::GotoRightCell;
+                if( (nCode == awt::Key::UP) || (nCode == awt::Key::NUM8) )
+                {
+                    nAction = TblAction::GotoLeftCell;
+                    break;
+                }
+                else if( (nCode == awt::Key::DOWN) || (nCode == awt::Key::NUM2) )
+                {
+                    nAction = TblAction::GotoRightCell;
+                    break;
+                }
             }
-            break;
         }
 
         bool bTextMove = false;