Changeset 1633 for trunk/docx4j/src/main/java/org

Timestamp:

08/01/11 15:43:59 (10 months ago)

Author:

jharrop

Message:

Handle wordprocessingDrawing.Anchor

File:

• trunk/docx4j/src/main/java/org/docx4j/TraversalUtil.java (modified) (4 diffs)

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

@@ -155 +155 @@
         }
 
+        private static List<Object> handleGraphicData(org.docx4j.dml.GraphicData graphicData) {
+                // Its not graphicData.getAny() we're typically interested in
+                if (graphicData.getPic()!=null
+                        && graphicData.getPic().getBlipFill()!=null
+                        && graphicData.getPic().getBlipFill().getBlip()!=null) {
+                        log.info("found CTBlip");
+                        List<Object> artificialList = new ArrayList<Object>();
+                        artificialList.add(graphicData.getPic().getBlipFill().getBlip());
+                        return artificialList;
+                } else {
+                        // Chart is in here
+                        return graphicData.getAny();                                            
+                }               
+        }
         public static List<Object> getChildrenImpl(Object o) {
 
@@ -168 +182 @@
                 } else if (o instanceof org.docx4j.wml.SdtElement) {
                         return ((org.docx4j.wml.SdtElement) o).getSdtContent().getContent();
+                } else if (o instanceof org.docx4j.dml.wordprocessingDrawing.Anchor) {
+                        org.docx4j.dml.wordprocessingDrawing.Anchor anchor = 
+                                (org.docx4j.dml.wordprocessingDrawing.Anchor)o;
+                        if (anchor.getGraphic()!=null) {
+                                log.info("found a:graphic");
+                                org.docx4j.dml.Graphic graphic = anchor.getGraphic();
+                                if (graphic.getGraphicData()!=null) {
+                                        return handleGraphicData(graphic.getGraphicData());
+                                }
+                        }                       
                 } else if (o instanceof org.docx4j.dml.wordprocessingDrawing.Inline) {
                         org.docx4j.dml.wordprocessingDrawing.Inline inline = (org.docx4j.dml.wordprocessingDrawing.Inline)o;
@@ -174 +198 @@
                                 org.docx4j.dml.Graphic graphic = inline.getGraphic();
                                 if (graphic.getGraphicData()!=null) {
-                                        org.docx4j.dml.GraphicData graphicData = graphic.getGraphicData();
-                                        // Its not graphicData.getAny() we're typically interested in
-                                        if (graphicData.getPic()!=null
-                                                && graphicData.getPic().getBlipFill()!=null
-                                                && graphicData.getPic().getBlipFill().getBlip()!=null) {
-                                                log.info("found CTBlip");
-                                                List<Object> artificialList = new ArrayList<Object>();
-                                                artificialList.add(graphicData.getPic().getBlipFill().getBlip());
-                                                return artificialList;
-                                        } else {
-                                                // Chart is in here
-                                                return graphicData.getAny();                                            
-                                        }
-                                        
+                                        return handleGraphicData(graphic.getGraphicData());
                                 }
                         }
@@ -217 +228 @@
                 } else if (o instanceof CTObject) {
                         return ((CTObject)o).getAnyAndAny();
-                }
+                } 
 
                 // OK, what is this? Use reflection ..