rpms/libreoffice
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: rhbz#1165444 abrt crash with NULL pView

Browse Source
This commit is contained in:
Caolán McNamara 2014-11-27 15:24:36 +00:00
parent 81f6454420
commit 26feda31a0
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
0001-Resolves-rhbz-1165444-abrt-crash-with-NULL-pView.patch Normal file
View File

@ -0,0 +1,32 @@
From 755209d88073fd497b884b8de1348ec75c2df7eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@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

6
libreoffice.spec
View File

@ -46,7 +46,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.0
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 and CC0
Group: Applications/Productivity
URL: http://www.libreoffice.org/
@ -325,6 +325,7 @@ Patch17: 0001-Resolves-fdo-37559-revert-adding-extra-dummy-polygon.patch
Patch18: 0001-Resolves-fdo-86466-Wrong-background-color-shown-in-f.patch
Patch19: 0001-Revert-Resolves-i63015-always-default-to-WinAnsiEnco.patch
Patch20: 0001-Resolves-fdo-84043-don-t-create-duplicate-Mirrored-X.patch
Patch21: 0001-Resolves-rhbz-1165444-abrt-crash-with-NULL-pView.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/libreoffice
@ -2284,6 +2285,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif
%changelog
* Thu Nov 27 2014 Caolán McNamara <caolanm@redhat.com> - 1:4.4.0.0-3.beta1
- Resolves: rhbz#1165444 abrt crash with NULL pView
* Thu Nov 27 2014 Marek Kasik <mkasik@redhat.com> - 1:4.4.0.0-2.beta1
- Rebuild (poppler-0.28.1)