diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2022-11-29 21:20:50 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2022-11-30 08:10:15 +0100 |
commit | 1d9221ebc86f2696a65c12287ea19eea44d680cf (patch) | |
tree | aca6f6ffae28c5b0ea8b807cb90c5b01c33280b0 /sw/CppunitTest_sw_core_layout.mk | |
parent | dda4867a0b5a2d29d8a01a3656e0c8dac7626d2f (diff) |
tdf#124601 sw: fix misplaced images in table cells
The bugdoc had a table with anchored images which were
FollowTextFlow=true and WrapThrough=true. This used to still make the
table cell larger, but instead the images were overlapping due to the
not increased cell height.
The problem happens since commit
489eef894e7034873ad262f9dfca554022db1b09 (tdf#124601 sw FollowTextFlow:
fix vert pos of objects outside the current cell, 2019-10-01), which
wanted to ignore anchored images in a similar situation.
Fix the problem by making the "ignore image for cell height calculation"
condition more strict: if we also require wrapping in background, then
the old bugdoc keeps working but this fixes the new bugdoc.
Also change the font name in lcl_PaintReplacement() to a font that we
bundle, otherwise the testcase would abort in
psp::PrintFontManager::Substitute() for a document that doesn't specify
any font name explicitly.
Change-Id: Ie512aa4ffd368774825c5243ecd6bce7f09e1442
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143472
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sw/CppunitTest_sw_core_layout.mk')
-rw-r--r-- | sw/CppunitTest_sw_core_layout.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sw/CppunitTest_sw_core_layout.mk b/sw/CppunitTest_sw_core_layout.mk index 3eba80b2ddd7..9a7a4710dfb7 100644 --- a/sw/CppunitTest_sw_core_layout.mk +++ b/sw/CppunitTest_sw_core_layout.mk @@ -18,6 +18,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_core_layout, \ )) $(eval $(call gb_CppunitTest_use_libraries,sw_core_layout, \ + editeng \ comphelper \ cppu \ cppuhelper \ |