[Libreoffice-commits] .: 2 commits - writerfilter/source

[Lubos Lunak]

 writerfilter/source/ooxml/model.xml |   20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

New commits:
commit f9acffa2194d2a296042e446126691b1218cd662
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Thu Mar 10 15:25:20 2011 +0100

    there's no CT_AlignH/V either, only ST_

diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index c711982..aa740ae 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -6535,9 +6535,6 @@
           <xs:documentation>Absolute Position Offset Value</xs:documentation>
         </data>
       </define>
-      <define name="CT_AlignH">
-        <ref name="ST_AlignH"/>
-      </define>
       <define name="ST_AlignH">
         <list>
           <xs:documentation>Relative Horizontal Alignment Positions</xs:documentation>
@@ -6581,7 +6578,7 @@
       <define name="CT_PosH">
         <choice>
           <element name="align">
-            <ref name="CT_AlignH"/>
+            <ref name="ST_AlignH"/>
           </element>
           <element name="posOffset">
             <ref name="ST_PositionOffset"/>
@@ -6592,9 +6589,6 @@
           <xs:documentation>Horizontal Position Relative Base</xs:documentation>
         </attribute>
       </define>
-      <define name="CT_AlignV">
-        <ref name="ST_AlignV"/>
-      </define>
       <define name="ST_AlignV">
         <list>
           <xs:documentation>Vertical Alignment Definition</xs:documentation>
@@ -6638,7 +6632,7 @@
       <define name="CT_PosV">
         <choice>
           <element name="align">
-            <ref name="CT_AlignV"/>
+            <ref name="ST_AlignV"/>
           </element>
           <element name="posOffset">
             <ref name="ST_PositionOffset"/>
@@ -6824,7 +6818,6 @@
       <element name="wrapTopAndBottom" tokenid="ooxml:EG_WrapType_wrapTopAndBottom"/>
     </resource>
     <resource name="ST_PositionOffset" resource="Integer" generated="yes"/>
-    <resource name="CT_AlignH" resource="Value"/>
     <resource name="ST_AlignH" resource="List" generated="yes">
       <value name="left" tokenid="ooxml:Value_wordprocessingDrawing_ST_AlignH_left">left</value>
       <value name="right" tokenid="ooxml:Value_wordprocessingDrawing_ST_AlignH_right">right</value>
@@ -6847,7 +6840,6 @@
       <element name="posOffset" tokenid="ooxml:CT_PosH_posOffset"/>
       <attribute name="relativeFrom" tokenid="ooxml:CT_PosH_relativeFrom"/>
     </resource>
-    <resource name="CT_AlignV" resource="Value"/>
     <resource name="ST_AlignV" resource="List" generated="yes">
       <value name="top" tokenid="ooxml:Value_wordprocessingDrawing_ST_AlignV_top">top</value>
       <value name="bottom" tokenid="ooxml:Value_wordprocessingDrawing_ST_AlignV_bottom">bottom</value>
commit 22b251c3f6a4bf67fd584418638e66265e7ce8f1
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Thu Mar 10 13:20:37 2011 +0100

    there's no CT_PositionOffset, only ST_PositionOffset

diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 2285cec..c711982 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -6530,9 +6530,6 @@
           </element>
         </choice>
       </define>
-      <define name="CT_PositionOffset">
-        <ref name="ST_PositionOffset"/>
-      </define>
       <define name="ST_PositionOffset">
         <data type="int">
           <xs:documentation>Absolute Position Offset Value</xs:documentation>
@@ -6587,7 +6584,7 @@
             <ref name="CT_AlignH"/>
           </element>
           <element name="posOffset">
-            <ref name="CT_PositionOffset"/>
+            <ref name="ST_PositionOffset"/>
           </element>
         </choice>
         <attribute name="relativeFrom">
@@ -6644,7 +6641,7 @@
             <ref name="CT_AlignV"/>
           </element>
           <element name="posOffset">
-            <ref name="CT_PositionOffset"/>
+            <ref name="ST_PositionOffset"/>
           </element>
         </choice>
         <attribute name="relativeFrom">
@@ -6826,7 +6823,6 @@
       <element name="wrapThrough" tokenid="ooxml:EG_WrapType_wrapThrough"/>
       <element name="wrapTopAndBottom" tokenid="ooxml:EG_WrapType_wrapTopAndBottom"/>
     </resource>
-    <resource name="CT_PositionOffset" resource="Value"/>
     <resource name="ST_PositionOffset" resource="Integer" generated="yes"/>
     <resource name="CT_AlignH" resource="Value"/>
     <resource name="ST_AlignH" resource="List" generated="yes">