summaryrefslogtreecommitdiff
path: root/sd/qa/unit
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2020-08-03 21:03:43 +0200
committerMiklos Vajna <vmiklos@collabora.com>2020-08-06 09:33:34 +0200
commit1e93cdd1e29b82eb5bd01a12eb5d564f3b6953ac (patch)
tree861b6d899630ba7066f8f0178ca0e4dfbe23c2f4 /sd/qa/unit
parent8c653a9badf2b3383215ac5cfd2630a7af1853e7 (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. (cherry picked from commit 790ab54d7232d232ba84f17f285d4639ddba80d5) Change-Id: Ibe631ac5d94c1c7795dd00bad05fdcca0e6741a8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100198 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sd/qa/unit')
0 files changed, 0 insertions, 0 deletions