Changeset 1662

Timestamp:

09/14/11 13:54:29 (8 months ago)

Author:

jharrop

Message:

Bind picture correctly where parent is another content control.

Location:

trunk/docx4j/src/main/java/org/docx4j/model/datastorage

Files:

• BindingHandler.java (modified) (4 diffs)
• bind.xslt (modified) (1 diff)

trunk/docx4j/src/main/java/org/docx4j/model/datastorage/BindingHandler.java

@@ -422 +422 @@
                                 JaxbXmlPart sourcePart,
                                 Map<String, CustomXmlDataStoragePart> customXmlDataStorageParts,
-                                String storeItemId, String xpath, String prefixMappings, String sdtParent,
+                                String storeItemId, String xpath, String prefixMappings, 
+                                String sdtParent,
+                                String contentChild,
                                 String cx, String cy) {
 
@@ -483 +485 @@
                                 org.docx4j.wml.P  p   = factory.createP();
                                 if (sdtParent.equals("tr")) {
-                                        tc.getEGBlockLevelElts().add(p);
+                                        tc.getContent().add(p);
                                 }
                                 org.docx4j.wml.R  run = factory.createR();              
@@ -489 +491 @@
                                                 || sdtParent.equals("tr") 
                                                 || sdtParent.equals("tc") ) {
-                                        p.getParagraphContent().add(run);
+                                        p.getContent().add(run);
                                 }
                                 org.docx4j.wml.Drawing drawing = factory.createDrawing();               
-                                run.getRunContent().add(drawing);               
+                                run.getContent().add(drawing);          
                                 drawing.getAnchorOrInline().add(inline);
                                 
@@ -516 +518 @@
                                 } else if ( sdtParent.equals("p") ) {
                                         document = XmlUtils.marshaltoW3CDomDocument(run);
+                                } else if ( sdtParent.equals("sdtContent") ) {                                  
+                                        log.info("contentChild: " + contentChild);
+                                        if (contentChild.equals("p")) {
+                                                p.getContent().add(run);
+                                                document = XmlUtils.marshaltoW3CDomDocument(p);                                         
+                                        } else if (contentChild.equals("r")) {
+                                                document = XmlUtils.marshaltoW3CDomDocument(r);                                         
+                                        } else {
+                                                log.error("how to inject image for unexpected sdt's content: " + contentChild);                                 
+                                        }
                                 } else {
                                         log.error("how to inject image for unexpected sdt's parent: " + sdtParent);

trunk/docx4j/src/main/java/org/docx4j/model/datastorage/bind.xslt

@@ -55 +55 @@
                                                                                 string(w:sdtPr/w:dataBinding/@w:prefixMappings),
                                                                                 local-name(..),
+                                                                                local-name(w:sdtContent/*[1]),
                                                                                 string(w:sdtContent//wp:extent[1]/@cx), 
                                                                                 string(w:sdtContent//wp:extent[1]/@cy))" />