[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - filter/source

[Samuel Mehrbrodt]

 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6b9470405f63e169ce9098797213c4520f053811
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
Date:   Wed Sep 6 16:07:10 2017 +0200

    tdf#111492 Numbering: entry B.1 is exported as 2.1
    
    Look for the current number format, not always for the first one
    
    Change-Id: Ic11bcb420873bc0a5a644a05623bb801a1579dd7
    Reviewed-on: https://gerrit.libreoffice.org/42000
    Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
    Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
    Reviewed-on: https://gerrit.libreoffice.org/42009
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>

diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl 
b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index 98358fd48627..3043c1f1d312 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -1337,7 +1337,7 @@
                                                                <xsl:with-param 
name="currentoutlineLevel" select="$iOutlineLevel"/>
                                                        </xsl:call-template>
                                                </xsl:with-param>
-                                               <xsl:with-param 
name="numberFormat" 
select="$globalData/office:styles/text:outline-style/text:outline-level-style[@text:level
 = ($outlineLevel)]/@style:num-format"/>
+                                               <xsl:with-param 
name="numberFormat" 
select="$globalData/office:styles/text:outline-style/text:outline-level-style[@text:level
 = ($iOutlineLevel)]/@style:num-format"/>
                                        </xsl:call-template>
                                </xsl:if>
                                <xsl:choose>
@@ -1367,7 +1367,7 @@
                                                        <xsl:with-param 
name="currentoutlineLevel" select="$iOutlineLevel"/>
                                                </xsl:call-template>
                                        </xsl:with-param>
-                                       <xsl:with-param name="numberFormat" 
select="$globalData/office:styles/text:outline-style/text:outline-level-style[@text:level
 = $outlineLevel]/@style:num-format"/>
+                                       <xsl:with-param name="numberFormat" 
select="$globalData/office:styles/text:outline-style/text:outline-level-style[@text:level
 = $iOutlineLevel]/@style:num-format"/>
                                        <xsl:with-param name="last" 
select="true()"/>
                                </xsl:call-template>
                        </xsl:otherwise>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits