help3xsl/online_transform.xsl | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
New commits:
commit 991e7f1f76d5ff87373cdf6e9f74897f36d8c393
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Fri Sep 7 06:21:23 2018 -0300
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Fri Sep 7 15:47:33 2018 +0200
Height and width are <img> attributes
Change-Id: Ia8084ff7029ddd06e450cbf03a7b1fb5efaa7dc7
Reviewed-on: https://gerrit.libreoffice.org/60136
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index 5e7859b97..70843b4c3 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -1078,18 +1078,15 @@
<xsl:variable name="alt"><xsl:value-of select="./alt"/></xsl:variable>
<xsl:variable name="width">
<xsl:if test="string-length(@width)!=0">
- <xsl:value-of select="'width:'"/>
<xsl:call-template name="convert2px"><xsl:with-param name="value"
select="@width"/></xsl:call-template>
</xsl:if>
</xsl:variable>
<xsl:variable name="height">
<xsl:if test="string-length(@height)!=0">
- <xsl:value-of select="'height:'"/>
<xsl:call-template name="convert2px"><xsl:with-param name="value"
select="@height"/></xsl:call-template>
</xsl:if>
</xsl:variable>
- <img src="{$src2}" alt="{$alt}" title="{$alt}">
- <xsl:attribute name="style"><xsl:value-of select="concat($width,';
')"/><xsl:value-of select="concat($height,';')"/></xsl:attribute>
+ <img src="{$src2}" alt="{$alt}" title="{$alt}" height="{$height}"
width="{$width}">
<xsl:if test="ancestor::tablecell">
<xsl:attribute name="class"><xsl:value-of
select="'imageicon'"/></xsl:attribute>
<xsl:attribute name="src"><xsl:value-of
select="concat(substring-before($src2,'.png'),'.svg')"/></xsl:attribute>
@@ -1205,13 +1202,13 @@
<xsl:param name="value"/>
<xsl:choose>
<xsl:when test="contains($value, 'cm')">
- <xsl:value-of select="concat(round(number(substring-before($value,
'cm')) * $dpcm),'px;')"/>
+ <xsl:value-of select="concat(round(number(substring-before($value,
'cm')) * $dpcm),'px')"/>
</xsl:when>
<xsl:when test="contains($value, 'mm')">
- <xsl:value-of select="concat(round(number(substring-before($value,
'mm')) * $dpmm),'px;')"/>
+ <xsl:value-of select="concat(round(number(substring-before($value,
'mm')) * $dpmm),'px')"/>
</xsl:when>
<xsl:when test="contains($value, 'in')">
- <xsl:value-of select="concat(round(number(substring-before($value,
'in')) * $dpi),'px;')"/>
+ <xsl:value-of select="concat(round(number(substring-before($value,
'in')) * $dpi),'px')"/>
</xsl:when>
<xsl:when test="contains($value, 'px')">
<xsl:value-of select="$value"/>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
