c8549fa320
Load the bugdoc, notice that the only shape in the document has a captured (inside the page frame) draw shape, but its inner fly frame is not captured inside the page frame, so a small top margin is paired with a larger right margin, which is unexpected. This is nominally a regression from commit9835a5823e(sw textboxes: reimplement ODF import/export, 2014-10-04), because previously the ODF markup for Writer TextBoxes were ignored, so we had correct position of the shape text at the price of losing complex content. Fix the problem similar to what commita0b6587c4a(tdf#161199 sw DoNotCaptureDrawObjsOnPage: capture wrap=none draw objects, 2024-06-13) did: if we detect that the fly frame is part of a TextBox, then work with the wrap type of the draw format, since these inner fly frames always have their wrap type set to "through". This fixes the unexpected position of the fly frame and keeps the import of complex content working. Change-Id: Ib0d861af0fac74d93a09178c10bc19a1b45e3ce7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174987 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
93 lines
2.3 KiB
Makefile
93 lines
2.3 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/anchoredobject \
|
|
sw/qa/core/layout/calcmove \
|
|
sw/qa/core/layout/fly \
|
|
sw/qa/core/layout/flycnt \
|
|
sw/qa/core/layout/frmtool \
|
|
sw/qa/core/layout/ftnfrm \
|
|
sw/qa/core/layout/layact \
|
|
sw/qa/core/layout/layout \
|
|
sw/qa/core/layout/paintfrm \
|
|
sw/qa/core/layout/sortedobjs \
|
|
sw/qa/core/layout/tabfrm \
|
|
sw/qa/core/layout/trvlfrm \
|
|
))
|
|
|
|
$(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 \
|
|
sfx \
|
|
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:
|