fd18d12efd
Regression from commit 28d67b7927
(tdf#107776 sw ODF shape import: make is-textbox check more strict,
2019-08-26), now that we correctly identify what shape text to import as
"textbox" (Writer TextFrame) and what to import as editeng text, there
are documents out there that try to import mailmerge fields into
editeng-based shape text. Fix missing error handling there.
Note that the error is not just silently ignored, we do insert the field
result into the shape text, existing code provides this already.
Change-Id: Ibe631ac5d94c1c7795dd00bad05fdcca0e6741a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100028
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
40 lines
1.3 KiB
Makefile
40 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 \
|
|
))
|
|
|
|
$(eval $(call gb_Module_add_subsequentcheck_targets,xmloff,\
|
|
JunitTest_xmloff_unoapi \
|
|
))
|
|
|
|
# vim: set noet sw=4 ts=4:
|