From 5c6d55ef33cb78513ce34415fb1542a0ce5a3c51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 19 Apr 2018 20:15:12 +0100 Subject: [PATCH] Related: rhbz#1569331 end should be in terms of unicode chars, not bytes --- ...51-rhbz-1569331-end-should-be-in-ter.patch | 43 +++++++++++++++++++ libreoffice.spec | 4 +- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 0001-Related-tdf-116951-rhbz-1569331-end-should-be-in-ter.patch diff --git a/0001-Related-tdf-116951-rhbz-1569331-end-should-be-in-ter.patch b/0001-Related-tdf-116951-rhbz-1569331-end-should-be-in-ter.patch new file mode 100644 index 0000000..281fe5d --- /dev/null +++ b/0001-Related-tdf-116951-rhbz-1569331-end-should-be-in-ter.patch @@ -0,0 +1,43 @@ +From cff779551db2eedf5b16d49213fc5e2179414256 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Thu, 19 Apr 2018 20:12:40 +0100 +Subject: [PATCH] Related: tdf#116951 rhbz#1569331 end should be in terms of + unicode chars + +not bytes + +Change-Id: I05114019abb6c283586cd5c23ed1d148c9cf71d3 +--- + vcl/unx/gtk/gtksalframe.cxx | 2 +- + vcl/unx/gtk3/gtk3gtkframe.cxx | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx +index 9fd86abccc3d..ad4b00d26927 100644 +--- a/vcl/unx/gtk/gtksalframe.cxx ++++ b/vcl/unx/gtk/gtksalframe.cxx +@@ -3560,7 +3560,7 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_ + + pango_attr_iterator_range (iter, &start, &end); + if (end == G_MAXINT) +- end = pText ? strlen (pText) : 0; ++ end = pText ? g_utf8_strlen(pText, -1) : 0; + if (end == start) + continue; + +diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx +index 1db3a469973f..113fcb425963 100644 +--- a/vcl/unx/gtk3/gtk3gtkframe.cxx ++++ b/vcl/unx/gtk3/gtk3gtkframe.cxx +@@ -3978,7 +3978,7 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_ + + pango_attr_iterator_range (iter, &start, &end); + if (end == G_MAXINT) +- end = pText ? strlen (pText) : 0; ++ end = pText ? g_utf8_strlen(pText, -1) : 0; + if (end == start) + continue; + +-- +2.14.3 + diff --git a/libreoffice.spec b/libreoffice.spec index 02ecefa..3bdb0c1 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -277,6 +277,7 @@ Patch5: 0001-request-installation-of-langpack-via-packagekit.patch Patch6: 0001-rhbz-1392145-ensure-titlebar-close-button-matches-ou.patch Patch7: 0001-Related-rhbz-1396729-use-cairo_surface_create_simila.patch Patch8: 0001-tdf-95843-Wait-for-fire_glxtest_process-also-in-head.patch +Patch9: 0001-Related-tdf-116951-rhbz-1569331-end-should-be-in-ter.patch %if 0%{?rhel} # not upstreamed @@ -2326,8 +2327,9 @@ done %{_includedir}/LibreOfficeKit %changelog -* Thu Apr 19 2018 Stephan Bergmann - 1:6.0.3.2-4-UNBUILT +* Thu Apr 19 2018 Stephan Bergmann - 1:6.0.3.2-4 - Resolves: rhbz#1568579 LibreOffice --headless zombie process +- Related: rhbz#1569331 end should be in terms of unicode chars, not bytes * Tue Apr 17 2018 Caolán McNamara - 1:6.0.3.2-3 - Related: rhbz#1396729 use cairo_surface_create_similar