diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2022-06-27 19:45:53 +0200 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2022-07-11 16:34:29 +0200 |
| commit | 62fe215562fd853459e5cf7bfba7f51cb7b3df53 (patch) | |
| tree | bb5f5da9b8974484a2a2cfb8dd782805c2f43caf /schema | |
| parent | 6e23b10bba885a6ee766c5e1ad458c95d2087ad4 (diff) | |
xmloff, sw: ODF import/export of fieldmark separator
Previously there were only the fieldmark-start and fieldmark-end
elements; now add a fieldmark-separator, so that the field command can
be stored as character data (and elements if there is any formatting)
instead of attribute value.
The import is a bit more complicated because there are already existing
documents that are missing the separator; it's not possible to predict
if there will be a separator at the time when the start element is seen,
so add some hack to toggle inserting the SwXFieldmark with separator
at the end (when the document contains a separator, i.e. after the
command) or separator at the start (when the document is missing a
separator, i.e. after the result).
Change-Id: I14d2f50f57d690e75643df5d14fd881ebc759a41
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136513
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 463178fef5c22f1a04d10e54491852d56e2038b0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136915
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Diffstat (limited to 'schema')
| -rw-r--r-- | schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng index 9d84b4ee2343..b6cf6ac26f92 100644 --- a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng +++ b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng @@ -2808,6 +2808,12 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1. </rng:define> <rng:define name="paragraph-content" combine="choice" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0"> + <rng:element name="field:fieldmark-separator"> + <rng:empty/> + </rng:element> + </rng:define> + <rng:define name="paragraph-content" combine="choice" + xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0"> <rng:element name="field:fieldmark-end"> <rng:empty/> </rng:element> |