sot/source/base/formats.cxx | 1 + 1 file changed, 1 insertion(+) New commits: commit b5492fe63c1b08af4e47b9b466ae0b81db5bab45 Author: Jan Holesovsky <ke...@collabora.com> AuthorDate: Thu Sep 26 13:35:55 2019 +0200 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Sat Sep 28 21:22:03 2019 +0200
tdf#116685: Make the RICHTEXT take precedence over EMBED_SOURCE. Before this patch, copy in Calc, Paste in Writer produced an embedded sheet. I suspect is it not what the people usually want; working with the embedded sheets in Writer is non-intuitive, I suspect people will be happier with a normal table which they can style etc. appropriately. OTOH - this is a general change, so it might have some unwanted side-effects; let's see what if we get bugreports :-) tdf#127673 was related; but in my view, we shouldn't create the embedded objects in the first place. Change-Id: I73710168d8924fdd6275d65e20cf55f38971a3f9 Reviewed-on: https://gerrit.libreoffice.org/79609 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Andras Timar <andras.ti...@collabora.com> diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx index b3199f39142e..f83d10b663db 100644 --- a/sot/source/base/formats.cxx +++ b/sot/source/base/formats.cxx @@ -895,6 +895,7 @@ SotAction_Impl const aEXCHG_DEST_SWDOC_FREE_AREA_Copy[] = { SotClipboardFormatId::DRAWING, EXCHG_OUT_ACTION_INSERT_DRAWOBJ, SotExchangeActionFlags::InsertImageMap | SotExchangeActionFlags::InsertTargetUrl, 0 }, { SotClipboardFormatId::SVXB, EXCHG_OUT_ACTION_INSERT_SVXB, SotExchangeActionFlags::InsertImageMap | SotExchangeActionFlags::InsertTargetUrl, 0 }, { SotClipboardFormatId::SD_OLE, EXCHG_OUT_ACTION_INSERT_OLE, SotExchangeActionFlags::InsertImageMap | SotExchangeActionFlags::InsertTargetUrl, 0 }, + { SotClipboardFormatId::RICHTEXT, EXCHG_IN_ACTION_COPY, SotExchangeActionFlags::InsertImageMap | SotExchangeActionFlags::InsertTargetUrl, 0 }, { SotClipboardFormatId::EMBED_SOURCE, EXCHG_OUT_ACTION_INSERT_OLE, SotExchangeActionFlags::InsertTargetUrl, 0 }, { SotClipboardFormatId::EMBEDDED_OBJ, EXCHG_OUT_ACTION_INSERT_OLE, SotExchangeActionFlags::InsertTargetUrl, 0 }, #ifndef MACOSX _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits