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

[Yousuf Philips]

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |   22 ----------
 sc/source/ui/docshell/docsh.cxx                                |   12 ++---
 sc/source/ui/src/globstr.src                                   |    2 
 3 files changed, 9 insertions(+), 27 deletions(-)

New commits:
commit d9f751a416db1a6d583e91d0d74b36185429245c
Author: Yousuf Philips <philipz85 at hotmail.com>
Date:   Tue Mar 1 11:48:11 2016 +0400

    tdf#97906 Calc: Correct cell reference shortcut keys
    
    Remove Shift+F4 shortcut key for cell reference and add it to the OOo
    Legacy compatibility mode. Improve wording of cell reference error
    message. Unify shortcut for Data Sources to Ctrl + Shift + F4.
    
    Change-Id: I0f4ab3768d2663984bb294763c2e4b299c5e8186
    Reviewed-on: https://gerrit.libreoffice.org/22803
    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 dd64bdb..00b234d 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -87,7 +87,7 @@
           <value xml:lang="en-US">.uno:MacroDialog</value>
         </prop>
       </node>
-      <node oor:name="F4" oor:op="replace">
+      <node oor:name="F4_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:ViewDataSourceBrowser</value>
@@ -347,7 +347,7 @@
             <value xml:lang="en-US">.uno:Delete</value>
           </prop>
         </node>
-        <node oor:name="F4" oor:op="replace">
+        <node oor:name="F4_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:ViewDataSourceBrowser</value>
@@ -768,24 +768,6 @@
             <value xml:lang="en-US">.uno:ToggleRelative</value>
           </prop>
         </node>
-        <node oor:name="F4_SHIFT" oor:op="replace">
-          <prop oor:name="Command">
-            <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
-            <value xml:lang="en-US">.uno:ToggleRelative</value>
-          </prop>
-        </node>
-        <node oor:name="F4_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:ViewDataSourceBrowser</value>
-          </prop>
-        </node>
-        <node oor:name="F4_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">.uno:ViewDataSourceBrowser</value>
-          </prop>
-        </node>
         <node oor:name="F5" oor:op="replace">
           <prop oor:name="Command">
             <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 09f87e6..e216215 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -3008,11 +3008,11 @@ void ScDocShell::ResetKeyBindings( ScOptionsUtil::KeyBindingType eType )
     aCtrlShiftF4.Modifiers = awt::KeyModifier::MOD1 | awt::KeyModifier::SHIFT;
     aKeys.push_back(&aCtrlShiftF4);
 
-    // CTRL+SHIFT+F4 Mac
-    awt::KeyEvent aCtrlShiftF4Mac;
-    aCtrlShiftF4Mac.KeyCode = awt::Key::F4;
-    aCtrlShiftF4Mac.Modifiers = awt::KeyModifier::MOD3 | awt::KeyModifier::SHIFT;
-    aKeys.push_back(&aCtrlShiftF4Mac);
+    // SHIFT+F4
+    awt::KeyEvent aShiftF4;
+    aShiftF4.KeyCode = awt::Key::F4;
+    aShiftF4.Modifiers = awt::KeyModifier::SHIFT;
+    aKeys.push_back(&aShiftF4);
 
     // Remove all involved keys first, because swapping commands don't work
     // well without doing this.
@@ -3028,13 +3028,13 @@ void ScDocShell::ResetKeyBindings( ScOptionsUtil::KeyBindingType eType )
             xScAccel->setKeyEvent(aAltDown, ".uno:DataSelect");
             xScAccel->setKeyEvent(aF4, ".uno:ToggleRelative");
             xScAccel->setKeyEvent(aCtrlShiftF4, ".uno:ViewDataSourceBrowser");
-            xScAccel->setKeyEvent(aCtrlShiftF4Mac, ".uno:ViewDataSourceBrowser");
         break;
         case ScOptionsUtil::KEY_OOO_LEGACY:
             xScAccel->setKeyEvent(aDelete, ".uno:Delete");
             xScAccel->setKeyEvent(aBackspace, ".uno:ClearContents");
             xScAccel->setKeyEvent(aCtrlD, ".uno:DataSelect");
             xScAccel->setKeyEvent(aF4, ".uno:ViewDataSourceBrowser");
+            xScAccel->setKeyEvent(aShiftF4, ".uno:ToggleRelative");
         break;
         default:
             ;
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index b1d72d3..01fa1e4 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -1391,7 +1391,7 @@ Resource RID_GLOBSTR
     };
     String STR_ERR_NOREF
     {
-        Text [ en-US ] = "No references found." ;
+        Text [ en-US ] = "No cell references are found in the selected cells." ;
     };
     String STR_ERR_LINKOVERLAP
     {