summaryrefslogtreecommitdiff
path: root/xmloff/qa/unit/data
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2020-08-03 21:03:43 +0200
committerMiklos Vajna <vmiklos@collabora.com>2020-08-04 07:56:17 +0200
commitfd18d12efdfbe0e26d41d733edc711d0f40a7804 (patch)
tree2252f12dbddac6d7284468a4a0e19af362c53881 /xmloff/qa/unit/data
parent750a6bddf16a2e85555ae3859bf5facfd8cff955 (diff)
tdf#130707 xmloff: survive <text:database-display> in editeng text
Regression from commit 28d67b792724a23015dec32fb0278b729f676736 (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>
Diffstat (limited to 'xmloff/qa/unit/data')
-rw-r--r--xmloff/qa/unit/data/mail-merge-editeng.odtbin0 -> 9382 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/xmloff/qa/unit/data/mail-merge-editeng.odt b/xmloff/qa/unit/data/mail-merge-editeng.odt
new file mode 100644
index 000000000000..e6466e44e01e
--- /dev/null
+++ b/xmloff/qa/unit/data/mail-merge-editeng.odt
Binary files differ