summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2017-09-06 16:07:10 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2017-09-13 21:26:45 +0200
commit6b9470405f63e169ce9098797213c4520f053811 (patch)
treecc12edc9af9fe4bf62c96238b0bc73e3c756756c
parent3de0b7ecaac7b00d82a7ce74212d98ce44c30818 (diff)
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.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Reviewed-on: https://gerrit.libreoffice.org/42009 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
-rw-r--r--filter/source/xslt/odf2xhtml/export/xhtml/body.xsl4
1 files changed, 2 insertions, 2 deletions
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>