diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2023-02-01 22:44:39 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2023-02-01 14:53:37 +0000 |
| commit | 1d88f59103d931aa680cd77690b83e773771729c (patch) | |
| tree | 920f7d182d86f784261513f0b7b45a08d778c0a5 /schema | |
| parent | 6652768ef832f4e1555a01a2962c087fa8937e30 (diff) | |
schema: properly extend office-styles instead of style-style "hack"
With the 32a8095eb2c22f7de4bce14f1b5c08dc701deaea I extended the
schema in an odd way, which worked by luck. This change fixes this
by properly extending the loext schema in a conventional way.
Change-Id: I4229145dc2a6ce2f0d5d115b3972121ed2379b9f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146453
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'schema')
| -rw-r--r-- | schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng | 67 |
1 files changed, 61 insertions, 6 deletions
diff --git a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng index e6510e6c0d7a..c0658b570f5d 100644 --- a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng +++ b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng @@ -3295,11 +3295,66 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1. </rng:element> </rng:define> - <!-- TODO no proposal --> - <rng:define name="style-style" combine="interleave"> - <rng:optional> - <rng:ref name="loext-theme"/> - </rng:optional> + <rng:define name="office-styles" combine="choice"> + <rng:optional> + <rng:element name="office:styles"> + <rng:interleave> + <rng:ref name="styles"/> + <rng:zeroOrMore> + <rng:ref name="style-default-style"/> + </rng:zeroOrMore> + <rng:optional> + <rng:ref name="style-default-page-layout"/> + </rng:optional> + <rng:optional> + <rng:ref name="text-outline-style"/> + </rng:optional> + <rng:zeroOrMore> + <rng:ref name="text-notes-configuration"/> + </rng:zeroOrMore> + <rng:optional> + <rng:ref name="text-bibliography-configuration"/> + </rng:optional> + <rng:optional> + <rng:ref name="text-linenumbering-configuration"/> + </rng:optional> + <rng:optional> + <!-- TODO no proposal for defining a theme --> + <rng:ref name="loext-theme"/> + </rng:optional> + <rng:zeroOrMore> + <rng:ref name="draw-gradient"/> + </rng:zeroOrMore> + <rng:zeroOrMore> + <rng:ref name="svg-linearGradient"/> + </rng:zeroOrMore> + <rng:zeroOrMore> + <rng:ref name="svg-radialGradient"/> + </rng:zeroOrMore> + <rng:zeroOrMore> + <rng:ref name="draw-hatch"/> + </rng:zeroOrMore> + <rng:zeroOrMore> + <rng:ref name="draw-fill-image"/> + </rng:zeroOrMore> + <rng:zeroOrMore> + <rng:ref name="draw-marker"/> + </rng:zeroOrMore> + <rng:zeroOrMore> + <rng:ref name="draw-stroke-dash"/> + </rng:zeroOrMore> + <rng:zeroOrMore> + <rng:ref name="draw-opacity"/> + </rng:zeroOrMore> + <rng:zeroOrMore> + <rng:ref name="style-presentation-page-layout"/> + </rng:zeroOrMore> + <rng:zeroOrMore> + <rng:ref name="table-table-template"/> + </rng:zeroOrMore> + </rng:interleave> + </rng:element> + </rng:optional> </rng:define> <rng:define name="style-master-page" combine="choice"> @@ -3330,7 +3385,7 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1. <rng:ref name="office-forms"/> </rng:optional> <rng:optional> - <!-- TODO(vmiklos) no proposal for defining a theme --> + <!-- TODO no proposal for defining a theme --> <rng:ref name="loext-theme"/> </rng:optional> <rng:zeroOrMore> |