officecfg/registry/data/org/openoffice/Office/Accelerators.xcu | 6 +
vcl/source/app/svapp.cxx | 34
++--------
2 files changed, 13 insertions(+), 27 deletions(-)
New commits:
commit e1c59fd539222973410dc6adcb8eac4abeeb9e6a
Author: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
AuthorDate: Tue Apr 23 14:02:00 2024 +0300
Commit: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
CommitDate: Thu Apr 25 11:01:17 2024 +0200
Improve documentation on reserved shortcuts
Ctrl+F1 can be dropped from the reserved ones. It used to point to Context
help, but at some point the shortcuts were switched around.
Ctrl+Shift+F6 used to have references "activate splitter" and
SV_SHORTCUT_SPLITTER, but it is not clear what this means. Related to
vcl/source/window/split.cxx perhaps? One guess is that this is related to
StarOffice's Window - Tile feature:
https://www.oreilly.com/library/view/starofficetm-52-calc/013029389X/013029389X_ch02lev1sec8.html
The Ctrl+Shift+F6 shortcut doesn't seem to do anything, so let's drop it
from the reserved ones.
Remove Unix-specific shortcuts Ctrl+Shift+1 through 0, Ctrl+Shift+Plus
added in
2003 without explanation in commit 2f382d6c2579a25c68dbd121af7f1f5dc7ec9852
Ctrl+Shift+E is no longer used by IBus:
https://github.com/ibus/ibus/commit/b952d30a1b7c741052c168fe1081ecb4d4b1c034
https://github.com/ibus/ibus/commit/1520c39d0d6036da725fcecd932883be3f3d3575
Change-Id: I19766c85871a56c4ba3cebc56e29c99e1f9a8f4b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166530
Tested-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
Tested-by: Jenkins
diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 56eb20da6bd3..73419dee1102 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -16,9 +16,11 @@
* 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
+<!--
+ReservedKeys[] in vcl/source/app/svapp.cxx defines key codes that can not be
+used for shortcuts.
+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">
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 72f6afcb3b01..21de9dfc0f16 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -98,31 +98,15 @@ void InitSettings(ImplSVData* pSVData);
// keycodes handled internally by VCL
vcl::KeyCode const ReservedKeys[]
{
- vcl::KeyCode(KEY_F1,0) ,
- vcl::KeyCode(KEY_F1,KEY_SHIFT) ,
- vcl::KeyCode(KEY_F1,KEY_MOD1) ,
- vcl::KeyCode(KEY_F2,KEY_SHIFT) ,
- vcl::KeyCode(KEY_F4,KEY_MOD1) ,
- vcl::KeyCode(KEY_F4,KEY_MOD2) ,
- vcl::KeyCode(KEY_F6,0) ,
- vcl::KeyCode(KEY_F6,KEY_MOD1) ,
- vcl::KeyCode(KEY_F6,KEY_SHIFT) ,
- vcl::KeyCode(KEY_F6,KEY_MOD1|KEY_SHIFT) ,
- vcl::KeyCode(KEY_F10,0)
-#ifdef UNX
- ,
- vcl::KeyCode(KEY_1,KEY_SHIFT|KEY_MOD1),
- vcl::KeyCode(KEY_2,KEY_SHIFT|KEY_MOD1),
- vcl::KeyCode(KEY_3,KEY_SHIFT|KEY_MOD1),
- vcl::KeyCode(KEY_4,KEY_SHIFT|KEY_MOD1),
- vcl::KeyCode(KEY_5,KEY_SHIFT|KEY_MOD1),
- vcl::KeyCode(KEY_6,KEY_SHIFT|KEY_MOD1),
- vcl::KeyCode(KEY_7,KEY_SHIFT|KEY_MOD1),
- vcl::KeyCode(KEY_8,KEY_SHIFT|KEY_MOD1),
- vcl::KeyCode(KEY_9,KEY_SHIFT|KEY_MOD1),
- vcl::KeyCode(KEY_0,KEY_SHIFT|KEY_MOD1),
- vcl::KeyCode(KEY_ADD,KEY_SHIFT|KEY_MOD1)
-#endif
+ vcl::KeyCode(KEY_F1,0) , // Help
+ vcl::KeyCode(KEY_F1,KEY_SHIFT) , // Context help
+ vcl::KeyCode(KEY_F2,KEY_SHIFT) , // Activate extended
tooltips
+ vcl::KeyCode(KEY_F4,KEY_MOD1) , // Close document
+ vcl::KeyCode(KEY_F4,KEY_MOD2) , // Close document
+ vcl::KeyCode(KEY_F6,0) , // Set focus to next
visible subwindow
+ vcl::KeyCode(KEY_F6,KEY_MOD1) , // Set focus to the
document canvas/data source
+ vcl::KeyCode(KEY_F6,KEY_SHIFT) , // Set focus to
previous subwindow
+ vcl::KeyCode(KEY_F10,0) // Activate the
first menu
};
extern "C" {
