1d9221ebc8
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
489eef894e (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>
81 lines
2 KiB
Makefile
81 lines
2 KiB
Makefile
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
|
#*************************************************************************
|
|
#
|
|
# This file is part of the LibreOffice project.
|
|
#
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
#
|
|
#*************************************************************************
|
|
|
|
$(eval $(call gb_CppunitTest_CppunitTest,sw_core_layout))
|
|
|
|
$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_core_layout))
|
|
|
|
$(eval $(call gb_CppunitTest_add_exception_objects,sw_core_layout, \
|
|
sw/qa/core/layout/layout \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_libraries,sw_core_layout, \
|
|
editeng \
|
|
comphelper \
|
|
cppu \
|
|
cppuhelper \
|
|
sal \
|
|
sfx \
|
|
subsequenttest \
|
|
sw \
|
|
swqahelper \
|
|
test \
|
|
unotest \
|
|
utl \
|
|
vcl \
|
|
svt \
|
|
tl \
|
|
svl \
|
|
svxcore \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_externals,sw_core_layout,\
|
|
boost_headers \
|
|
libxml2 \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_set_include,sw_core_layout,\
|
|
-I$(SRCDIR)/sw/inc \
|
|
-I$(SRCDIR)/sw/source/core/inc \
|
|
-I$(SRCDIR)/sw/source/uibase/inc \
|
|
-I$(SRCDIR)/sw/qa/inc \
|
|
$$(INCLUDE) \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_api,sw_core_layout,\
|
|
udkapi \
|
|
offapi \
|
|
oovbaapi \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_ure,sw_core_layout))
|
|
$(eval $(call gb_CppunitTest_use_vcl,sw_core_layout))
|
|
|
|
$(eval $(call gb_CppunitTest_use_rdb,sw_core_layout,services))
|
|
|
|
$(eval $(call gb_CppunitTest_use_custom_headers,sw_core_layout,\
|
|
officecfg/registry \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_configuration,sw_core_layout))
|
|
|
|
$(eval $(call gb_CppunitTest_use_uiconfigs,sw_core_layout, \
|
|
modules/swriter \
|
|
svt \
|
|
svx \
|
|
))
|
|
|
|
# assert if font/glyph fallback occurs
|
|
$(eval $(call gb_CppunitTest_set_non_application_font_use,sw_core_layout,abort))
|
|
|
|
$(eval $(call gb_CppunitTest_use_more_fonts,sw_core_layout))
|
|
|
|
# vim: set noet sw=4 ts=4:
|