[libreoffice] SAL_WARN_IF not available in older builds

Caolán McNamara caolanm at fedoraproject.org
Tue Mar 6 13:50:46 UTC 2012


commit ee403bb1a96aedc6385847020befaab83c0eef95
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 6 13:50:42 2012 +0000

    SAL_WARN_IF not available in older builds

 ...hbz-799628-crash-with-chewing-IM-with-g3g.patch |    4 +---
 1 files changed, 1 insertions(+), 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<int>(pThis->m_aInputFlags.size()),
-+                "vcl.gtk", "pango attrib out of range?");
 +            if (i >= static_cast<int>(pThis->m_aInputFlags.size()))
 +                continue;
              pThis->m_aInputFlags[i] |= sal_attr;


More information about the scm-commits mailing list