summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.com>2014-02-21 19:51:06 +0100
committerTomaž Vajngerl <tomaz.vajngerl@collabora.com>2014-02-21 23:33:04 +0100
commit22a5e4db00a1372270b80f6f121fec91de1f20dd (patch)
tree63c29b0fab024ae5b6089e16bba4de02ea1a21a1 /writerfilter
parent4b544037c4fdbcb8958723bb9ea3d9a33f43e6ee (diff)
writerfilter: fix w14 simple types
Change-Id: I5693b7570227e1a337f03febc28f5ea336b4af7f
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/ooxml/model.xml25
1 files changed, 17 insertions, 8 deletions
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 0a00ea212991..d8a9192d22d1 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -5335,16 +5335,26 @@
</define>
<define name="ST_PositiveFixedPercentage">
- <empty/>
+ <data type="long">
+ <xs:documentation>Positive fixed precentage</xs:documentation>
+ <param name="minInclusive">0</param>
+ <param name="maxInclusive">27273042316900</param>
+ </data>
</define>
<define name="ST_PositivePercentage">
- <empty/>
+ <data type="long">
+ <xs:documentation>Positive precentage</xs:documentation>
+ <param name="minInclusive">0</param>
+ <param name="maxInclusive">27273042316900</param>
+ </data>
</define>
<define name="ST_Percentage">
- <data type="int">
- <xs:documentation>Percentage</xs:documentation>
+ <data type="long">
+ <xs:documentation>Precentage</xs:documentation>
+ <param name="minInclusive">0</param>
+ <param name="maxInclusive">27273042316900</param>
</data>
</define>
@@ -5483,7 +5493,7 @@
<value name="bg1" tokenid="ooxml:ST_SchemeColorVal_bg1">bg1</value>
<value name="tx1" tokenid="ooxml:ST_SchemeColorVal_tx1">tx1</value>
<value name="bg2" tokenid="ooxml:ST_SchemeColorVal_bg2">bg2</value>
- <value name="tx2" tokenid="ooxml:ST_SchemeColorVal">tx2</value>
+ <value name="tx2" tokenid="ooxml:ST_SchemeColorVal_tx2">tx2</value>
<value name="accent1" tokenid="ooxml:ST_SchemeColorVal_accent1">accent1</value>
<value name="accent2" tokenid="ooxml:ST_SchemeColorVal_accent2">accent2</value>
<value name="accent3" tokenid="ooxml:ST_SchemeColorVal_accent3">accent3</value>
@@ -5493,9 +5503,8 @@
</resource>
<resource name="ST_PositiveCoordinate" resource="Integer" generated="yes"/>
<resource name="ST_HexColorRGB" resource="Hex"/>
- <resource name="ST_PositivePercentage" resource="Value">
- <action name="characters" action="positivePercentage"/>
- </resource>
+ <resource name="ST_PositivePercentage" resource="Integer" generated="yes"/>
+ <resource name="ST_PositiveFixedPercentage" resource="Integer" generated="yes"/>
<resource name="ST_Percentage" resource="Integer" generated="yes"/>
<resource name="EG_ColorTransform" resource="Properties" tag="character">