summaryrefslogtreecommitdiff
path: root/sfx2/source/doc/docfile
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2025-05-21 09:16:38 +0200
committerMiklos Vajna <vmiklos@collabora.com>2025-05-21 13:44:03 +0200
commit08acfb815745e7f43ca43557feefcb68607d26c1 (patch)
tree5a2a9f985054b9d0e1bf4a865c5aac927ce8f776 /sfx2/source/doc/docfile
parentb96aedb6f4a830c9b61f103dbbe71f491dca1d70 (diff)
tdf#166319 sw interdependent redlines: handle ODF import of delete under formatHEADmaster
The bugdoc has <del>AA<format>BB</format>CC</del> in it, ODT import created a model that contains <del>AACC</del> instead, i.e. the format-on-delete part was lost. The first problem was that XMLRedlineImportHelper::ConvertRedline() rejected the format-on-delete, fixing the used CanCombineTypesForImport() resulted in a format-on-delete redline that was in the document, but the order was wrong: BBAACC (matching the order in the file, since deletions are listed separately, before the body text). The second problem was that XMLRedlineImportHelper::InsertIntoDocument() didn't consider format-on-delete when it looked for deletions: fixing that results in the wanted AABBCC string in the document model. With this, the ODF import/export for ins-then-del, ins-then-fmt & del-then-fmt should work. Change-Id: I7bcdd4d7452d9bca0ff31ce99cbc29795eb63fa5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185592 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
Diffstat (limited to 'sfx2/source/doc/docfile')
0 files changed, 0 insertions, 0 deletions