[libreoffice] Resolves: rhbz#993963 NULL m_pWindow on firefox close plugin window

[Caolán McNamara]

commit 0fbb140a21c473dd00da0cb45dee72cf16737977
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 3 12:31:12 2013 +0100

    Resolves: rhbz#993963 NULL m_pWindow on firefox close plugin window

 ...bz-993963-NULL-m_pWindow-on-firefox-delet.patch |   27 ++++++++++++++++++++
 libreoffice.spec                                   |    7 ++++-
 2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/0001-Resolves-rhbz-993963-NULL-m_pWindow-on-firefox-delet.patch b/0001-Resolves-rhbz-993963-NULL-m_pWindow-on-firefox-delet.patch
new file mode 100644
index 0000000..6494d9a
--- /dev/null
+++ b/0001-Resolves-rhbz-993963-NULL-m_pWindow-on-firefox-delet.patch
@@ -0,0 +1,27 @@
+From 4a4ed52e57b540167c3ca45e6e762b9e21e874de Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Tue, 3 Sep 2013 12:24:34 +0100
+Subject: [PATCH] Resolves: rhbz#993963 NULL m_pWindow on firefox deleted
+ plugin
+
+Change-Id: Idb12b12e4313668bf3390a97551c688ee0dcde67
+---
+ vcl/unx/gtk/window/gtksalframe.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
+index 7c4ddfb..44d894d 100644
+--- a/vcl/unx/gtk/window/gtksalframe.cxx
++++ b/vcl/unx/gtk/window/gtksalframe.cxx
+@@ -2842,7 +2842,7 @@ void GtkSalFrame::SetParent( SalFrame* pNewParent )
+ 
+ void GtkSalFrame::createNewWindow( XLIB_Window aNewParent, bool bXEmbed, SalX11Screen nXScreen )
+ {
+-    bool bWasVisible = IS_WIDGET_MAPPED(m_pWindow);
++    bool bWasVisible = m_pWindow ? IS_WIDGET_MAPPED(m_pWindow) : false;
+     if( bWasVisible )
+         Show( sal_False );
+ 
+-- 
+1.8.3.1
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 8c27864..5818f82 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -43,7 +43,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        2%{?libo_prerelease}%{?dist}
+Release:        3%{?libo_prerelease}%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0
 Group:          Applications/Productivity
 URL:            http://www.libreoffice.org/default/
@@ -259,6 +259,7 @@ Patch18: 0001-Always-try-to-mount-in-gio-Content-getGFileInfo.patch
 Patch19: 0001-Resolves-rhbz-998046-store-last-size-position-of-the.patch
 Patch20: 0001-Make-charmap.cxx-compile-with-icu-4.4.patch
 Patch21: 0001-rhbz-1000150-Do-not-call-exit-upon-XIOError.patch
+Patch22: 0001-Resolves-rhbz-993963-NULL-m_pWindow-on-firefox-delet.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -1012,6 +1013,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch19 -p1 -b .rhbz-998046-store-last-size-position-of-the.patch
 %patch20 -p1 -b .Make-charmap.cxx-compile-with-icu-4.4.patch
 %patch21 -p1 -b .rhbz-1000150-Do-not-call-exit-upon-XIOError.patch
+%patch22 -p1 -b .rhbz-993963-NULL-m_pWindow-on-firefox-delet.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english
@@ -2106,6 +2108,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Tue Sep 03 2013 Caolán McNamara <caolanm at redhat.com> - 1:4.1.1.2-3
+- Resolves: rhbz#993963 NULL m_pWindow on firefox close plugin window
+
 * Fri Aug 23 2013 Stephan Bergmann <sbergman at redhat.com> - 1:4.1.1.2-2
 - Resolves: rhbz#1000150, Do not call exit upon XIOError