[Libreoffice-commits] core.git: officecfg/registry sc/source

[Yousuf Philips]

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |   20 +++++++++-
 sc/source/ui/docshell/docsh.cxx                                |   17 ++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)

New commits:
commit e5f56d0c6e2a7d75a1f5ee27550b1270641da977
Author: Yousuf Philips <philipz85 at hotmail.com>
Date:   Tue Mar 1 07:28:59 2016 +0400

    tdf#96969 Calc: Change shortcut key for Select Column
    
    Change-Id: Iaaceef8af479ab40b157b06ed73a71c56e20ece7
    Reviewed-on: https://gerrit.libreoffice.org/22795
    Reviewed-by: Yousuf Philips <philipz85 at hotmail.com>
    Tested-by: Yousuf Philips <philipz85 at hotmail.com>

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 00b234d..a905124 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -1133,10 +1133,28 @@
             <value xml:lang="en-US">.uno:MarkDependents</value>
           </prop>
         </node>
+        <node oor:name="SPACE_MOD1" oor:op="replace">
+          <prop oor:name="Command">
+            <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+            <value xml:lang="en-US" install:module="unxwnt">.uno:SelectColumn</value>
+          </prop>
+        </node>
+        <node oor:name="SPACE_MOD3" oor:op="replace">
+          <prop oor:name="Command">
+            <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+            <value xml:lang="en-US" install:module="macosx">.uno:SelectColumn</value>
+          </prop>
+        </node>
         <node oor:name="SPACE_SHIFT_MOD1" oor:op="replace">
           <prop oor:name="Command">
             <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
-            <value xml:lang="en-US">.uno:SelectColumn</value>
+            <value xml:lang="en-US" install:module="unxwnt">.uno:SelectAll</value>
+          </prop>
+        </node>
+        <node oor:name="SPACE_SHIFT_MOD3" oor:op="replace">
+          <prop oor:name="Command">
+            <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+            <value xml:lang="en-US" install:module="macosx">.uno:SelectAll</value>
           </prop>
         </node>
         <node oor:name="SUBTRACT_MOD1" oor:op="replace">
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index e216215..08dbab9 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -2970,7 +2970,7 @@ void ScDocShell::ResetKeyBindings( ScOptionsUtil::KeyBindingType eType )
         return;
 
     vector<const awt::KeyEvent*> aKeys;
-    aKeys.reserve(7);
+    aKeys.reserve(9);
 
     // Backspace key
     awt::KeyEvent aBackspace;
@@ -2996,6 +2996,18 @@ void ScDocShell::ResetKeyBindings( ScOptionsUtil::KeyBindingType eType )
     aAltDown.Modifiers = awt::KeyModifier::MOD2;
     aKeys.push_back(&aAltDown);
 
+    // Ctrl-Space
+    awt::KeyEvent aCtrlSpace;
+    aCtrlSpace.KeyCode = awt::Key::SPACE;
+    aCtrlSpace.Modifiers = awt::KeyModifier::MOD1;
+    aKeys.push_back(&aCtrlSpace);
+
+    // Ctrl-Shift-Space
+    awt::KeyEvent aCtrlShiftSpace;
+    aCtrlShiftSpace.KeyCode = awt::Key::SPACE;
+    aCtrlShiftSpace.Modifiers = awt::KeyModifier::MOD1 | awt::KeyModifier::SHIFT;
+    aKeys.push_back(&aCtrlShiftSpace);
+
     // F4
     awt::KeyEvent aF4;
     aF4.KeyCode = awt::Key::F4;
@@ -3026,6 +3038,8 @@ void ScDocShell::ResetKeyBindings( ScOptionsUtil::KeyBindingType eType )
             xScAccel->setKeyEvent(aBackspace, ".uno:Delete");
             xScAccel->setKeyEvent(aCtrlD, ".uno:FillDown");
             xScAccel->setKeyEvent(aAltDown, ".uno:DataSelect");
+            xScAccel->setKeyEvent(aCtrlSpace, ".uno:SelectColumn");
+            xScAccel->setKeyEvent(aCtrlShiftSpace, ".uno:SelectAll");
             xScAccel->setKeyEvent(aF4, ".uno:ToggleRelative");
             xScAccel->setKeyEvent(aCtrlShiftF4, ".uno:ViewDataSourceBrowser");
         break;
@@ -3033,6 +3047,7 @@ void ScDocShell::ResetKeyBindings( ScOptionsUtil::KeyBindingType eType )
             xScAccel->setKeyEvent(aDelete, ".uno:Delete");
             xScAccel->setKeyEvent(aBackspace, ".uno:ClearContents");
             xScAccel->setKeyEvent(aCtrlD, ".uno:DataSelect");
+            xScAccel->setKeyEvent(aCtrlShiftSpace, ".uno:SelectColumn");
             xScAccel->setKeyEvent(aF4, ".uno:ViewDataSourceBrowser");
             xScAccel->setKeyEvent(aShiftF4, ".uno:ToggleRelative");
         break;