summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAron Budea <aron.budea@collabora.com>2022-10-11 15:59:54 +0200
committerAndras Timar <andras.timar@collabora.com>2022-10-15 10:20:07 +0200
commit954bee89d4943656f10c3574b33578861bf539e7 (patch)
tree3c3f7aa5c26dd1ca9494b716bccb680ee0d0a5a3
parentcrashtesting: uncaught exception on export of forum-fr-20226.sxi to pptx (diff)
downloadcore-954bee89d4943656f10c3574b33578861bf539e7.tar.gz
core-954bee89d4943656f10c3574b33578861bf539e7.zip
tdf#150682 Change shortcut of inserting Math objects to Alt+Shift+E
Ctrl+Alt combinations don't work on Windows if they're also doubling as AltGr modifiers, eg. in French keyboard layout, Ctrl+Alt+'=' (which is the same as AltGr+'=' ) is '}'. Avoid this by switching to different modifiers. In addition '=' can require a modifier to enter, eg. in German layout (Shift+0), so use an ASCII character, 'E' instead. Ctrl+Shift+E is listed as a problematic combination in Accelerators.xcu, settled on Alt+Shift+E in the end. Also partially revert d156e891db34e88991a6c18fd3cff6feddfc61c8, which did not work. Change-Id: Ie3625f2c55171187fbbe2c4f79821eba8c25f40a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141227 Tested-by: Jenkins Reviewed-by: Aron Budea <aron.budea@collabora.com> (cherry picked from commit 77fb3ffdb6a8077cd3931985de923fbd1396d424) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141362 Reviewed-by: Andras Timar <andras.timar@collabora.com>
-rw-r--r--officecfg/registry/data/org/openoffice/Office/Accelerators.xcu18
1 files changed, 9 insertions, 9 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 0497cb3e18a8..bec16cb66756 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -808,7 +808,7 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some emoji thing
<value xml:lang="en-US">.uno:FillDown</value>
</prop>
</node>
- <node oor:name="EQUAL_MOD1_MOD2" oor:op="replace">
+ <node oor:name="E_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">.uno:InsertObjectStarMath</value>
@@ -1737,7 +1737,7 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some emoji thing
<value xml:lang="es">.uno:SelectAll</value>
</prop>
</node>
- <node oor:name="EQUAL_MOD1_MOD2" oor:op="replace">
+ <node oor:name="E_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">.uno:InsertMath</value>
@@ -2957,12 +2957,6 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some emoji thing
<value xml:lang="en-US">.uno:PreviousAnnotation</value>
</prop>
</node>
- <node oor:name="EQUAL_MOD1_MOD2" oor:op="replace">
- <prop oor:name="Command">
- <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
- <value xml:lang="en-US">.uno:InsertMath</value>
- </prop>
- </node>
<node oor:name="1_MOD1" oor:op="replace">
<prop oor:name="Command">
<value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
@@ -3082,6 +3076,12 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some emoji thing
<value xml:lang="es">.uno:SelectAll</value>
</prop>
</node>
+ <node oor:name="E_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">.uno:InsertMath</value>
+ </prop>
+ </node>
<node oor:name="END_SHIFT_MOD2" oor:op="replace">
<prop oor:name="Command">
<value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
@@ -6221,7 +6221,7 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some emoji thing
<value xml:lang="es">.uno:SelectAll</value>
</prop>
</node>
- <node oor:name="EQUAL_MOD1_MOD2" oor:op="replace">
+ <node oor:name="E_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">.uno:InsertObjectStarMath</value>