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

Samuel Mehrbrodt Samuel.Mehrbrodt at cib.de
Fri Nov 11 15:42:33 UTC 2016


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

New commits:
commit f908ec9c2230a65db309fe5ed3e43390d72bbe51
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Fri Nov 11 14:47:11 2016 +0100

    tdf#98059 Don't replace existing objects when inserting media
    
    Change-Id: I849e6801a20fcd3fb10482854e56923f99060f04
    Reviewed-on: https://gerrit.libreoffice.org/30776
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index 756f2ff..7782139 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -329,12 +329,6 @@ SdrMediaObj* View::InsertMediaObj( const OUString& rMediaURL, const OUString& rM
             pPV = nullptr;
     }
 
-    if( !pPickObj && pPV )
-    {
-        SdrPageView* pPageView = pPV;
-        PickObj(rPos, getHitTolLog(), pPickObj, pPageView);
-    }
-
     if( mnAction == DND_ACTION_LINK && pPickObj && pPV && dynamic_cast< SdrMediaObj *>( pPickObj ) !=  nullptr )
     {
         pNewMediaObj = static_cast< SdrMediaObj* >( pPickObj->Clone() );


More information about the Libreoffice-commits mailing list