[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - officecfg/registry

[Libreoffice Gerrit user]

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

New commits:
commit 9df01c894d73e744a9d55c3db64f052a8f496287
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Dec 12 15:28:59 2018 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Dec 12 22:12:08 2018 +0100

    Resolves: tdf#116098 avoid ctrl+shift+e as a default shortcut
    
    Change-Id: Id5ec45290a0829d15a0d88a68d2ed891b9dae195
    Reviewed-on: https://gerrit.libreoffice.org/65042
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 0b62ff83a22c..ed10595365ac 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -16,6 +16,10 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
+<!-- problematic combinations
+Ctrl+Shift+u aka U_SHIFT_MOD1 under GTK/IBUS is for unicode key input
+Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some emoji thing
+ -->
 <!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
 <oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:install="http://openoffice.org/2004/installation" oor:name="Accelerators" oor:package="org.openoffice.Office">
   <node oor:name="PrimaryKeys">
@@ -5865,6 +5869,12 @@
             <value xml:lang="en-US">.uno:SubScript</value>
           </prop>
         </node>
+        <node oor:name="C_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:TrackChanges</value>
+          </prop>
+        </node>
         <node oor:name="DELETE_MOD1" oor:op="replace">
           <prop oor:name="Command">
             <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
@@ -5962,12 +5972,6 @@
             <value xml:lang="es">.uno:SelectAll</value>
           </prop>
         </node>
-        <node oor:name="E_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:TrackChanges</value>
-          </prop>
-        </node>
         <node oor:name="F10_MOD1" oor:op="replace">
           <prop oor:name="Command">
             <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>