Changeset 1741

Timestamp:

01/05/12 03:06:51 (5 months ago)

Author:

jharrop

Message:

Add element name="compatSetting" and type="CT_CompatSetting" from ECMA-376 2ed to wml, so Word 2010 can detect docx as native

Location:

trunk/docx4j

Files:

• src/main/java/org/docx4j/wml/CTCompat.java (modified) (6 diffs)
• src/main/java/org/docx4j/wml/CTCompatSetting.java (added)
• src/main/java/org/docx4j/wml/ObjectFactory.java (modified) (1 diff)
• xsd/wml/wml.xsd (modified) (4 diffs)

trunk/docx4j/src/main/java/org/docx4j/wml/CTCompat.java

@@ -1 +1 @@
 /*
- *  Copyright 2007-2008, Plutext Pty Ltd.
+ *  Copyright 2007-2012, Plutext Pty Ltd.
  *   
  *  This file is part of docx4j.
@@ -22 +22 @@
 package org.docx4j.wml;
 
+import java.util.ArrayList;
+import java.util.List;
 import javax.xml.bind.Unmarshaller;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -105 +107 @@
  *         <element name="useAnsiKerningPairs" type="{http://schemas.openxmlformats.org/wordprocessingml/2006/main}BooleanDefaultTrue" minOccurs="0"/>
  *         <element name="cachedColBalance" type="{http://schemas.openxmlformats.org/wordprocessingml/2006/main}BooleanDefaultTrue" minOccurs="0"/>
+ *         <element name="compatSetting" type="{http://schemas.openxmlformats.org/wordprocessingml/2006/main}CT_CompatSetting" maxOccurs="unbounded" minOccurs="0"/>
  *       </sequence>
  *     </restriction>
@@ -179 +182 @@
     "doNotVertAlignInTxbx",
     "useAnsiKerningPairs",
-    "cachedColBalance"
+    "cachedColBalance",
+    "compatSetting"
 })
 public class CTCompat
@@ -250 +254 @@
     protected BooleanDefaultTrue useAnsiKerningPairs;
     protected BooleanDefaultTrue cachedColBalance;
+    protected List<CTCompatSetting> compatSetting;
     @XmlTransient
     private Object parent;
@@ -1811 +1816 @@
     public void setCachedColBalance(BooleanDefaultTrue value) {
         this.cachedColBalance = value;
+    }
+
+    /**
+     * Gets the value of the compatSetting property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the compatSetting property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getCompatSetting().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link CTCompatSetting }
+     * 
+     * 
+     */
+    public List<CTCompatSetting> getCompatSetting() {
+        if (compatSetting == null) {
+            compatSetting = new ArrayList<CTCompatSetting>();
+        }
+        return this.compatSetting;
     }
 

trunk/docx4j/src/main/java/org/docx4j/wml/ObjectFactory.java

@@ -343 +343 @@
         return new CTCompat();
     }
+    
+    /**
+     * Create an instance of {@link CTCompatSetting }
+     * 
+     */
+    public CTCompatSetting createCTCompatSetting() {
+        return new CTCompatSetting();
+    }    
 
     /**

trunk/docx4j/xsd/wml/wml.xsd

@@ -26 +26 @@
 
 20091010 - oops, added EG_MathContent back into EG_RunElements
+
+20120105 - add element name="compatSetting" and type="CT_CompatSetting" from 2ed, so Word 2010 can detect docx as native 
         
 USAGE INSTRUCTIONS
@@ -35 +37 @@
   And the parent-pointer-plugin.  See http://fisheye5.cenqua.com/browse/jaxb2-commons/parent-pointer-plugin
         
-  We have a copy of this in the lib dir.  Or you can build it yourself:
+  We have a copy of this in thealib dir.  Or you can build it yourself:
         
         cvs -d :pserver:$DEV_JAVA_NET_USERNAME@cvs.dev.java.net:/cvs checkout -P jaxb2-commons
@@ -68 +70 @@
   )
   
+  Windows:
+  
+     C:>\Java\jaxb-ri-20110601\bin\xjc.bat -classpath \Java\parent-pointer-plugin-1.0.jar -Xparent-pointer wml.xsd -d t2 -no-header -target 2.0
   
         
@@ -10590 +10595 @@
                                 </xsd:annotation>
                         </xsd:element>
+                        <xsd:element name="compatSetting" type="CT_CompatSetting" minOccurs="0" maxOccurs="unbounded">
+                                <!--  Added from 3ed for docx4j 2.7.2, so native Word 2010 docx can be produced -->
+                                <xsd:annotation>
+                                        <xsd:documentation>Custom Compatibility Setting</xsd:documentation>
+                                </xsd:annotation>                       
+                        </xsd:element>
                 </xsd:sequence>
         </xsd:complexType>
+        <xsd:complexType name="CT_CompatSetting">
+                <xsd:attribute name="name" type="ST_String">
+                        <xsd:annotation>
+                                <xsd:documentation>Name of Setting</xsd:documentation>
+                        </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="uri" type="ST_String">
+                        <xsd:annotation>
+                                <xsd:documentation>Namespace of Setting</xsd:documentation>
+                        </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="val" type="ST_String">
+                        <xsd:annotation>
+                                <xsd:documentation>Value of Setting</xsd:documentation>
+                        </xsd:annotation>
+                </xsd:attribute>
+        </xsd:complexType>      
         <xsd:complexType name="CT_DocVar">
                 <xsd:attribute name="name" type="ST_String" use="required">