diff options
| author | Andrés Maldonado <amaldonado@linagora.com> | 2019-05-24 17:59:13 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2019-09-08 02:21:36 +0200 |
| commit | e4cea049c80f4fd6d2a586e73fe9fa08ebd08371 (patch) | |
| tree | 4a6a69390383a03b2f7d527acdaa7613834fc5be /svx | |
| parent | 294222866f4d39e200cf365bac77de76b2ae9841 (diff) | |
tdf#125520 Fix OLE objects drag&drop with 'Insert as Copy'
Change-Id: Ia4e6038c95d1388bdf7f9984b7cf4a69aead87a1
Reviewed-on: https://gerrit.libreoffice.org/73026
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdxcgv.cxx | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index 31d4cf2163f0..a65d38c8738d 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -743,8 +743,17 @@ std::unique_ptr<SdrModel> SdrExchangeView::CreateMarkedObjModel() const if(nullptr == pNewObj) { - // not cloned yet, use default way - pNewObj = pObj->CloneSdrObject(*pNewModel); + // not cloned yet + if (pObj->GetObjIdentifier() == OBJ_OLE2) + { + // tdf#125520 + pNewObj = pObj->CloneSdrObject(pObj->getSdrModelFromSdrObject()); + } + else + { + // use default way + pNewObj = pObj->CloneSdrObject(*pNewModel); + } } if(pNewObj) |