commit 25937732b9ef881651611f99d4178e90888642a2
author Xisco Faulí <xiscofauli@libreoffice.org> Wed Feb 12 11:51:34 2020 +0100
committer Xisco Faulí <xiscofauli@libreoffice.org> Tue Feb 18 10:01:48 2020 +0100
tree ff72355837509cb7c9fe68af6e94df2d32065600
parent 1756130377524734cbc22927176e6de1cd5f8f91

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@CIB.de>
(cherry picked from commit 09e6824bc868990095233825c415556399dd0652)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88500
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
(cherry picked from commit d3e77bd112c3f7084b0dd92c36ff60f1fd1ddc2f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88502
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>

svx/source/svdraw/svdxcgv.cxx

diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index f18d536..8fcd742 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)