forked from amazingfate/loongoffice
347d05edd8
Regression from commit 28d67b792724a23015dec32fb0278b729f676736 (tdf#107776 sw ODF shape import: make is-textbox check more strict, 2019-08-26), the problem was that in case the import side in SdXMLCustomShapeContext expects a fixed "Frame" parent style name, then the export side should go with that name as well. Fix the problem by simplifying XMLShapeExport::collectShapeAutoStyles(), which initially assumed that the string may be localized, so try to look it up: instead just use the fixed string that the import side will look for. This solves all problem which may stem from a parent style name which is non-empty, but other than Frame. Change-Id: I8146440c591d3dd5a904d243d85741d704711e9c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100577 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
42 lines
1.3 KiB
Makefile
42 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/.
|
|
#
|
|
# This file incorporates work covered by the following license notice:
|
|
#
|
|
# Licensed to the Apache Software Foundation (ASF) under one or more
|
|
# contributor license agreements. See the NOTICE file distributed
|
|
# with this work for additional information regarding copyright
|
|
# ownership. The ASF licenses this file to you under the Apache
|
|
# License, Version 2.0 (the "License"); you may not use this file
|
|
# except in compliance with the License. You may obtain a copy of
|
|
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
#
|
|
|
|
$(eval $(call gb_Module_Module,xmloff))
|
|
|
|
$(eval $(call gb_Module_add_targets,xmloff,\
|
|
CustomTarget_generated \
|
|
Library_xo \
|
|
Library_xof \
|
|
Package_dtd \
|
|
))
|
|
|
|
$(eval $(call gb_Module_add_check_targets,xmloff,\
|
|
$(if $(MERGELIBS),, \
|
|
CppunitTest_xmloff_uxmloff) \
|
|
CppunitTest_xmloff_style \
|
|
CppunitTest_xmloff_text \
|
|
CppunitTest_xmloff_draw \
|
|
))
|
|
|
|
$(eval $(call gb_Module_add_subsequentcheck_targets,xmloff,\
|
|
JunitTest_xmloff_unoapi \
|
|
))
|
|
|
|
# vim: set noet sw=4 ts=4:
|