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

Timestamp:

03/03/10 13:20:33 (2 years ago)

Author:

jharrop

Message:

Copy attributes over!
Relaxed conditions under which bind is performed. Not yet clear what these conditions should actually be.

File:

• trunk/docx4j/src/main/java/org/docx4j/model/datastorage/bind.xslt (modified) (4 diffs)

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

@@ -48 +48 @@
         </xsl:choose>    
   </xsl:template>
+
+  <xsl:template match="@*"  mode="bind">
+    <xsl:copy>
+      <xsl:apply-templates select="@*"/>
+    </xsl:copy>
+  </xsl:template>
   
   <xsl:template match="w:*" mode="bind">  
@@ -56 +62 @@
                         select="java:org.docx4j.openpackaging.parts.CustomXmlDataStoragePart.log('In w:* bind')"/-->
                     <xsl:copy>
-                      <xsl:apply-templates mode="bind">
+                      <xsl:apply-templates select="@*|node()" mode="bind">
                         <xsl:with-param name="storeItemID"  select="$storeItemID" />
                                 <xsl:with-param name="xpath"  select="$xpath" />
@@ -70 +76 @@
                 <!-- >xsl:variable name="dummy" 
                         select="java:org.docx4j.openpackaging.parts.CustomXmlDataStoragePart.log('In w:r bind')"/-->
+
+                                <!-- TEMP: insert a new w:r, containing result -->
+                                <w:r>
+                                        <w:t><xsl:value-of
+                                                select="java:org.docx4j.openpackaging.parts.CustomXmlDataStoragePart.getXPath(
+                                                                        $customXmlDataStorageParts,
+                                                                        $storeItemID,
+                                                                        $xpath,
+                                                                        $prefixMappings)" /></w:t>
+                                </w:r>
+<!-- INSTEAD OF
                 <xsl:choose>
                         <xsl:when test="w:rPr/w:rStyle/@w:val='Entry' or w:rPr/w:rStyle/@w:val='PlaceholderText'">
@@ -89 +106 @@
                         </xsl:otherwise>
                 </xsl:choose>
+                -->
   </xsl:template>