summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-04-24 19:10:33 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-04-25 09:57:51 +0200
commit4d6fc3c88902ca74f934960e7600df99605dea48 (patch)
treea0ce45bf78ec5ce6508b019ef7ae2315f4643690
parent18c32d5824618e3ac00c4755f380b2b033a96fc9 (diff)
Related: tdf#116951 use same pattern for gtk2
Change-Id: Ic6f1a018b4d0016af5a19052ef46ea87c7923acb Reviewed-on: https://gerrit.libreoffice.org/53416 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--vcl/unx/gtk/gtksalframe.cxx10
1 files changed, 8 insertions, 2 deletions
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index ad4b00d26927..3f99b8c30d3d 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -3559,8 +3559,14 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_
ExtTextInputAttr sal_attr = ExtTextInputAttr::NONE;
pango_attr_iterator_range (iter, &start, &end);
- if (end == G_MAXINT)
- end = pText ? g_utf8_strlen(pText, -1) : 0;
+ if (start == G_MAXINT || end == G_MAXINT)
+ {
+ auto len = pText ? g_utf8_strlen(pText, -1) : 0;
+ if (end == G_MAXINT)
+ end = len;
+ if (start == G_MAXINT)
+ start = len;
+ }
if (end == start)
continue;