diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-03-29 18:27:13 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-03-29 19:28:11 +0200 |
| commit | 29d4ecf32392bc94ab0ba9e73fd79eba65c23fdb (patch) | |
| tree | a6f88f801f0857063820b7f39a894f10d64fee7b /sot/CppunitTest_sot_test_sot.mk | |
| parent | d7a8fa7adf2b2b098a1e38cd7002c928d015b489 (diff) | |
tdf#115574 sot: fix Excel -> Writer paste
Reported problem is that nothing happens for paste. Direct cause is that
BITMAP is selected as the format, and Excel advertises BITMAP, but when
we try to import that, it fails. There are 3 interesting commits in the
recent history for this topic:
- commit c47db038f98aaf7aec3cbe57c4e5683591afa23e (fdo#52547 SOT: Prefer
embedding image data to embedding linked image., 2014-02-07) was a
bugfix due to newer firefox
- commit 538c13f3d1756f2d105115f64ab1bc0b7426eebc (fdo#78801 fdo#52547
Paste preference is image, then html, then text., 2014-05-28) was a
regression fix from the previous fix
- commit a96a7ce51aa98fb9ee97ea3803e2b7e648611008 (fdo#81835 Don't
prefer GDI Metafiles to RTF/HTML, 2014-08-05), was a regression fix
from the previous fixes
Going back to the original state shows that the Excel -> Writer use-case
used to be RTF.
Restore the old Excel -> Writer (RTF) behavior by:
- going back to the original state, ignoring the enum class conversions
- re-fix fdo#52547: prefer bitmap over html, but leave everything else
unchanged
- fdo#78801 needs no fix in this case
- fdo#81835 needs no fix in this case
- tdf#115574 selects RTF -> table shows up
After all these complications, the actual fix is surprisingly simple.
Change-Id: I2d728afa7d1dd7888fa43525366c197d806eea6c
Reviewed-on: https://gerrit.libreoffice.org/52120
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sot/CppunitTest_sot_test_sot.mk')
| -rw-r--r-- | sot/CppunitTest_sot_test_sot.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sot/CppunitTest_sot_test_sot.mk b/sot/CppunitTest_sot_test_sot.mk index 7fb75975f1b4..1f550759d86d 100644 --- a/sot/CppunitTest_sot_test_sot.mk +++ b/sot/CppunitTest_sot_test_sot.mk @@ -25,6 +25,11 @@ $(eval $(call gb_CppunitTest_use_libraries,sot_test_sot, \ unotest \ )) +$(eval $(call gb_CppunitTest_set_include,sot_test_sot,\ + -I$(SRCDIR)/sot/inc \ + $$(INCLUDE) \ +)) + $(eval $(call gb_CppunitTest_use_sdk_api,sot_test_sot,)) $(eval $(call gb_CppunitTest_use_ure,sot_test_sot)) |