diff options
| author | Xisco Faulí <xiscofauli@libreoffice.org> | 2020-02-12 11:51:34 +0100 |
|---|---|---|
| committer | Xisco Faulí <xiscofauli@libreoffice.org> | 2020-02-13 07:41:21 +0100 |
| commit | d3e77bd112c3f7084b0dd92c36ff60f1fd1ddc2f (patch) | |
| tree | 5bb4e2fd6bf4b4c8972aaaaf35b8aaf97f89373c /svx | |
| parent | c9605cc66bcc655f3d7c8f3264efa691de42aed5 (diff) | |
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>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdxcgv.cxx | 13 |
1 files changed, 2 insertions, 11 deletions
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) |