filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl | 12
++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 3f6946cfd7021dccdc3c2787442d20c168c197d1
Author: Peter Jentsch <pj...@guineapics.de>
Date: Thu Nov 29 21:53:24 2012 +0100
fix fdo#57641 table alignment broken in XHTML export
Change-Id: Ibbb88c1ecaaac14866145753e383609db2a3dd1a
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 b7573fe..986dd3d 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
@@ -297,9 +297,17 @@
<xsl:template match="@table:align">
<xsl:choose>
<xsl:when test=".='left'">
- <xsl:text>margin-left:0px;
margin-right:auto;</xsl:text></xsl:when>
+ <xsl:if
test="not(../@fo:margin-left)">margin-left:0px; </xsl:if>
+
<xsl:text>margin-right:auto;</xsl:text></xsl:when>
<xsl:when test=".='right'">
- <xsl:text>margin-left:auto; margin-right:
0px;</xsl:text></xsl:when>
+ <xsl:text>margin-left:auto</xsl:text>
+ <xsl:if test="not(../@fo:margin-right)">
+ ; margin-right: 0px;
+ </xsl:if>
+ </xsl:when>
+ <xsl:when test=".='center'">
+ margin-left:auto;margin-right:auto;
+ </xsl:when>
<xsl:otherwise>
<xsl:text>float:none; </xsl:text>
</xsl:otherwise>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
