diff options
author | Scott Clarke <scott.clarke@codethink.co.uk> | 2019-06-07 15:28:42 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2019-08-27 17:11:56 +0200 |
commit | 82bdf5996cff7061bb90eb373d7879498c3f3d2c (patch) | |
tree | 14a18dd314de6065d64b154d7d2b7730a80547ad /schema | |
parent | ee8afd397a1056f86322357a8988849c06d15c19 (diff) |
tdf#119228 Add storage and serialisation for the Resolved flag
Co-authored-by: Jim MacArthur <jim.macarthur@codethink.co.uk>
(cherry picked from commit d2025bdc33cc8d9e2f6c9f90da4574275ed6b0e4)
Conflicts:
include/svx/svxids.hrc
sw/source/core/unocore/unofield.cxx
Change-Id: I0278588dc533378104e544d05b60583c85271f6a
Reviewed-on: https://gerrit.libreoffice.org/78180
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'schema')
-rw-r--r-- | schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng b/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng index 19786f82a7e1..8e8fecbf7895 100644 --- a/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng +++ b/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng @@ -965,6 +965,24 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1. </rng:element> </rng:define> + <rng:define name="office-annotation-attlist" combine="interleave"> + <rng:interleave> + <rng:optional> + <rng:attribute name="office:display"> + <rng:ref name="boolean"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:ref name="common-office-annotation-name-attlist"/> + </rng:optional> + <rng:optional> + <rng:attribute name="loext:resolved"> + <rng:ref name="boolean"/> + </rng:attribute> + </rng:optional> + </rng:interleave> + </rng:define> + <rng:define name="style-style-content"> <rng:choice> <rng:group> |