wangxin/help
1
0
Fork 0
forked from amazingfate/help
Code Pull Requests Activity

fix commit 622324ec76e54ea1de99d6cea3debc2389049f5

Browse Source 
* SVG images cannot have undefined width and height
* pick'd a mistake in setting generic images width and height

Change-Id: I9f3e62e535c82d624c5c209b0e000784b2765604
Reviewed-on: https://gerrit.libreoffice.org/67234
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
This commit is contained in:
Olivier Hallot
2019-01-31 18:27:58 +01:00
parent 622324ec76
commit c19fd80def
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
help3xsl/online_transform.xsl
View File

@ -94,6 +94,7 @@
<xsl:variable name="linkpostfix" select="''"/>
<!-- images for notes, tips and warnings -->
<xsl:variable name="iconsizestyle" select="'width:40px;height=40px;'"/>
<xsl:variable name="note_img" select="concat($img_url_prefix,'icon-themes/res/helpimg/note.svg')"/>
<xsl:variable name="tip_img" select="concat($img_url_prefix,'icon-themes/res/helpimg/tip.svg')"/>
<xsl:variable name="warning_img" select="concat($img_url_prefix,'icon-themes/res/helpimg/warning.svg')"/>
@ -851,7 +852,7 @@
</xsl:choose>
</xsl:variable>
<div class="{local-name()}">
<div class="noteicon"><img src="{$imgsrc}" alt="{local-name()}" title="{local-name()}"/></div>
<div class="noteicon"><img src="{$imgsrc}" alt="{local-name()}" title="{local-name()}" style="{$iconsizestyle}"/></div>
<div class="notetext"><p id="{@id}"><xsl:apply-templates /></p></div>
</div>
<br/>
@ -865,7 +866,7 @@
</xsl:choose>
</xsl:variable>
<div class="{local-name()}">
<div class="noteicon"><img src="{$imgsrc}" alt="{local-name()}" title="{local-name()}"/></div>
<div class="noteicon"><img src="{$imgsrc}" alt="{local-name()}" title="{local-name()}" style="{$iconsizestyle}"/></div>
<div class="notetext"><p id="{@id}"><xsl:apply-templates mode="embedded"/></p></div>
</div>
<br/>
@ -1036,7 +1037,7 @@
<xsl:apply-templates select="$doc//variable[@id=$anchor]" mode="embedded"/>
</xsl:variable>
<div class="{$type}">
<div class="noteicon"><img src="{$imgsrc}" alt="{$alt}" title="{$alt}"/></div>
<div class="noteicon"><img src="{$imgsrc}" alt="{$alt}" title="{$alt}" style="{$iconsizestyle}"/></div>
<div class="notetext"><p><xsl:apply-templates /></p></div>
</div>
<br/>
@ -1197,9 +1198,7 @@
<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="$width"/><xsl:value-of select="$height"/></xsl:attribute>
</img>
<img src="{$src2}" alt="{$alt}" title="{$alt}" style="{concat('width:',$width,';height:',$height)}"/>
</xsl:template>
<!-- Insert an object -->