304cc248f1
Import the bugdoc: we expect just a single page for the 2 paragraphs, but the second paragraph goes to a 2nd page. What seems to happen since commit f86d1482bef285f90079b5130e410646db96cf58 (sw clearing breaks: add DOCX import, 2022-03-08) is that on one hand, SwTextFly::ForEach() ignores wrap-through shapes, but at the same time SwTextFly::GetMaxBottom() did not, and this lead to a loop: the first paragraph kept growing till the shape was shifted to page 2, but then the same first paragraph was reduced to just 2 lines, goto 1. Fix the problem by extending SwTextFly::GetMaxBottom() to also ignore wrap-though shapes: this is the intention, just clearing breaks were not tested with wrap-though wrap mode before. This is a reduced bugdoc, the original one even produced warnings like: warn:legacy.osl:12034:12034:sw/source/core/layout/flowfrm.cxx:2667: <SwFlowFrame::MoveBwd(..)> - layout loop control for layout action <Move Backward> applied! without the fix, and these are now gone. Change-Id: Iaf9849dbf8e1a8e5d625d3c19b99636247804cdd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168239 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
85 lines
2.0 KiB
Makefile
85 lines
2.0 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_text))
|
|
|
|
$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_core_text))
|
|
|
|
$(eval $(call gb_CppunitTest_add_exception_objects,sw_core_text, \
|
|
sw/qa/core/text/frmform \
|
|
sw/qa/core/text/itratr \
|
|
sw/qa/core/text/itrform2 \
|
|
sw/qa/core/text/porlay \
|
|
sw/qa/core/text/porrst \
|
|
sw/qa/core/text/text \
|
|
sw/qa/core/text/txtfly \
|
|
sw/qa/core/text/widorp \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_libraries,sw_core_text, \
|
|
comphelper \
|
|
cppu \
|
|
cppuhelper \
|
|
editeng \
|
|
sal \
|
|
sfx \
|
|
subsequenttest \
|
|
svl \
|
|
sw \
|
|
swqahelper \
|
|
test \
|
|
tl \
|
|
unotest \
|
|
utl \
|
|
vcl \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_externals,sw_core_text,\
|
|
boost_headers \
|
|
libxml2 \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_set_include,sw_core_text,\
|
|
-I$(SRCDIR)/sw/inc \
|
|
-I$(SRCDIR)/sw/source/core/inc \
|
|
-I$(SRCDIR)/sw/source/core/text \
|
|
-I$(SRCDIR)/sw/source/uibase/inc \
|
|
-I$(SRCDIR)/sw/qa/inc \
|
|
$$(INCLUDE) \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_api,sw_core_text,\
|
|
udkapi \
|
|
offapi \
|
|
oovbaapi \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_ure,sw_core_text))
|
|
$(eval $(call gb_CppunitTest_use_vcl,sw_core_text))
|
|
|
|
$(eval $(call gb_CppunitTest_use_rdb,sw_core_text,services))
|
|
|
|
$(eval $(call gb_CppunitTest_use_custom_headers,sw_core_text,\
|
|
officecfg/registry \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_configuration,sw_core_text))
|
|
|
|
$(eval $(call gb_CppunitTest_use_uiconfigs,sw_core_text, \
|
|
modules/swriter \
|
|
sfx \
|
|
svt \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_more_fonts,sw_core_text))
|
|
|
|
# vim: set noet sw=4 ts=4:
|