mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Look for help-specific images in the new images_helpimg archive

Browse Source 
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>
This commit is contained in:
Katarina Behrens 2016-11-30 12:23:39 +01:00 committed by Christian Lohmaier
parent 73f04a42a2
commit 2d590370f0
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vcl/source/image/ImplImageTree.cxx
View File

@ -264,6 +264,8 @@ OUString ImplImageTree::fallbackStyle(const OUString& rsStyle)
sResult = "galaxy";
else if (rsStyle == "sifr" || rsStyle == "breeze_dark")
sResult = "breeze";
else if (rsStyle == "helpimg")
sResult = "";
else
sResult = "tango";

10
xmlhelp/util/main_transform.xsl
View File

@ -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>