filter/source/xslt/odf2xhtml/export/xhtml/header.xsl | 24 +++++++++++--------
1 file changed, 15 insertions(+), 9 deletions(-)
New commits:
commit 78a8c751b87c1df5edb9093de368739bd1c09b9e
Author: Andreas Brandner <andreas.brand...@cib.de>
Date: Fri Apr 13 14:07:58 2018 +0200
tdf#116990 Unwanted line breaks if ODS export to XHTML
Change-Id: I86cc48d74f0572a7ba18beabbaf307bcaa069d38
Reviewed-on: https://gerrit.libreoffice.org/53087
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>
Reviewed-on: https://gerrit.libreoffice.org/53409
diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
index 6af404c46137..ed1cb3ea6971 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
@@ -86,15 +86,21 @@
<xsl:with-param name="globalData" select="$globalData" />
</xsl:call-template>
<xsl:text>table { border-collapse:collapse; border-spacing:0; empty-cells:show
}
- </xsl:text>
- <xsl:choose>
- <xsl:when
test="/*/office:body/office:spreadsheet"><xsl:text>td, th { vertical-align:top;
font-size:10pt;}
- </xsl:text></xsl:when>
- <xsl:otherwise><xsl:text>td, th { vertical-align:top;
font-size:12pt;}
- </xsl:text></xsl:otherwise>
- </xsl:choose>
-<xsl:text>h1, h2, h3, h4, h5, h6 { clear:both }
- </xsl:text>
+ </xsl:text>
+ <xsl:choose>
+ <xsl:when test="/*/office:body/office:spreadsheet"><xsl:text>td, th {
vertical-align:top; font-size:10pt;}
+ </xsl:text></xsl:when>
+ <xsl:otherwise><xsl:text>td, th { vertical-align:top; font-size:12pt;}
+ </xsl:text></xsl:otherwise>
+ </xsl:choose>
+<xsl:text>h1, h2, h3, h4, h5, h6 { clear:both;}
+ </xsl:text>
+<xsl:choose>
+ <xsl:when test="/*/office:body/office:spreadsheet">
+ <xsl:text>p { white-space: nowrap; }
+ </xsl:text>
+ </xsl:when>
+</xsl:choose>
<xsl:text>ol, ul { margin:0; padding:0;}
</xsl:text>
<xsl:text>li { list-style: none; margin:0; padding:0;}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
