[Libreoffice-commits] help.git: GeneratedPackage_html_icon-themes.mk help3xsl/online_transform.xsl

[Libreoffice Gerrit user]

 GeneratedPackage_html_icon-themes.mk |    2 +-
 help3xsl/online_transform.xsl        |    7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 39da00d7b4006f8bffe2075ac7c58afbdbc81785
Author:     Olivier Hallot <olivier.hallot at libreoffice.org>
AuthorDate: Wed Sep 5 17:19:44 2018 -0300
Commit:     Olivier Hallot <olivier.hallot at libreoffice.org>
CommitDate: Thu Sep 6 17:06:15 2018 +0200

    tdf#117551 Change icons to SVG equivalent
    
    Change-Id: I5d174b434429485d270ba7b6e9147a3bc2b84828
    Reviewed-on: https://gerrit.libreoffice.org/60056
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>

diff --git a/GeneratedPackage_html_icon-themes.mk b/GeneratedPackage_html_icon-themes.mk
index 7d27e7a2c..68c857ade 100644
--- a/GeneratedPackage_html_icon-themes.mk
+++ b/GeneratedPackage_html_icon-themes.mk
@@ -11,6 +11,6 @@
 
 $(eval $(call gb_GeneratedPackage_GeneratedPackage,helpcontent2_html_icon-themes,$(SRCDIR)/icon-themes))
 
-$(eval $(call gb_GeneratedPackage_add_dir,helpcontent2_html_icon-themes,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media/icon-themes,colibre))
+$(eval $(call gb_GeneratedPackage_add_dir,helpcontent2_html_icon-themes,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media/icon-themes,colibre_svg))
 
 # vim: set noet sw=4 ts=4:
diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index 67ea70220..cbd43cd7e 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -99,9 +99,9 @@
 <xsl:variable name="linkpostfix" select="''"/>
 
 <!-- images for notes, tips and warnings -->
-<xsl:variable name="note_img" select="concat($img_url_prefix,'icon-themes/help/note.png')"/>
-<xsl:variable name="tip_img" select="concat($img_url_prefix,'icon-themes/help/tip.png')"/>
-<xsl:variable name="warning_img" select="concat($img_url_prefix,'icon-themes/help/warning.png')"/>
+<xsl:variable name="note_img" select="concat($img_url_prefix,'icon-themes/help/note.svg')"/>
+<xsl:variable name="tip_img" select="concat($img_url_prefix,'icon-themes/help/tip.svg')"/>
+<xsl:variable name="warning_img" select="concat($img_url_prefix,'icon-themes/help/warning.svg')"/>
 
 <!-- Strings for the help UI page -->
 <xsl:variable name="tmp_href_ui"><xsl:value-of select="concat($urlpre,'text/shared/help/browserhelp.xhp')"/></xsl:variable>
@@ -1092,6 +1092,7 @@
         <xsl:attribute name="style"><xsl:value-of select="$width"/><xsl:value-of select="$height"/></xsl:attribute>
         <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>
         </xsl:if>
     </img>
 </xsl:template>