[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - vcl/qt5

Jan-Marek Glogowski (via logerrit) logerrit at kemper.freedesktop.org
Thu Jul 22 20:02:40 UTC 2021


 vcl/qt5/Qt5Widget.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a42061523737e8d49778303c787af25cb29c9d6e
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Thu Jul 22 18:14:01 2021 +0200
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Thu Jul 22 22:02:03 2021 +0200

    tdf#143493 Qt5 key modifier events don't have text
    
    Regression from commit 862fdb98ca271b60a831cd5420fd16d5f9c1c747
    ("tdf#143298 Qt5 send SalEvent::KeyModChange events").
    
    Change-Id: I6981af06e3a73dee45ed10416f5d3b17b860a73b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119375
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
    (cherry picked from commit 22997c4777eeb424493d1259b72db9a15ff37069)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119267
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
index 93da76ecad76..ebb11cef51ff 100644
--- a/vcl/qt5/Qt5Widget.cxx
+++ b/vcl/qt5/Qt5Widget.cxx
@@ -456,7 +456,7 @@ bool Qt5Widget::handleKeyEvent(Qt5Frame& rFrame, const QWidget& rWidget, QKeyEve
         return true;
     }
 
-    if (nCode == 0)
+    if (nCode == 0 && pEvent->text().isEmpty())
     {
         sal_uInt16 nModCode = GetKeyModCode(pEvent->modifiers());
         SalKeyModEvent aModEvt;


More information about the Libreoffice-commits mailing list