sc/source/ui/view/gridwin.cxx | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
New commits:
commit f66fa733ffcf58f86a0100be89c5ed14600cca12
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Nov 19 16:39:55 2014 +0000
Resolves: rhbz#1165444 abrt crash with NULL pView
Change-Id: I37f02f16209f274cf0358defba6bfa109948990f
(cherry picked from commit 755209d88073fd497b884b8de1348ec75c2df7eb)
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 4121f7d..942f142 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
