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

[Tamás Zolnai]

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

New commits:
commit 73ea880fe1a21af5233b1cbb91618b568b760d8b
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
Date:   Tue Jul 11 21:32:33 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.
    
    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)
    
    Change-Id: I82c7a3cc7d215b21f19fbf08dcdb7318a7e75289
    Reviewed-on: https://gerrit.libreoffice.org/39837
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 47ca6dbcd5ad..6921f1d4190c 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -1567,15 +1567,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;