[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sd/source
Michael Meeks
michael at kemper.freedesktop.org
Mon Sep 19 03:52:51 PDT 2011
sd/source/ui/view/sdview4.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 20140491c901db50783e4f515fae38af7215af7f
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date: Mon Sep 19 11:52:28 2011 +0100
fdo#38391: don't crash while dropping texture
Signed-off-by: Michael Meeks <michael.meeks at novell.com>
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index f63c3d1..834ff6d 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -117,7 +117,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction,
if( mnAction == DND_ACTION_LINK && pPickObj && pPV )
{
const bool bIsGraphic = pPickObj->ISA( SdrGrafObj );
- if( bIsGraphic || (pObj->IsEmptyPresObj() && !bOnMaster) )
+ if( bIsGraphic || (pObj && pObj->IsEmptyPresObj() && !bOnMaster) )
{
if( IsUndoEnabled() )
BegUndo(String(SdResId(STR_INSERTGRAPHIC)));
More information about the Libreoffice-commits
mailing list