summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-11-19 16:39:55 +0000
committerAndras Timar <andras.timar@collabora.com>2014-11-28 10:23:19 +0100
commitf66fa733ffcf58f86a0100be89c5ed14600cca12 (patch)
tree7cdd3ea4fd000d9b2dc75810168548c0af47451c
parentd3269c49fc685c342b3baa128667c77dd782e81b (diff)
Resolves: rhbz#1165444 abrt crash with NULL pView
Change-Id: I37f02f16209f274cf0358defba6bfa109948990f (cherry picked from commit 755209d88073fd497b884b8de1348ec75c2df7eb)
-rw-r--r--sc/source/ui/view/gridwin.cxx7
1 files changed, 2 insertions, 5 deletions
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 4121f7db9b54..942f142d2f90 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5262,12 +5262,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;