Changeset 1097 for trunk/docx4j/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/docx2fo.xslt

Timestamp:

02/27/10 11:30:45 (2 years ago)

Author:

jharrop

Message:

Use revised WordXmlPicture? stuff in the various xslt.

File:

• trunk/docx4j/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/docx2fo.xslt (modified) (2 diffs)

trunk/docx4j/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/docx2fo.xslt

@@ -485 +485 @@
   <xsl:template match="wp:inline|wp:anchor">
   
-        <xsl:variable name="pictureData" select="./a:graphic/a:graphicData/pic:pic/pic:blipFill"/>
-        <xsl:variable name="picSize" select="./wp:extent"/>
-        <xsl:variable name="picLink" select="./wp:docPr/a:hlinkClick"/>
-        <xsl:variable name="linkDataNode" select="./a:graphic/a:graphicData/pic:pic/pic:blipFill/a:blip"/>
+        <xsl:variable name="wpinline" select="."/>
         
-        <xsl:copy-of select="java:org.docx4j.model.images.WordXmlPicture.createXslFoImgE20( $wmlPackage, string($imageDirPath),
-                        $pictureData, $picSize, $picLink, $linkDataNode)" />
+        <xsl:copy-of select="java:org.docx4j.model.images.WordXmlPicture.createXslFoImgE20( 
+                        $wmlPackage, string($imageDirPath),
+                        $wpinline)" />
     
   </xsl:template>
@@ -501 +499 @@
                 <xsl:when test="./v:shape/v:imagedata">
 
-                        <xsl:variable name="shape" select="./v:shape"/>
-                        <xsl:variable name="imageData" select="./v:shape/v:imagedata"/>
+                <xsl:variable name="wpict" select="."/>
                         
-                        <xsl:copy-of select="java:org.docx4j.model.images.WordXmlPicture.createXslFoImgE10( $wmlPackage, string($imageDirPath),
-                                        $shape, $imageData)" />
+                        <xsl:copy-of select="java:org.docx4j.model.images.WordXmlPicture.createXslFoImgE10( 
+                        $wmlPackage, string($imageDirPath),
+                        $wpict)" />
                 </xsl:when>
                 <xsl:otherwise>