d477fa8ac1
CppunitTest_sw_ooxmlexport8's testN816593 failed in the
SW_FORCE_FLY_SPLIT=1 case because the re-import of the document merged
two tables into one.
The problem starts earlier, we didn't import the table with a <w:tblpPr>
as a floating table, but we should.
Fix the problem by never going via m_aPendingFloatingTables in the
SW_FORCE_FLY_SPLIT=1 case, since that was only a workaround for layout
limitations. This conditionally reverts commit
78d1f1c283 (fdo#68607 bnc#816593
DomainMapperTableHandler: don't always start a frame, 2013-09-03).
Also add a SwModelTestBase::FlySplitGuard, so it's just a one-liner
change to test the SW_FORCE_FLY_SPLIT=1 case from cppunit. The goal is
to have this on by default once it's mature enough.
Change-Id: I9d94a49f7a0c27dd43e8fd388867c65d6d25f2e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149044
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
71 lines
1.3 KiB
Makefile
71 lines
1.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_Library_Library,swqahelper))
|
|
|
|
$(eval $(call gb_Library_set_include,swqahelper,\
|
|
-I$(SRCDIR)/sw/inc \
|
|
-I$(SRCDIR)/sw/source/core/inc \
|
|
-I$(SRCDIR)/sw/qa/inc \
|
|
$$(INCLUDE) \
|
|
))
|
|
|
|
$(eval $(call gb_Library_use_custom_headers,swqahelper,\
|
|
officecfg/registry \
|
|
))
|
|
|
|
$(eval $(call gb_Library_use_externals,swqahelper, \
|
|
boost_headers \
|
|
cppunit \
|
|
libxml2 \
|
|
))
|
|
|
|
$(eval $(call gb_Library_use_custom_headers,swqahelper,\
|
|
officecfg/registry \
|
|
))
|
|
|
|
$(eval $(call gb_Library_add_defs,swqahelper,\
|
|
-DSWQAHELPER_DLLIMPLEMENTATION \
|
|
))
|
|
|
|
$(eval $(call gb_Library_use_api,swqahelper,\
|
|
udkapi \
|
|
offapi \
|
|
oovbaapi \
|
|
))
|
|
|
|
$(eval $(call gb_Library_use_libraries,swqahelper,\
|
|
comphelper \
|
|
cppu \
|
|
cppuhelper \
|
|
editeng \
|
|
for \
|
|
sal \
|
|
sw \
|
|
sfx \
|
|
sot \
|
|
subsequenttest \
|
|
svl \
|
|
svt \
|
|
svx \
|
|
svxcore \
|
|
test \
|
|
tl \
|
|
unotest \
|
|
utl \
|
|
ucbhelper \
|
|
unotest \
|
|
vcl \
|
|
))
|
|
|
|
$(eval $(call gb_Library_add_exception_objects,swqahelper,\
|
|
sw/qa/unit/swmodeltestbase \
|
|
))
|
|
|
|
# vim: set noet sw=4 ts=4:
|