summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2023-04-20 09:49:36 +0100
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2023-04-20 12:28:50 +0200
commit47f442ee5c0252a4dffd464b28c5948448cd901a (patch)
tree2c715ee1fecb8eb4410a7d3384635b87546bf135
parentResolves: tdf#153958 Hyphenation crashes with -Alte... (diff)
downloadcore-47f442ee5c0252a4dffd464b28c5948448cd901a.tar.gz
core-47f442ee5c0252a4dffd464b28c5948448cd901a.zip
Resolves: tdf#154623 KEY_DECIMAL == GDK_KEY_KP_Decimal or GDK_KEY_KP_Separator
Change-Id: Iade6d3f93ff7f9dcc35c5a04e21617df06955527 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150624 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
-rw-r--r--vcl/unx/gtk3/gtkinst.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 88073b8dae7e..e7c89ecd4966 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -2480,8 +2480,9 @@ GtkWindow* get_active_window()
void LocalizeDecimalSeparator(guint& keyval)
{
- // #i1820# use locale specific decimal separator
- if (keyval == GDK_KEY_KP_Decimal && Application::GetSettings().GetMiscSettings().GetEnableLocalizedDecimalSep())
+ const bool bDecimalKey = keyval == GDK_KEY_KP_Decimal || keyval == GDK_KEY_KP_Separator;
+ // #i1820# (and tdf#154623) use locale specific decimal separator
+ if (bDecimalKey && Application::GetSettings().GetMiscSettings().GetEnableLocalizedDecimalSep())
{
GtkWindow* pFocusWin = get_active_window();
GtkWidget* pFocus = pFocusWin ? gtk_window_get_focus(pFocusWin) : nullptr;