From ee403bb1a96aedc6385847020befaab83c0eef95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 6 Mar 2012 13:50:42 +0000 Subject: [PATCH] SAL_WARN_IF not available in older builds --- 0001-Related-rhbz-799628-crash-with-chewing-IM-with-g3g.patch | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/0001-Related-rhbz-799628-crash-with-chewing-IM-with-g3g.patch b/0001-Related-rhbz-799628-crash-with-chewing-IM-with-g3g.patch index 7a82101..a26baac 100644 --- a/0001-Related-rhbz-799628-crash-with-chewing-IM-with-g3g.patch +++ b/0001-Related-rhbz-799628-crash-with-chewing-IM-with-g3g.patch @@ -11,15 +11,13 @@ diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index 112e066..1cd1bd0 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx -@@ -3984,8 +3984,14 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_ +@@ -3984,8 +3984,12 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_ g_slist_free (attr_list); // Set the sal attributes on our text - for (int i = start; i < end; i++) + for (int i = start; i < end; ++i) + { -+ SAL_WARN_IF(i >= static_cast(pThis->m_aInputFlags.size()), -+ "vcl.gtk", "pango attrib out of range?"); + if (i >= static_cast(pThis->m_aInputFlags.size())) + continue; pThis->m_aInputFlags[i] |= sal_attr;