officecfg/registry/data/org/openoffice/Office/Accelerators.xcu | 54
+---------
1 file changed, 9 insertions(+), 45 deletions(-)
New commits:
commit 77fb3ffdb6a8077cd3931985de923fbd1396d424
Author: Aron Budea <aron.bu...@collabora.com>
AuthorDate: Tue Oct 11 15:59:54 2022 +0200
Commit: Aron Budea <aron.bu...@collabora.com>
CommitDate: Fri Oct 14 12:28:45 2022 +0200
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.bu...@collabora.com>
diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 6ac47e235cff..bec16cb66756 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -808,19 +808,10 @@ 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>
- <!-- tdf#150862 Replace Ctrl-Alt-EQUAL with Ctrl-Alt-} for
French keyboard layout -->
- <value xml:lang="fr"></value>
- </prop>
- </node>
- <!-- tdf#150862 Replace Ctrl-Alt-EQUAL with Ctrl-Alt-} for French
keyboard layout -->
- <node oor:name="RIGHTCURLYBRACKET_MOD1_MOD2" oor:op="replace">
- <prop oor:name="Command">
- <value xml:lang="x-no-translate">I10N SHORTCUTS - NO
TRANSLATE</value>
- <value xml:lang="fr">.uno:InsertObjectStarMath</value>
</prop>
</node>
<node oor:name="END" oor:op="replace">
@@ -1746,19 +1737,10 @@ 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>
- <!-- tdf#150862 Replace Ctrl-Alt-EQUAL with Ctrl-Alt-} for
French keyboard layout -->
- <value xml:lang="fr"></value>
- </prop>
- </node>
- <!-- tdf#150862 Replace Ctrl-Alt-EQUAL with Ctrl-Alt-} for French
keyboard layout -->
- <node oor:name="RIGHTCURLYBRACKET_MOD1_MOD2" oor:op="replace">
- <prop oor:name="Command">
- <value xml:lang="x-no-translate">I10N SHORTCUTS - NO
TRANSLATE</value>
- <value xml:lang="fr">.uno:InsertMath</value>
</prop>
</node>
<node oor:name="F11" oor:op="replace">
@@ -2975,21 +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>
- <!-- tdf#150862 Replace Ctrl-Alt-EQUAL with Ctrl-Alt-} for
French keyboard layout -->
- <value xml:lang="fr"></value>
- </prop>
- </node>
- <!-- tdf#150862 Replace Ctrl-Alt-EQUAL with Ctrl-Alt-} for French
keyboard layout -->
- <node oor:name="RIGHTCURLYBRACKET_MOD1_MOD2" oor:op="replace">
- <prop oor:name="Command">
- <value xml:lang="x-no-translate">I10N SHORTCUTS - NO
TRANSLATE</value>
- <value xml:lang="fr">.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>
@@ -3109,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>
@@ -6248,19 +6221,10 @@ 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>
- <!-- tdf#150862 Replace Ctrl-Alt-EQUAL with Ctrl-Alt-} for
French keyboard layout -->
- <value xml:lang="fr"></value>
- </prop>
- </node>
- <!-- tdf#150862 Replace Ctrl-Alt-EQUAL with Ctrl-Alt-} for French
keyboard layout -->
- <node oor:name="RIGHTCURLYBRACKET_MOD1_MOD2" oor:op="replace">
- <prop oor:name="Command">
- <value xml:lang="x-no-translate">I10N SHORTCUTS - NO
TRANSLATE</value>
- <value xml:lang="fr">.uno:InsertObjectStarMath</value>
</prop>
</node>
<node oor:name="F10_MOD1" oor:op="replace">
