200cd2b99b
Regression from commit d379d18666 (oox:
import WPS shape with text as shape with textbox, 2014-06-18), the
problem was that a textbox's shape + textframe are internally 2 sdr
objects, so once GraphicZOrderHelper knows the current shape should be
on top of a shape+frame pair, it should suggest a larger ZOrder.
This is necessary till there is no setter version of
SwTextBoxHelper::getOrdNum(), which would allow import filters to ignore
this complexity, but that would be a larger change.
Change-Id: Ibbb1bcd9301eb369f25f211120f62be7c59b0fd2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109111
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
75 lines
1.8 KiB
Makefile
75 lines
1.8 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_doc))
|
|
|
|
$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_core_doc))
|
|
|
|
$(eval $(call gb_CppunitTest_add_exception_objects,sw_core_doc, \
|
|
sw/qa/core/doc/doc \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_libraries,sw_core_doc, \
|
|
comphelper \
|
|
cppu \
|
|
cppuhelper \
|
|
editeng \
|
|
sal \
|
|
sfx \
|
|
svxcore \
|
|
sw \
|
|
swqahelper \
|
|
test \
|
|
unotest \
|
|
utl \
|
|
vcl \
|
|
svt \
|
|
tl \
|
|
svl \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_externals,sw_core_doc,\
|
|
boost_headers \
|
|
libxml2 \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_set_include,sw_core_doc,\
|
|
-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_doc,\
|
|
udkapi \
|
|
offapi \
|
|
oovbaapi \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_ure,sw_core_doc))
|
|
$(eval $(call gb_CppunitTest_use_vcl,sw_core_doc))
|
|
|
|
$(eval $(call gb_CppunitTest_use_rdb,sw_core_doc,services))
|
|
|
|
$(eval $(call gb_CppunitTest_use_custom_headers,sw_core_doc,\
|
|
officecfg/registry \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_configuration,sw_core_doc))
|
|
|
|
$(eval $(call gb_CppunitTest_use_uiconfigs,sw_core_doc, \
|
|
modules/swriter \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_more_fonts,sw_core_doc))
|
|
|
|
# vim: set noet sw=4 ts=4:
|