Changeset 1463

Timestamp:

04/03/11 07:27:03 (14 months ago)

Author:

jharrop

Message:

Changes consequent on fresh VML classes.

Location:

trunk/docx4j/src/main/java/org/docx4j

Files:

• TraversalUtil.java (modified) (2 diffs)
• model/images/WordXmlPictureE10.java (modified) (3 diffs)
• vml/presentationDrawing/header.txt (added)
• vml/presentationDrawing/script (added)
• vml/root/header.txt (added)
• vml/root/script (added)
• vml/spreadsheetDrawing/header.txt (added)
• vml/spreadsheetDrawing/script (added)
• vml/wordprocessingDrawing/header.txt (added)
• vml/wordprocessingDrawing/script (added)

trunk/docx4j/src/main/java/org/docx4j/TraversalUtil.java

@@ -4 +4 @@
 import java.util.ArrayList;
 import java.util.List;
+
+import javax.xml.bind.JAXBElement;
 
 import org.apache.log4j.Logger;
@@ -190 +192 @@
                         return ((Pict)o).getAnyAndAny(); // (why didn't the reflection below find this?)
                 } else if (o instanceof org.docx4j.vml.CTShape) {                               
-                        return ((org.docx4j.vml.CTShape)o).getAny();
+//                      return ((org.docx4j.vml.CTShape)o).getAny();
+                        List<Object> artificialList = new ArrayList<Object>();
+                        for (JAXBElement<?> j : ((org.docx4j.vml.CTShape)o).getPathOrFormulasOrHandles() ) {
+                                artificialList.add(j);                          
+                        }
+                        return artificialList;
                 } else if (o instanceof org.docx4j.vml.CTTextbox) {                             
-                        return ((org.docx4j.vml.CTTextbox)o).getAny();
-                } else if (o instanceof org.docx4j.wml.CTTxbxContent) {                         
-                        return ((org.docx4j.wml.CTTxbxContent)o).getEGBlockLevelElts();
+//                      return ((org.docx4j.vml.CTTextbox)o).getAny();
+                        return ((org.docx4j.vml.CTTextbox)o).getTxbxContent().getEGBlockLevelElts();
+                                // grandchildren
+
+//              } else if (o instanceof org.docx4j.wml.CTTxbxContent) {                         
+//                      return ((org.docx4j.wml.CTTxbxContent)o).getEGBlockLevelElts();
                 } else if (o instanceof CTObject) {
                         return ((CTObject)o).getAnyAndAny();

trunk/docx4j/src/main/java/org/docx4j/model/images/WordXmlPictureE10.java

@@ -140 +140 @@
         private void findImageData() {
                 
-        if (shape.getAny()==null) {
+        if (shape.getPathOrFormulasOrHandles()==null) {
                 log.debug("Shape had no any: " + XmlUtils.marshaltoString(shape, true));
         } else {
-                for (Object o : shape.getAny() ) {
+                for (Object o : shape.getPathOrFormulasOrHandles() ) {
                         if (o instanceof JAXBElement ) {
                                 JAXBElement jb = (JAXBElement)o;
@@ -187 +187 @@
         }
         
-        String imgRelId = converter.imageData.getOtherAttributes().get(
-                        new QName("http://schemas.openxmlformats.org/officeDocument/2006/relationships", "id"));   
-                //NB r:id is not given by getId()!
+//        String imgRelId = converter.imageData.getOtherAttributes().get(
+//                      new QName("http://schemas.openxmlformats.org/officeDocument/2006/relationships", "id"));   
+        
+        String imgRelId = converter.imageData.getId();
         if (imgRelId!=null && !imgRelId.equals("")) {
                 log.debug("Handling " + imgRelId);
@@ -344 +345 @@
         
     private void readStandardAttributes(CTShape shape) {
-        this.id = shape.getId();
+//        this.id = shape.getId();
+        this.id = shape.getVmlId();
+        
         this.pType = shape.getType(); 
         this.alt = shape.getAlt();