[Libreoffice-commits] core.git: writerfilter/source

[Miklos Vajna]

 writerfilter/source/ooxml/model.xml |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 7cab4ce3ba74b73b129d9932d58be7006afdac2f
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Wed Mar 27 09:38:41 2013 +0100

    ooxml tokenizer: CT_TblLayout -> CT_TblLayoutType
    
    That's how it's called in the spec's W3C XML Schema.
    
    Change-Id: I6fc6452af493e61c302948a617d427c118ada0b2

diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 60c4c57..8bfce16 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -17893,7 +17893,7 @@
           </choice>
         </list>
       </define>
-      <define name="CT_TblLayout">
+      <define name="CT_TblLayoutType">
         <attribute name="type">
           <ref name="ST_TblLayout"/>
           <xs:documentation>Table Layout Setting</xs:documentation>
@@ -18095,7 +18095,7 @@
         </optional>
         <optional>
           <element name="tblLayout">
-            <ref name="CT_TblLayout"/>
+            <ref name="CT_TblLayoutType"/>
           </element>
         </optional>
         <optional>
@@ -18150,7 +18150,7 @@
         </optional>
         <optional>
           <element name="tblLayout">
-            <ref name="CT_TblLayout"/>
+            <ref name="CT_TblLayoutType"/>
           </element>
         </optional>
         <optional>
@@ -22942,8 +22942,8 @@
       <value tokenid="ooxml:Value_wordprocessingml_ST_TblLayout_fixed">fixed</value>
       <value tokenid="ooxml:Value_wordprocessingml_ST_TblLayout_autofit">autofit</value>
     </resource>
-    <resource name="CT_TblLayout" resource="Value" tag="table">
-      <attribute name="type" tokenid="ooxml:CT_TblLayout_type" action="setValue"/>
+    <resource name="CT_TblLayoutType" resource="Value" tag="table">
+      <attribute name="type" tokenid="ooxml:CT_TblLayoutType_type" action="setValue"/>
     </resource>
     <resource name="ST_TblOverlap" resource="List">
       <value tokenid="ooxml:Value_ST_TblOverlap_never">never</value>