[libreoffice/f19] Resolves: rhbz#1050162 don't draw to NULL window

[David Tardon]

commit 00508ed52b446de5d90d86a502b7d806a85bb489
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Feb 3 10:41:49 2014 +0100

    Resolves: rhbz#1050162 don't draw to NULL window

 ...es-rhbz-1050162-don-t-draw-to-NULL-window.patch |   36 ++++++++++++++++++++
 libreoffice.spec                                   |    3 ++
 2 files changed, 39 insertions(+), 0 deletions(-)
---
diff --git a/0001-Resolves-rhbz-1050162-don-t-draw-to-NULL-window.patch b/0001-Resolves-rhbz-1050162-don-t-draw-to-NULL-window.patch
new file mode 100644
index 0000000..2c76d97
--- /dev/null
+++ b/0001-Resolves-rhbz-1050162-don-t-draw-to-NULL-window.patch
@@ -0,0 +1,36 @@
+From 3cb4aa944afe335da373b3e0bafea5360cb8d665 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Wed, 8 Jan 2014 21:01:48 +0000
+Subject: [PATCH] Resolves: rhbz#1050162 don't draw to NULL window
+
+Change-Id: Ia84e3ae05f2d3eacfb48136ce920173b46783bc7
+---
+ vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+index 14f6d7a..4c00db5 100644
+--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
++++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+@@ -782,7 +782,6 @@ sal_Bool GtkSalGraphics::drawNativeControl(    ControlType nType,
+                             const ImplControlValue& aValue,
+                             const OUString& rCaption )
+ {
+-    sal_Bool            returnVal = sal_False;
+     // get a GC with current clipping region set
+     GetFontGC();
+ 
+@@ -839,5 +838,10 @@ sal_Bool GtkSalGraphics::drawNativeControl(    ControlType nType,
+     }
+ 
++    assert(gdkDrawable); //rhbz#1050162
++    if (gdkDrawable == 0)
++        return false;
++
++    sal_Bool            returnVal = sal_False;
+     if ( (nType==CTRL_PUSHBUTTON) && (nPart==PART_ENTIRE_CONTROL) )
+     {
+         returnVal = NWPaintGTKButton( gdkDrawable, nType, nPart, aCtrlRect, aClip, nState, aValue, rCaption );
+-- 
+1.8.4.2
+
diff --git a/libreoffice.spec b/libreoffice.spec
index e04fc62..da1f7c2 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -268,6 +268,7 @@ Patch28: 0001-Related-rhbz-1039517-ml-short-cut-keys-are-unavailab.patch
 Patch29: 0001-n-839727-Crash-fix.patch
 Patch30: 0001-Related-rhbz-1047871-conditional-formatting-doesn-t-.patch
 Patch31: 0001-fdo-66864-Return-from-full-screen-should-restore-too.patch
+Patch32: 0001-Resolves-rhbz-1050162-don-t-draw-to-NULL-window.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -1063,6 +1064,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch29 -p1 -b .n839727-Crash-fix.patch
 %patch30 -p1 -b .rhbz-1047871-conditional-formatting-doesn-t-.patch
 %patch31 -p1 -b .fdo-66864-Return-from-full-screen-should-restore-too.patch
+%patch32 -p1 -b .Resolves-rhbz-1050162-don-t-draw-to-NULL-window.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english
@@ -2162,6 +2164,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 - split LibreLogo into a separate subpackage
 - create a metapackage depending on all subpackages containing filters,
   for use of packages like unoconv
+- Resolves: rhbz#1050162 don't draw to NULL window
 
 * Thu Jan 23 2014 David Tardon <dtardon at redhat.com> - 1:4.1.4.2-5
 - Related: rhbz#1047017 actually apply the patch