|
 |
5c6d55e |
From cff779551db2eedf5b16d49213fc5e2179414256 Mon Sep 17 00:00:00 2001
|
|
|
5c6d55e |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
5c6d55e |
Date: Thu, 19 Apr 2018 20:12:40 +0100
|
|
|
5c6d55e |
Subject: [PATCH] Related: tdf#116951 rhbz#1569331 end should be in terms of
|
|
|
5c6d55e |
unicode chars
|
|
|
5c6d55e |
|
|
|
5c6d55e |
not bytes
|
|
|
5c6d55e |
|
|
|
5c6d55e |
Change-Id: I05114019abb6c283586cd5c23ed1d148c9cf71d3
|
|
|
5c6d55e |
---
|
|
|
5c6d55e |
vcl/unx/gtk/gtksalframe.cxx | 2 +-
|
|
|
5c6d55e |
vcl/unx/gtk3/gtk3gtkframe.cxx | 2 +-
|
|
|
5c6d55e |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
5c6d55e |
|
|
|
5c6d55e |
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
|
|
|
5c6d55e |
index 9fd86abccc3d..ad4b00d26927 100644
|
|
|
5c6d55e |
--- a/vcl/unx/gtk/gtksalframe.cxx
|
|
|
5c6d55e |
+++ b/vcl/unx/gtk/gtksalframe.cxx
|
|
|
5c6d55e |
@@ -3560,7 +3560,7 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_
|
|
|
5c6d55e |
|
|
|
5c6d55e |
pango_attr_iterator_range (iter, &start, &end;;
|
|
|
5c6d55e |
if (end == G_MAXINT)
|
|
|
5c6d55e |
- end = pText ? strlen (pText) : 0;
|
|
|
5c6d55e |
+ end = pText ? g_utf8_strlen(pText, -1) : 0;
|
|
|
5c6d55e |
if (end == start)
|
|
|
5c6d55e |
continue;
|
|
|
5c6d55e |
|
|
|
5c6d55e |
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
|
|
|
5c6d55e |
index 1db3a469973f..113fcb425963 100644
|
|
|
5c6d55e |
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
|
|
|
5c6d55e |
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
|
|
|
5c6d55e |
@@ -3978,7 +3978,7 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_
|
|
|
5c6d55e |
|
|
|
5c6d55e |
pango_attr_iterator_range (iter, &start, &end;;
|
|
|
5c6d55e |
if (end == G_MAXINT)
|
|
|
5c6d55e |
- end = pText ? strlen (pText) : 0;
|
|
|
5c6d55e |
+ end = pText ? g_utf8_strlen(pText, -1) : 0;
|
|
|
5c6d55e |
if (end == start)
|
|
|
5c6d55e |
continue;
|
|
|
5c6d55e |
|
|
|
5c6d55e |
--
|
|
|
5c6d55e |
2.14.3
|
|
|
5c6d55e |
|