diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-08-10 11:08:07 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-08-10 11:17:49 +0200 |
| commit | 676efaa5a12a48982abbeba5075d8f7686ed3fdb (patch) | |
| tree | a5c577061091a00a5df602a860f9583620388e67 /writerfilter | |
| parent | b17f4ecea142fd6f311dcb457e8896cd12e60fc0 (diff) | |
Remove unused list elements
Change them to choice, what was probably really meant here: allow one of
the values, not a whitespace-separated list of one or more values.
Also, clean up nested choices.
Change-Id: I87bc30b710569e317da05933502b36d8d97e4155
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/ooxml/model.xml | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 2fedef38fdde..225628b67b28 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -10555,9 +10555,9 @@ <start name="AlternateContent"/> <grammar xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/markup-compatibility/2006" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> <define name="nsList"> - <list> + <choice> <data type="NCName"/> - </list> + </choice> </define> <define name="AlternateContent"> <element name="AlternateContent"> @@ -10925,10 +10925,10 @@ </attribute> </define> <define name="ST_HexColorAuto"> - <list> + <choice> <!-- Automatically Determined Color --> <value>auto</value> - </list> + </choice> </define> <define name="ST_HexColorRGB"> <data type="hexBinary"/> @@ -12051,16 +12051,16 @@ </choice> </define> <define name="ST_AlgClass"> - <list> + <choice> <!-- Hashing --> <value>hash</value> - </list> + </choice> </define> <define name="ST_AlgType"> - <list> + <choice> <!-- Any Type --> <value>typeAny</value> - </list> + </choice> </define> <define name="AG_Password"> <attribute name="cryptProviderType"> @@ -12771,7 +12771,6 @@ <element name="statusText"> <ref name="CT_FFStatusText"/> </element> - <choice> <element name="checkBox"> <ref name="CT_FFCheckBox"/> </element> @@ -12781,7 +12780,6 @@ <element name="textInput"> <ref name="CT_FFTextInput"/> </element> - </choice> </choice> </define> <define name="CT_FFHelpText"> @@ -14024,7 +14022,6 @@ <element name="tag"> <ref name="CT_String"/> </element> - <choice> <element name="equation"> <ref name="CT_OnOff"/> </element> @@ -14064,7 +14061,6 @@ <element name="bibliography"> <ref name="CT_Empty"/> </element> - </choice> </choice> </define> <define name="CT_SdtEndPr"> |