Changeset 1529 for trunk/docx4j/src/main/java/org/docx4j/openpackaging

Timestamp:

06/05/11 01:12:45 (12 months ago)

Author:

jharrop

Message:

Meta works with (near-?) final odgm:SmartArtDataHierarchy

File:

• trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramLayoutMeta.xslt (modified) (4 diffs)

trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramLayoutMeta.xslt

@@ -29 +29 @@
     <gen:template match="/">
       <!-- Don't apply to the root of our list -->
-      <!--  <gen:for-each select="/dh:SmartArtDataHierarchy/dh:list/dh:listItem/dh:list"> -->
-      <!--  something weird when we use namespaces here, so don't -->
-      <gen:for-each select="*/*[local-name()='list']/*/*[local-name()='list']">
+      <gen:for-each select="/dh:SmartArtDataHierarchy/dh:list/dh:listItem/dh:list">
         <gen:comment> <gen:value-of select="name()" /></gen:comment>
             <xsl:apply-templates select="/dgm:layoutDef/dgm:layoutNode"/>
@@ -96 +94 @@
           <xsl:attribute name="presAssocID">{@id}</xsl:attribute>
           <xsl:attribute name="presStyleCnt">{count(//*)-1}</xsl:attribute><!--  FIXME when image rep is finalised -->
-          <xsl:attribute name="presStyleIdx">{count(preceding::*[local-name='listItem']) + count(ancestor::*[local-name='listItem'])}</xsl:attribute>
-          <xsl:attribute name="depth">{count(ancestor::*[local-name='listItem'])}</xsl:attribute> <!--  not needed -->
+          <xsl:attribute name="presStyleIdx">{count(preceding::dh:listItem) + count(ancestor::dh:listItem)}</xsl:attribute>
+          <xsl:attribute name="depth">{count(ancestor::dh:listItem)}</xsl:attribute> <!--  not needed -->
           <xsl:apply-templates select="@* | node()"/>
         </xsl:copy>
@@ -104 +102 @@
         <xsl:copy>
           <xsl:attribute name="presAssocID">{@id}</xsl:attribute>
-          <xsl:attribute name="presStyleCnt">{count(../*[local-name='listItem'])}</xsl:attribute>
+          <xsl:attribute name="presStyleCnt">{count(../dh:listItem)}</xsl:attribute>
           <xsl:attribute name="presStyleIdx">{position()-1}</xsl:attribute>
-          <xsl:attribute name="depth">{count(ancestor::*[local-name='listItem'])}</xsl:attribute>
+          <xsl:attribute name="depth">{count(ancestor::dh:listItem)}</xsl:attribute>
           <!-- TODO special case for level 1 -->
           <xsl:apply-templates select="@* | node()"/>
@@ -181 +179 @@
         <xsl:when test="@ptType='nonAsst'">
           <gen:template name="{@name}">        
-          <gen:for-each select="*/*[local-name()='listItem']">
-            <!-- <gen:for-each select="dh:list/dh:listItem"> -->          
+          <gen:for-each select="dh:list/dh:listItem">
             <!-- <gen:for-each select="*[local-name()!='asst']"> -->
               <xsl:apply-templates/>