summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2019-09-26 13:35:55 +0200
committerJan Holesovsky <kendy@collabora.com>2019-09-27 09:54:06 +0200
commite9e6d4b058e13165f3dde1ca7822eec97dfe8aa7 (patch)
treedea7babee79d1acbf34ab8e81fed5aa355cf060b
parentffa97dfc53ef902fe478f264c51989bd4c4434d1 (diff)
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/79606 Tested-by: Jenkins Reviewed-by: Jan Holesovsky <kendy@collabora.com>
-rw-r--r--sot/source/base/formats.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index d26521fd31e8..51c6b157496f 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.cxx
@@ -894,6 +894,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