[Libreoffice-commits] core.git: sd/source

[Tamás Zolnai]

 sd/source/ui/view/sdview4.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 27068e6cc39aed8ebfa5fdd7a67acb89f5adcb89
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
Date:   Sat Sep 2 06:19:05 2017 +0200

    tdf#109261: Crash when adding a video to a slide with zero undo steps
    
    When undo is disabled (no undo steps), ReplaceObjectAtView()
    method frees pPickObj, so we need to save it's reused data first.
    
    Change-Id: Icbc800d4d33cf229006aecde7d62aa2a7ea35879
    Reviewed-on: https://gerrit.libreoffice.org/41822
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index f5fce44dd92c..2435a576972d 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -340,8 +340,12 @@ SdrMediaObj* View::InsertMediaObj( const OUString& rMediaURL, const OUString& rM
     else if( pPV )
     {
         ::tools::Rectangle aRect( rPos, rSize );
+        SdrObjUserCall* pUserCall = nullptr;
         if( pPickObj )
+        {
             aRect = pPickObj->GetLogicRect();
+            pUserCall = pPickObj->GetUserCall(); // ReplaceObjectAtView can free pPickObj
+        }
 
         pNewMediaObj = new SdrMediaObj( aRect );
 
@@ -370,9 +374,9 @@ SdrMediaObj* View::InsertMediaObj( const OUString& rMediaURL, const OUString& rM
 
         if( pPickObj )
         {
-            pNewMediaObj->AdjustToMaxRect( pPickObj->GetLogicRect() );
+            pNewMediaObj->AdjustToMaxRect( aRect );
             if( bIsPres )
-                pNewMediaObj->SetUserCall(pPickObj->GetUserCall());
+                pNewMediaObj->SetUserCall( pUserCall );
         }
     }