diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2016-11-30 12:23:39 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2017-05-12 13:49:25 +0200 |
| commit | 2d590370f0f30eddcc2854f5e7a209f4ece1e2fb (patch) | |
| tree | e4609aa97c537c0bb5215530502ab507eb4f01fc /xmlhelp | |
| parent | 73f04a42a2d0eb2bd126f6d57854d1a6cfd1b787 (diff) | |
Look for help-specific images in the new images_helpimg archive
This requires distinguishing between 2 kinds of images: internal to
help (in helpcontent2/media/ and helpcontent2/res subfolder) and external
images from core repo (mostly icons) referenced in help
Change-Id: If1d639c255fb802c3ee7d7eab10fc0a84324f335
Reviewed-on: https://gerrit.libreoffice.org/31417
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'xmlhelp')
| -rw-r--r-- | xmlhelp/util/main_transform.xsl | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/xmlhelp/util/main_transform.xsl b/xmlhelp/util/main_transform.xsl index f7260fed6b6e..9a40abb66f15 100644 --- a/xmlhelp/util/main_transform.xsl +++ b/xmlhelp/util/main_transform.xsl @@ -111,6 +111,7 @@ <!-- parts of help and image urls --> <xsl:variable name="help_url_prefix" select="'vnd.sun.star.help://'"/> <xsl:variable name="img_url_prefix" select="concat('vnd.libreoffice.image://',$imgtheme,'/')"/> +<xsl:variable name="img_url_internal" select="'vnd.libreoffice.image://helpimg/'"/> <xsl:variable name="urlpost" select="concat('?Language=',$lang,$am,'System=',$System,$am,'UseDB=no')"/> <xsl:variable name="urlpre" select="$help_url_prefix" /> <xsl:variable name="linkprefix" select="$urlpre"/> @@ -119,9 +120,9 @@ <xsl:variable name="css" select="'default.css'"/> <!-- images for notes, tips and warnings --> -<xsl:variable name="note_img" select="concat($img_url_prefix,'res/helpimg/note.png')"/> -<xsl:variable name="tip_img" select="concat($img_url_prefix,'res/helpimg/tip.png')"/> -<xsl:variable name="warning_img" select="concat($img_url_prefix,'res/helpimg/warning.png')"/> +<xsl:variable name="note_img" select="concat($img_url_internal,'media/helpimg/note.png')"/> +<xsl:variable name="tip_img" select="concat($img_url_internal,'media/helpimg/tip.png')"/> +<xsl:variable name="warning_img" select="concat($img_url_internal,'media/helpimg/warning.png')"/> <!-- ############# @@ -800,6 +801,9 @@ <xsl:template name="insertimage"> <xsl:variable name="src"> <xsl:choose> + <xsl:when test="starts-with(@src,'media/')"> + <xsl:value-of select="concat($img_url_internal,@src)"/> + </xsl:when> <xsl:when test="not($ExtensionId='') and starts-with(@src,$ExtensionId)"> <xsl:value-of select="concat($ExtensionPath,'/',@src)"/> </xsl:when> |