[Libreoffice-commits] .: filter/source

[Libreoffice Gerrit user]

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

New commits:
commit 5781a5ea3d502332cda77ab75aa7ddd1c9ca36f7
Author: Peter Jentsch <pjotr at guineapics.de>
Date:   Mon Nov 26 21:40:56 2012 +0100

    fdo#57575 (xhtml hairline borders), fdo#57538 - xhtml right just borders.
    
    Change-Id: I9788e80829e4e9af17b4e2fd203849ca0b5e9899

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 1dedcc2..b7573fe 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
@@ -56,7 +56,10 @@
 
 				<xsl:value-of select="$borderType"/>
 				<xsl:text>-width:</xsl:text>
-				<xsl:value-of select="$borderWidthFixed"/>
+				<xsl:choose>
+					<xsl:when test="$borderWidth = '0.05pt'">thin</xsl:when>
+					<xsl:otherwise><xsl:value-of select="$borderWidthFixed"/></xsl:otherwise>
+				</xsl:choose>
 				<xsl:text>; </xsl:text>
 				<xsl:value-of select="$borderType"/>
 				<xsl:text>-style:</xsl:text>
@@ -294,11 +297,9 @@
 	<xsl:template match="@table:align">
 		<xsl:choose>
 			<xsl:when test=".='left'">
-			<!-- Note: problems with meeting minutes example
-				<xsl:text>float:right; </xsl:text> --></xsl:when>
+				<xsl:text>margin-left:0px; margin-right:auto;</xsl:text></xsl:when>
 			<xsl:when test=".='right'">
-			<!-- Note: problems with meeting minutes example
-				<xsl:text>float:left; </xsl:text> --></xsl:when>
+				<xsl:text>margin-left:auto; margin-right: 0px;</xsl:text></xsl:when>
 			<xsl:otherwise>
 				<xsl:text>float:none; </xsl:text>
 			</xsl:otherwise>