Author: regina
Date: Thu Jan 8 15:46:16 2015
New Revision: 1650314
URL: http://svn.apache.org/r1650314
Log:
#i125613# Insert Picture from file do not work
The patch restores the behavior, that Insert from file replaces the empty
outline object in Impress
Patch by:Regina Henschel <rb.hensc...@t-online.de>
Modified:
openoffice/trunk/main/sd/source/ui/view/sdview4.cxx
Modified: openoffice/trunk/main/sd/source/ui/view/sdview4.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sd/source/ui/view/sdview4.cxx?rev=1650314&r1=1650313&r2=1650314&view=diff
==============================================================================
--- openoffice/trunk/main/sd/source/ui/view/sdview4.cxx (original)
+++ openoffice/trunk/main/sd/source/ui/view/sdview4.cxx Thu Jan 8 15:46:16 2015
@@ -109,7 +109,11 @@ SdrGrafObj* View::InsertGraphic( const G
const bool bIsGraphic(0 != dynamic_cast< SdrGrafObj* >(pPickObj));
- if(pPickObj && !bIsGraphic && pPickObj->IsClosedObj() && !dynamic_cast<
SdrOle2Obj* >(pPickObj))
+ if(pPickObj
+ && !bIsGraphic
+ && !(pPickObj->IsEmptyPresObj() )
+ && pPickObj->IsClosedObj()
+ && !dynamic_cast< SdrOle2Obj* >(pPickObj))
{
// fill style change (fill object with graphic), independent of
mnAction
// and thus of DND_ACTION_LINK or DND_ACTION_MOVE
