diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2020-04-22 16:25:51 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-04-22 20:08:20 +0200 |
| commit | 8ad0c29f56e5069a3679560d404b603332dcf38a (patch) | |
| tree | cb8c011fee039d8c27eb1de849071faa3fe02640 /sw/Module_sw.mk | |
| parent | 688a520111a2dd3ab4cb3b846b561936d8a887bf (diff) | |
sw: prefer ODF over RTF when pasting from Writer
Regression from commit e9e6d4b058e13165f3dde1ca7822eec97dfe8aa7
(tdf#116685: Make the RICHTEXT take precedence over EMBED_SOURCE.,
2019-09-26), the problem was that now we always prefer RTF over ODF when
pasting into Writer. The commit made sense for Calc->Writer paste, but
it causes formatting loss for Writer -> Writer paste.
The exact use-case was copy&paste of numberings where the pasted content
got paragraph indent as direct formatting, so shift-tab at the paragraph
start changed only the bullet type, not the indentation -- but it's easy
to imagine several other cases where a roundtrip via ODF provides better
results than RTF.
Fix the problem by leaving the above commit in place, but extending
SwTransferable::Paste() so that it prefers ODF over RTF in case of a
Writer->Writer paste (and leaves the non-Writer -> Writer paste behavior
unchanged to avoid the unwanted OLE objects).
Change-Id: Ida745bba65c5a210021cea0d267c02900fc6398a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92705
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'sw/Module_sw.mk')
| -rw-r--r-- | sw/Module_sw.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk index 980f60d7a615..0a8ed36b4b7e 100644 --- a/sw/Module_sw.mk +++ b/sw/Module_sw.mk @@ -108,6 +108,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\ CppunitTest_sw_core_text \ CppunitTest_sw_core_doc \ CppunitTest_sw_uibase_shells \ + CppunitTest_sw_uibase_dochdl \ CppunitTest_sw_core_accessibilitycheck \ CppunitTest_sw_core_layout \ CppunitTest_sw_core_frmedt \ |