[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - filter/source

[Samuel Mehrbrodt]

 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl   |    6 +++---
 filter/source/xslt/odf2xhtml/export/xhtml/header.xsl |    2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 0f689a844576bbb200d5b9bb7b822fa53396f3e0
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Thu Sep 7 09:34:14 2017 +0200

    xhtml filter: Use css class instead of <style> attribute
    
    Change-Id: I9d63e03b609298e737e55f0d850eb78206171817
    Reviewed-on: https://gerrit.libreoffice.org/42038
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    (cherry picked from commit 1da162bedf1ab3907caa5ed8ba202a8251dae0a1)
    Reviewed-on: https://gerrit.libreoffice.org/42260
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index 3043c1f1d312..0d400754a40c 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -1279,10 +1279,10 @@
 				<xsl:variable name="currentOutlineLevel" select="@text:outline-level"/>
 				<xsl:variable name="labelFollowedBy" select="$globalData//office:document/office:styles/text:outline-style/text:outline-level-style[@text:level = $currentOutlineLevel]/style:list-level-properties[@text:list-level-position-and-space-mode='label-alignment']/style:list-level-label-alignment/@text:label-followed-by"/>
 
-				<!-- Add some margin (a tab is around 0.64cm in LO), but only if there is a number preceding the heading. -->
+				<!-- Add some margin, but only if there is a number preceding the heading. -->
 				<xsl:if test="$labelFollowedBy='listtab' and $headingNumber != ''">
-					<xsl:attribute name="style">
-						<xsl:text>margin-right:0.8rem;</xsl:text>
+					<xsl:attribute name="class">
+						<xsl:text>heading_numbering</xsl:text>
 					</xsl:attribute>
 				</xsl:if>
 				<xsl:copy-of select="$headingNumber"/>
diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
index 46e66ff557b9..dcbeda0a3297 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
@@ -106,6 +106,8 @@
 	</xsl:text>
 <xsl:text>span.annotation_style_by_filter { font-size:95%; font-family:Arial; background-color:#fff000;  margin:0; border:0; padding:0;  }
 	</xsl:text>
+<!-- Simulate tabs. They are around 0.64cm in LO, we convert that to 0.8rem. -->
+<xsl:text>span.heading_numbering { margin-right: 0.8rem; }</xsl:text>
 <xsl:text>* { margin:0;}
 	</xsl:text>
 			<xsl:call-template name="write-mapped-CSS-styles">