From 1b56fd5263a1dc92cf802ecd08f99801fc93b1e2 Mon Sep 17 00:00:00 2001
From: "Sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 29 Jan 2009 19:39:15 +0530
Subject: [PATCH] Added Sequencing functionality to Reports

bzr revid: sbh@tinyerp.com-20090129140915-qr9jmfiq4zkxbn7b
---
 .../tiny_sxw2rml/normalized_odt2rml.xsl       | 41 ++++++++++---------
 .../wizard/tiny_sxw2rml/normalized_oo2rml.xsl | 25 +++++------
 2 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_odt2rml.xsl b/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_odt2rml.xsl
index b8c48673753..a2271d9874f 100644
--- a/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_odt2rml.xsl
+++ b/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_odt2rml.xsl
@@ -6,16 +6,16 @@
   xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
   xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
   xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-  xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
+  xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
   xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
-  xmlns:xlink="http://www.w3.org/1999/xlink" 
-  xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
   xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-  xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
-  xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
-  xmlns:math="http://www.w3.org/1998/Math/MathML" 
-  xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
-  xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
+  xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+  xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
+  xmlns:math="http://www.w3.org/1998/Math/MathML"
+  xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
+  xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
   office:class="text" office:version="1.1"
   exclude-result-prefixes = "xsl fo office style text table draw xlink number svg chart dr3d math form script">
 
@@ -233,6 +233,7 @@
 		</xsl:apply-templates>
 		<frameEnd />
 	</xsl:for-each>
+	<para><seqReset id="{//text:ordered-list/@text:style-name}"/></para>
   </story>
 </xsl:template>
 
@@ -371,7 +372,7 @@
 
 <xsl:template match="text:ordered-list">
   <xsl:apply-templates />
-  <para><seqreset id="ordered_list" /></para>
+
   <!-- Reset the counter. seqreset is not a trml2pdf tag, but a Platypus Intra Paragraph Markup,
        so it needs a dummy paragraph to enclose it -->
 </xsl:template>
@@ -396,7 +397,7 @@
           </xsl:otherwise>
         </xsl:choose>
         <xsl:attribute name="bulletFontName">ZapfDingbats</xsl:attribute>
-        <xsl:attribute name="bulletText">l</xsl:attribute>        
+        <xsl:attribute name="bulletText">l</xsl:attribute>
       </xsl:when>
       <xsl:otherwise>
         <!-- Generate the numbers for an ordered list -->
@@ -411,7 +412,7 @@
               <xsl:value-of select="$size" />
             </xsl:attribute>
           </xsl:if>
-          <seq id="ordered_list" />.</bullet>
+          <seq id="{//text:ordered-list/@text:style-name}"/>.</bullet>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:if>
@@ -481,7 +482,7 @@
 </xsl:template>
 
 -->
-            
+
 <xsl:template match="style:style[@style:family='paragraph']">
   <paraStyle>
     <xsl:attribute name="name">
@@ -504,12 +505,12 @@
   <xsl:if test="not($right_indent='') and boolean(style:properties/@fo:margin-right)">
     <xsl:attribute name="rightIndent">
       <xsl:value-of select="$right_indent" />
-    </xsl:attribute>      
+    </xsl:attribute>
   </xsl:if>
   <xsl:if test="not($left_indent='') and boolean(style:properties/@fo:margin-left)">
     <xsl:attribute name="leftIndent">
       <xsl:value-of select="$left_indent" />
-    </xsl:attribute>      
+    </xsl:attribute>
   </xsl:if>
 </xsl:template>
 
@@ -544,7 +545,7 @@
 </xsl:template>
 
 <xsl:template name="make_fontsize">
-  <xsl:variable name="fontSize">       
+  <xsl:variable name="fontSize">
     <xsl:value-of select="style:properties/@fo:font-size" />
   </xsl:variable>
   <xsl:if test="not($fontSize='') and boolean(style:properties/@fo:font-size)">
@@ -560,10 +561,10 @@
 
 <!--this template is not needed anymore for "normalized" sxw files -->
 <xsl:template name="make_parent">
-  <xsl:variable name="parent">       
+  <xsl:variable name="parent">
     <xsl:value-of select="@style:parent-style-name" />
   </xsl:variable>
-  <xsl:if test="not($parent='') and boolean(@style:parent-style-name)">    
+  <xsl:if test="not($parent='') and boolean(@style:parent-style-name)">
     <xsl:attribute name="parent">
       <xsl:value-of select="$parent" />
     </xsl:attribute>
@@ -639,7 +640,7 @@
         </xsl:when>
         <xsl:otherwise>
           <xsl:text>Helvetica</xsl:text>
-        </xsl:otherwise>        
+        </xsl:otherwise>
       </xsl:choose>
     </xsl:when>
     <xsl:otherwise>
@@ -655,14 +656,14 @@
         </xsl:when>
         <xsl:otherwise>
           <xsl:text>Times-Roman</xsl:text>
-        </xsl:otherwise>        
+        </xsl:otherwise>
       </xsl:choose>
     </xsl:otherwise>
   </xsl:choose>
 </xsl:when>
 <xsl:otherwise>
   <!--Use this as default -->
-  <xsl:text>Times-Roman</xsl:text>   
+  <xsl:text>Times-Roman</xsl:text>
 </xsl:otherwise>
 </xsl:choose>
 </xsl:template>
diff --git a/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_oo2rml.xsl b/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_oo2rml.xsl
index b4961234af0..685db1df45e 100644
--- a/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_oo2rml.xsl
+++ b/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_oo2rml.xsl
@@ -233,6 +233,7 @@
 		</xsl:apply-templates>
 		<frameEnd />
 	</xsl:for-each>
+	<para><seqReset id="{//text:ordered-list/@text:style-name}"/></para>
   </story>
 </xsl:template>
 
@@ -371,7 +372,7 @@
 
 <xsl:template match="text:ordered-list">
   <xsl:apply-templates />
-  <para><seqreset id="ordered_list" /></para>
+
   <!-- Reset the counter. seqreset is not a trml2pdf tag, but a Platypus Intra Paragraph Markup,
        so it needs a dummy paragraph to enclose it -->
 </xsl:template>
@@ -396,7 +397,7 @@
           </xsl:otherwise>
         </xsl:choose>
         <xsl:attribute name="bulletFontName">ZapfDingbats</xsl:attribute>
-        <xsl:attribute name="bulletText">l</xsl:attribute>        
+        <xsl:attribute name="bulletText">l</xsl:attribute>
       </xsl:when>
       <xsl:otherwise>
         <!-- Generate the numbers for an ordered list -->
@@ -411,7 +412,7 @@
               <xsl:value-of select="$size" />
             </xsl:attribute>
           </xsl:if>
-          <seq id="ordered_list" />.</bullet>
+          <seq id="{//text:ordered-list/@text:style-name}"/>.</bullet>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:if>
@@ -481,7 +482,7 @@
 </xsl:template>
 
 -->
-            
+
 <xsl:template match="style:style[@style:family='paragraph']">
   <paraStyle>
     <xsl:attribute name="name">
@@ -504,12 +505,12 @@
   <xsl:if test="not($right_indent='') and boolean(style:properties/@fo:margin-right)">
     <xsl:attribute name="rightIndent">
       <xsl:value-of select="$right_indent" />
-    </xsl:attribute>      
+    </xsl:attribute>
   </xsl:if>
   <xsl:if test="not($left_indent='') and boolean(style:properties/@fo:margin-left)">
     <xsl:attribute name="leftIndent">
       <xsl:value-of select="$left_indent" />
-    </xsl:attribute>      
+    </xsl:attribute>
   </xsl:if>
 </xsl:template>
 
@@ -544,7 +545,7 @@
 </xsl:template>
 
 <xsl:template name="make_fontsize">
-  <xsl:variable name="fontSize">       
+  <xsl:variable name="fontSize">
     <xsl:value-of select="style:properties/@fo:font-size" />
   </xsl:variable>
   <xsl:if test="not($fontSize='') and boolean(style:properties/@fo:font-size)">
@@ -560,10 +561,10 @@
 
 <!--this template is not needed anymore for "normalized" sxw files -->
 <xsl:template name="make_parent">
-  <xsl:variable name="parent">       
+  <xsl:variable name="parent">
     <xsl:value-of select="@style:parent-style-name" />
   </xsl:variable>
-  <xsl:if test="not($parent='') and boolean(@style:parent-style-name)">    
+  <xsl:if test="not($parent='') and boolean(@style:parent-style-name)">
     <xsl:attribute name="parent">
       <xsl:value-of select="$parent" />
     </xsl:attribute>
@@ -639,7 +640,7 @@
         </xsl:when>
         <xsl:otherwise>
           <xsl:text>Helvetica</xsl:text>
-        </xsl:otherwise>        
+        </xsl:otherwise>
       </xsl:choose>
     </xsl:when>
     <xsl:otherwise>
@@ -655,14 +656,14 @@
         </xsl:when>
         <xsl:otherwise>
           <xsl:text>Times-Roman</xsl:text>
-        </xsl:otherwise>        
+        </xsl:otherwise>
       </xsl:choose>
     </xsl:otherwise>
   </xsl:choose>
 </xsl:when>
 <xsl:otherwise>
   <!--Use this as default -->
-  <xsl:text>Times-Roman</xsl:text>   
+  <xsl:text>Times-Roman</xsl:text>
 </xsl:otherwise>
 </xsl:choose>
 </xsl:template>