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

[Michael Stahl (via logerrit)]

 filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 452bf1359dab3cfab9fd6007d68592e9c96382b3
Author:     Michael Stahl <michael.stahl at allotropia.de>
AuthorDate: Fri Jun 4 17:29:51 2021 +0200
Commit:     Michael Stahl <michael.stahl at allotropia.de>
CommitDate: Fri Jun 4 20:04:09 2021 +0200

    tdf#142483 filter: xhtml: fix substitution of fo:border attribute
    
    This worked with Saxon but not with libxslt.
    
    (regression from 9d3b39cf9fed9a305ac23d1ecaaafc8f7caaeeb0)
    
    Change-Id: I18e66e6136e4fc73718bbe9c7c4c66fb76be31c3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116728
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
index 389be7da5638..bac0c5963ccd 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
@@ -516,10 +516,10 @@
 
             <!-- split border into border parts for better activation-check on style:joint-border feature -->
             <xsl:if test="*/@fo:border">
-                <xsl:attribute name="fo:border-top" select="*/@fo:border" />
-                <xsl:attribute name="fo:border-left" select="*/@fo:border" />
-                <xsl:attribute name="fo:border-bottom" select="*/@fo:border" />
-                <xsl:attribute name="fo:border-right" select="*/@fo:border" />
+                <xsl:attribute name="fo:border-top"><xsl:value-of select="*/@fo:border"/></xsl:attribute>
+                <xsl:attribute name="fo:border-left"><xsl:value-of select="*/@fo:border"/></xsl:attribute>
+                <xsl:attribute name="fo:border-bottom"><xsl:value-of select="*/@fo:border"/></xsl:attribute>
+                <xsl:attribute name="fo:border-right"><xsl:value-of select="*/@fo:border"/></xsl:attribute>
             </xsl:if>
 
            <!--All current attributes will override already inserted attributes of the same name