[Libreoffice-commits] core.git: filter/source

[Gian Domenico Ceccarini]

 filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 78f5923e7cec0f6a0b3dbcbe29bad1980593454c
Author: Gian Domenico Ceccarini <gdceccarini at gmail.com>
Date:   Fri Jan 13 08:54:26 2017 +0100

    use . as decimal separator in exported number format
    
    Change-Id: I951995a028274c93e0c0b7226e6d2dceec5a916d
    Reviewed-on: https://gerrit.libreoffice.org/33022
    Tested-by: Jenkins <ci at libreoffice.org>
    Tested-by: jan iversen <jani at documentfoundation.org>
    Reviewed-by: jan iversen <jani at documentfoundation.org>

diff --git a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
index 5c9b624..d8d5b0e 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
@@ -333,6 +333,7 @@
 			- 0.0133cm for solid style
 			- 0.0399cm for double style
 		 as there are three border lines painted -->
+	<xsl:decimal-format name = "unifiedFormat" decimal-separator = "." />
 	<xsl:template name="round-up-border-width">
 		<xsl:param name="borderWidth"/>
 		<xsl:param name="multiplier"/>
@@ -345,11 +346,11 @@
 		<xsl:variable name="minimalBorderWidth" select="0.0133 * $multiplier"/>
 		<xsl:choose>
 			<xsl:when test="number($borderWidthByCentimeter) < $minimalBorderWidth">
-				<xsl:value-of select="$minimalBorderWidth"/>
+				<xsl:value-of select="format-number($minimalBorderWidth,'0.######','unifiedFormat')"/>
 				<xsl:text>cm</xsl:text>
 			</xsl:when>
 			<xsl:otherwise>
-				<xsl:value-of select="borderWidthByCentimeter"/>
+				<xsl:value-of select="format-number($borderWidthByCentimeter,'0.######','unifiedFormat')"/>
 				<xsl:text>cm</xsl:text>
 			</xsl:otherwise>
 		</xsl:choose>