5960c6f4ca
Commit 3272c1eb55 (related tdf#100074:
prepare group shapes text input via writerfilter, 2018-10-01) tweaked
the oox code, so that later it'll be able to call back to writerfilter
to parse group shape text. That makes sense, but it also removed the
reset of the group shape context, which means that two subsequent group
shapes are now imported as a single group shape with a merged child
list.
Reset the group shape context again when writerfilter asks for the
XShape from oox. If this causes a problem for the above scenario later,
then it could be considered to handle this in
ShapeContextHandler::endFastElement().
Change-Id: I14f7f0bab2c66c8430313d5b2daffe3160a58c27
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86712
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
45 lines
1.2 KiB
Makefile
45 lines
1.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,oox_shape))
|
|
|
|
$(eval $(call gb_CppunitTest_use_externals,oox_shape,\
|
|
boost_headers \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_add_exception_objects,oox_shape, \
|
|
oox/qa/unit/shape \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_libraries,oox_shape, \
|
|
comphelper \
|
|
cppu \
|
|
oox \
|
|
sal \
|
|
test \
|
|
unotest \
|
|
utl \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_sdk_api,oox_shape))
|
|
|
|
$(eval $(call gb_CppunitTest_use_ure,oox_shape))
|
|
$(eval $(call gb_CppunitTest_use_vcl,oox_shape))
|
|
|
|
$(eval $(call gb_CppunitTest_use_rdb,oox_shape,services))
|
|
|
|
$(eval $(call gb_CppunitTest_use_custom_headers,oox_shape,\
|
|
officecfg/registry \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_configuration,oox_shape))
|
|
|
|
# vim: set noet sw=4 ts=4:
|