diff options
| author | Thorsten Behrens <tbehrens@novell.com> | 2010-06-03 21:29:25 +0200 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@novell.com> | 2010-06-03 21:29:25 +0200 |
| commit | 5fb3c27ed365d0d4a82fca13b91a0ec2cb2c97ea (patch) | |
| tree | 2f6ad0a3e30b1af2ba80be6df66c4ef07be475e8 | |
| parent | 44b8b21c7118d5b1385e9ab81f8540b4389b5ca2 (diff) | |
Schema-hack: flattened form:list-value to placate pyxb
| -rw-r--r-- | examples/odf/form.xsd | 55 | ||||
| -rw-r--r-- | examples/odf/opendocument.xsd | 10 |
2 files changed, 7 insertions, 58 deletions
diff --git a/examples/odf/form.xsd b/examples/odf/form.xsd index 3619e6a..643069c 100644 --- a/examples/odf/form.xsd +++ b/examples/odf/form.xsd @@ -479,55 +479,12 @@ <xs:group name="list-value"> <xs:sequence> <xs:element name="list-value"> - <xs:complexType> - <xs:attribute ref="office:value" use="required"/> - </xs:complexType> - </xs:element> - </xs:sequence> - </xs:group> - <xs:group name="list-value1"> - <xs:sequence> - <xs:element name="list-value"> - <xs:complexType> - <xs:attribute ref="office:value" use="required"/> - <xs:attribute ref="office:currency"/> - </xs:complexType> - </xs:element> - </xs:sequence> - </xs:group> - <xs:group name="list-value2"> - <xs:sequence> - <xs:element name="list-value"> - <xs:complexType> - <xs:attribute ref="office:date-value" use="required"/> - </xs:complexType> - </xs:element> - </xs:sequence> - </xs:group> - <xs:group name="list-value3"> - <xs:sequence> - <xs:element name="list-value"> - <xs:complexType> - <xs:attribute ref="office:time-value" use="required"/> - </xs:complexType> - </xs:element> - </xs:sequence> - </xs:group> - <xs:group name="list-value4"> - <xs:sequence> - <xs:element name="list-value"> - <xs:complexType> - <xs:attribute ref="office:boolean-value" use="required"/> - </xs:complexType> - </xs:element> - </xs:sequence> - </xs:group> - <xs:group name="list-value5"> - <xs:sequence> - <xs:element name="list-value"> - <xs:complexType> - <xs:attribute ref="office:string-value" use="required"/> - </xs:complexType> + <xs:attribute ref="office:value" use="optional"/> + <xs:attribute ref="office:currency" use="optional"/> + <xs:attribute ref="office:date-value" use="optional"/> + <xs:attribute ref="office:time-value" use="optional"/> + <xs:attribute ref="office:boolean-value" use="optional"/> + <xs:attribute ref="office:string-value" use="optional"/> </xs:element> </xs:sequence> </xs:group> diff --git a/examples/odf/opendocument.xsd b/examples/odf/opendocument.xsd index e36090d..96fab5a 100644 --- a/examples/odf/opendocument.xsd +++ b/examples/odf/opendocument.xsd @@ -3783,15 +3783,7 @@ <xs:attribute ref="office:string-value"/> </xs:attributeGroup> <xs:complexType name="form-property-type-and-value-list"> - <xs:choice minOccurs="0"> - <xs:group minOccurs="0" maxOccurs="unbounded" ref="form:list-value"/> - <xs:group minOccurs="0" maxOccurs="unbounded" ref="form:list-value"/> - <xs:group minOccurs="0" maxOccurs="unbounded" ref="form:list-value1"/> - <xs:group minOccurs="0" maxOccurs="unbounded" ref="form:list-value2"/> - <xs:group minOccurs="0" maxOccurs="unbounded" ref="form:list-value3"/> - <xs:group minOccurs="0" maxOccurs="unbounded" ref="form:list-value4"/> - <xs:group minOccurs="0" maxOccurs="unbounded" ref="form:list-value5"/> - </xs:choice> + <xs:group minOccurs="0" maxOccurs="unbounded" ref="form:list-value"/> <xs:attributeGroup ref="office:value-type2"/> </xs:complexType> <xs:attributeGroup name="office-annotation-attlist"> |