[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sd/source

[Regina Henschel]

 sd/source/ui/view/sdview4.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 04ab3dd01c668890a60773d597304688ccad603a
Author: Regina Henschel <regina at apache.org>
Date:   Thu Jan 8 15:46:16 2015 +0000

    #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.henschel at t-online.de>

diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index 802661d..7cf35e0 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -109,7 +109,11 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction,
 
     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