diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2014-02-27 14:49:26 +0100 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2014-02-27 17:35:01 +0100 |
| commit | 14a15f412276c91fa1a20edacdaf0b77f38f4ecd (patch) | |
| tree | d9187832c05db47f923379015324d40f94da8980 /writerfilter | |
| parent | ooxml export: w14:numForm element (diff) | |
| download | core-14a15f412276c91fa1a20edacdaf0b77f38f4ecd.tar.gz core-14a15f412276c91fa1a20edacdaf0b77f38f4ecd.zip | |
writerfilter: add w14:numSpacing into model.xml
Change-Id: I4ddeb415583183ab33d30b9b736977907c184ced
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/ooxml/model.xml | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 92aa07c2fc62..7924973a8e0c 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -5595,6 +5595,15 @@ </choice> </list> </define> + <define name="ST_NumSpacing"> + <list> + <choice> + <value>default</value> + <value>proportional</value> + <value>tabular</value> + </choice> + </list> + </define> <define name="ST_PositiveCoordinate"> <data type="long"> @@ -6152,6 +6161,11 @@ <ref name="ST_NumForm"/> </attribute> </define> + <define name="CT_NumSpacing"> + <attribute name="val"> + <ref name="ST_NumSpacing"/> + </attribute> + </define> <define name="glow"> <element name="glow"> @@ -6200,7 +6214,7 @@ </define> <define name="numSpacing"> <element name="numSpacing"> - <empty/> + <ref name="CT_NumSpacing"/> </element> </define> <define name="stylisticSets"> @@ -6438,6 +6452,11 @@ <value name="lining" tokenid="ooxml:ST_NumForm_lining">lining</value> <value name="oldStyle" tokenid="ooxml:ST_NumForm_oldStyle">oldStyle</value> </resource> + <resource name="ST_NumSpacing" resource="List" generated="yes"> + <value name="default" tokenid="ooxml:ST_NumSpacing_default">default</value> + <value name="proportional" tokenid="ooxml:ST_NumSpacing_proportional">proportional</value> + <value name="tabular" tokenid="ooxml:ST_NumSpacing_tabular">tabular</value> + </resource> <resource name="ST_PositiveCoordinate" resource="Integer" generated="yes"/> <resource name="ST_HexColorRGB" resource="Hex"/> @@ -6605,6 +6624,9 @@ <resource name="CT_NumForm" resource="Properties" tag="character"> <attribute name="val" tokenid="ooxml:CT_NumForm_val"/> </resource> + <resource name="CT_NumSpacing" resource="Properties" tag="character"> + <attribute name="val" tokenid="ooxml:CT_NumSpacing_val"/> + </resource> <resource name="glow" resource="Properties" tag="character"> <element name="glow" tokenid="ooxml:glow_glow"/> @@ -18320,12 +18342,12 @@ <ref name="BUILT_IN_ANY_TYPE"/> </element> </optional> - <!--<optional> + <optional> <element name="w14:numSpacing"> <ref name="BUILT_IN_ANY_TYPE"/> </element> </optional> - <optional> + <!--<optional> <element name="w14:stylisticSets"> <ref name="BUILT_IN_ANY_TYPE"/> </element> @@ -24311,8 +24333,8 @@ <element name="w14:props3d" tokenid="ooxml:EG_RPrBase_w14_props3d"/> <element name="w14:ligatures" tokenid="ooxml:EG_RPrBase_w14_ligatures"/> <element name="w14:numForm" tokenid="ooxml:EG_RPrBase_w14_numForm"/> - <!--<element name="w14:numSpacing" tokenid="ooxml:EG_RPrBase_w14_numSpacing"/> - <element name="w14:stylisticSets" tokenid="ooxml:EG_RPrBase_w14_stylisticSets"/> + <element name="w14:numSpacing" tokenid="ooxml:EG_RPrBase_w14_numSpacing"/> + <!--<element name="w14:stylisticSets" tokenid="ooxml:EG_RPrBase_w14_stylisticSets"/> <element name="w14:cntxtAlts" tokenid="ooxml:EG_RPrBase_w14_cntxtAlts"/>--> </resource> <resource name="EG_RPrContent" resource="Properties" tag="character"> |