svx/source/svdraw/svdxcgv.cxx | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
New commits:
commit e4cea049c80f4fd6d2a586e73fe9fa08ebd08371
Author: Andrés Maldonado <amaldon...@linagora.com>
AuthorDate: Fri May 24 17:59:13 2019 +0200
Commit: Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Sun Sep 8 02:21:36 2019 +0200
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.behr...@cib.de>
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)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
