[libreoffice/f21] Resolves: rhbz#1165444 abrt crash with NULL pView

[Caolán McNamara]

commit 737101b029275672f79254d016dceaff2bc49248
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 27 15:28:01 2014 +0000

    Resolves: rhbz#1165444 abrt crash with NULL pView

 ...s-rhbz-1165444-abrt-crash-with-NULL-pView.patch |   32 ++++++++++++++++++++
 libreoffice.spec                                   |    4 ++-
 2 files changed, 35 insertions(+), 1 deletions(-)
---
diff --git a/0001-Resolves-rhbz-1165444-abrt-crash-with-NULL-pView.patch b/0001-Resolves-rhbz-1165444-abrt-crash-with-NULL-pView.patch
new file mode 100644
index 0000000..9c51e09
--- /dev/null
+++ b/0001-Resolves-rhbz-1165444-abrt-crash-with-NULL-pView.patch
@@ -0,0 +1,32 @@
+From 755209d88073fd497b884b8de1348ec75c2df7eb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Wed, 19 Nov 2014 16:39:55 +0000
+Subject: [PATCH] Resolves: rhbz#1165444 abrt crash with NULL pView
+
+Change-Id: I37f02f16209f274cf0358defba6bfa109948990f
+---
+ sc/source/ui/view/gridwin.cxx | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
+index e8defd1..7b27f0c 100644
+--- a/sc/source/ui/view/gridwin.cxx
++++ b/sc/source/ui/view/gridwin.cxx
+@@ -5183,12 +5183,9 @@ bool ScGridWindow::GetEditUrl( const Point& rPos,
+     ScInputHandler* pInputHdl = NULL;
+     if (pViewSh)
+         pInputHdl = pViewSh->GetInputHandler();
+-
+-    if (pInputHdl && pInputHdl->IsInputMode())
+-    {
+-        EditView* pView = pInputHdl->GetTableView();
++    EditView* pView = (pInputHdl && pInputHdl->IsInputMode()) ? pInputHdl->GetTableView() : NULL;
++    if (pView)
+         return extractURLInfo(pView->GetFieldUnderMousePointer(), pName, pUrl, pTarget);
+-    }
+ 
+     //! nPosX/Y mit uebergeben?
+     SCsCOL nPosX;
+-- 
+1.9.3
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 5def414..3292d17 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -360,6 +360,7 @@ Patch53: 0001-Resolves-fdo-86466-Wrong-background-color-shown-in-f.patch
 Patch54: 0001-rhbz-1167250-Avoid-X11Clipboard-already-being-destro.patch
 Patch55: 0001-Revert-Resolves-i63015-always-default-to-WinAnsiEnco.patch
 Patch56: 0001-Resolves-fdo-84043-don-t-create-duplicate-Mirrored-X.patch
+Patch57: 0001-Resolves-rhbz-1165444-abrt-crash-with-NULL-pView.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -2330,8 +2331,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
-* Thu Nov 27 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.3.4.1-8.unbuilt
+* Thu Nov 27 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.3.4.1-8
 - Resolves: fdo#84043 don't create duplicate Mirrored props
+- Resolves: rhbz#1165444 abrt crash with NULL pView
 
 * Tue Nov 25 2014 Stephan Bergmann <sbergman at redhat.com>  - 1:4.3.4.1-7
 - Resolves: fdo#1167250 Crash in clipboard code