[Libreoffice-commits] core.git: Branch 'libreoffice-6-4-1' - svx/source

[Xisco Faulí (via logerrit)]

 svx/source/svdraw/svdxcgv.cxx |   13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

New commits:
commit 25937732b9ef881651611f99d4178e90888642a2
Author:     Xisco Faulí <xiscofauli at libreoffice.org>
AuthorDate: Wed Feb 12 11:51:34 2020 +0100
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Tue Feb 18 10:01:48 2020 +0100

    tdf#130614: Revert "tdf#125520 Fix OLE objects drag&drop with 'Insert as Copy'"
    
    This reverts commit e4cea049c80f4fd6d2a586e73fe9fa08ebd08371.
    
    Change-Id: Ic925cb5660df152208cdc63bfee62d82fe912717
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88493
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit 09e6824bc868990095233825c415556399dd0652)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88500
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    (cherry picked from commit d3e77bd112c3f7084b0dd92c36ff60f1fd1ddc2f)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88502
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index f18d536b7bf2..8fcd742ec71f 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -744,17 +744,8 @@ std::unique_ptr<SdrModel> SdrExchangeView::CreateMarkedObjModel() const
 
         if(nullptr == pNewObj)
         {
-            // not cloned yet
-            if (pObj->GetObjIdentifier() == OBJ_OLE2)
-            {
-                // tdf#125520
-                pNewObj = pObj->CloneSdrObject(pObj->getSdrModelFromSdrObject());
-            }
-            else
-            {
-                // use default way
-                pNewObj = pObj->CloneSdrObject(*pNewModel);
-            }
+            // not cloned yet, use default way
+            pNewObj = pObj->CloneSdrObject(*pNewModel);
         }
 
         if(pNewObj)