[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/window/builder.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 8fe325c9e584d2b60875106858162e28d22d9020
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Nov 13 17:04:56 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Nov 14 10:49:50 2020 +0100

    allow F1<->F26 accelerators in .ui
    
    Change-Id: I574a92839664643b1e42f3184471bc05e8b4da31
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105801
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index c1163335aaff..9e322c3f1935 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -3507,6 +3507,12 @@ namespace
             return vcl::KeyCode(KEY_RIGHT, bShift, bMod1, bMod2, bMod3);
         else if (rKey.first == "asterisk")
             return vcl::KeyCode(KEY_MULTIPLY, bShift, bMod1, bMod2, bMod3);
+        else if (rKey.first.getLength() > 1 && rKey.first[0] == 'F')
+        {
+            sal_uInt32 nIndex = rKey.first.copy(1).toUInt32();
+            assert(nIndex >= 1 && nIndex <= 26);
+            return vcl::KeyCode(KEY_F1 + nIndex - 1, bShift, bMod1, bMod2, bMod3);
+        }
 
         assert (rKey.first.getLength() == 1);
         char cChar = rKey.first.toChar();