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

[heiko tietze]

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |   48 ++++++++--
 1 file changed, 42 insertions(+), 6 deletions(-)

New commits:
commit eb6531dcb19e61baff69356eda5fd7f2a5d46458
Author: heiko tietze <tietze.heiko at gmail.com>
Date:   Sat Apr 14 12:21:40 2018 +0200

    tdf#78777 - Keyboard shortcut for number format interfers with macOS defaults
    
    Shortcuts assigned to Shift+Alt+1..6 on macOS; kept Shift+Ctrl+1..6 on Windows/Linux
    
    Change-Id: I993b79961679cfc0cdf771a5e9785e8bd9c39687
    Reviewed-on: https://gerrit.libreoffice.org/52869
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Heiko Tietze <tietze.heiko at gmail.com>

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 75b3c4f1c8ca..9ce3b9974c6b 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -553,7 +553,13 @@
         <node oor:name="1_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:NumberFormatDecimal</value>
+            <value xml:lang="en-US" install:module="unxwnt">.uno:NumberFormatDecimal</value>
+          </prop>
+        </node>
+        <node oor:name="1_SHIFT_MOD2" 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:NumberFormatDecimal</value>
           </prop>
         </node>
         <node oor:name="2_MOD1" oor:op="replace">
@@ -565,19 +571,37 @@
         <node oor:name="2_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:NumberFormatScientific</value>
+            <value xml:lang="en-US" install:module="unxwnt">.uno:NumberFormatScientific</value>
+          </prop>
+        </node>
+        <node oor:name="2_SHIFT_MOD2" 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:NumberFormatScientific</value>
           </prop>
         </node>
         <node oor:name="3_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:NumberFormatDate</value>
+            <value xml:lang="en-US" install:module="unxwnt">.uno:NumberFormatDate</value>
+          </prop>
+        </node>
+        <node oor:name="3_SHIFT_MOD2" 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:NumberFormatDate</value>
           </prop>
         </node>
         <node oor:name="4_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:NumberFormatCurrency</value>
+            <value xml:lang="en-US" install:module="unxwnt">.uno:NumberFormatCurrency</value>
+          </prop>
+        </node>
+        <node oor:name="4_SHIFT_MOD2" 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:NumberFormatCurrency</value>
           </prop>
         </node>
         <node oor:name="5_MOD1" oor:op="replace">
@@ -589,13 +613,25 @@
         <node oor:name="5_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:NumberFormatPercent</value>
+            <value xml:lang="en-US" install:module="unxwnt">.uno:NumberFormatPercent</value>
+          </prop>
+        </node>
+        <node oor:name="5_SHIFT_MOD2" 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:NumberFormatPercent</value>
           </prop>
         </node>
         <node oor:name="6_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:NumberFormatStandard</value>
+            <value xml:lang="en-US" install:module="unxwnt">.uno:NumberFormatStandard</value>
+          </prop>
+        </node>
+        <node oor:name="6_SHIFT_MOD2" 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:NumberFormatStandard</value>
           </prop>
         </node>
         <node oor:name="8_MOD1" oor:op="replace">