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

[Andreas Brandner]

 filter/source/xslt/odf2xhtml/export/xhtml/header.xsl |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit cc10b063235dcb25ad16f697ea0b1ff91a10bacb
Author: Andreas Brandner <Andreas.Brandner at 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.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
index b75d6ff7cfda..526e5cc56ae8 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
@@ -93,6 +93,12 @@
     </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;}