Changeset 1741 for trunk/docx4j/src/main/java

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/src/main/java/org/docx4j/wml

Files:

• CTCompat.java (modified) (6 diffs)
• CTCompatSetting.java (added)
• ObjectFactory.java (modified) (1 diff)

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();
+    }    
 
     /**