[Libreoffice-commits] help.git: CustomTarget_html.mk help3xsl/get_bookmark.xsl help3xsl/get_tree.xsl help3xsl/get_url.xsl help3xsl/online_transform.xsl

[Libreoffice Gerrit user]

 CustomTarget_html.mk          |    9 ++++++---
 help3xsl/get_bookmark.xsl     |    2 +-
 help3xsl/get_tree.xsl         |    2 +-
 help3xsl/get_url.xsl          |    5 -----
 help3xsl/online_transform.xsl |    6 ++----
 5 files changed, 10 insertions(+), 14 deletions(-)

New commits:
commit dbbcc7c949167f4a88fa91373f3012e67e30d255
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Thu Aug 9 19:11:13 2018 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Thu Aug 9 19:34:58 2018 +0200

    Use PRODUCTNAME from the configure.
    
    Change-Id: Ibc742e653f44093372bed4e103fedb3a597dfdac
    Reviewed-on: https://gerrit.libreoffice.org/58793
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index 8f62975fe..b1f3fd8ec 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -80,7 +80,8 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/contents.part : \
 		$(call gb_ExternalExecutable_get_command,xsltproc) \
 			--stringparam lang $(LANG) \
 			--stringparam local $(if $(HELP_ONLINE),'no','yes') \
-			--stringparam productversion $(PRODUCTVERSION) \
+			--stringparam productname "$(PRODUCTNAME)" \
+			--stringparam productversion "$(PRODUCTVERSION)" \
 			-o $@ \
 			$(SRCDIR)/helpcontent2/help3xsl/get_tree.xsl \
 			$(TREE_FILE) \
@@ -112,7 +113,8 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/html.text : \
 				--stringparam Language $* \
 				--stringparam local $(if $(HELP_ONLINE),'no','yes') \
 				--stringparam root $(if $(filter WNT,$(OS)),$$(cygpath -m `pwd`),`pwd`)/ \
-				--stringparam productversion $(PRODUCTVERSION) \
+				--stringparam productname "$(PRODUCTNAME)" \
+				--stringparam productversion "$(PRODUCTVERSION)" \
 				-o $(dir $@)$${xhp%.xhp}.html \
 				$(SRCDIR)/helpcontent2/help3xsl/online_transform.xsl \
 				$(if $(filter WNT,$(OS)),$$(cygpath -m `pwd`),`pwd`)/$$xhp \
@@ -174,7 +176,8 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/bookmarks.part : \
 					--stringparam app $(APP) \
 					--stringparam Language $(HELP_LANG) \
 					--stringparam local $(if $(HELP_ONLINE),'no','yes') \
-					--stringparam productversion $(PRODUCTVERSION) \
+					--stringparam productname "$(PRODUCTNAME)" \
+					--stringparam productversion "$(PRODUCTVERSION)" \
 					$(SRCDIR)/helpcontent2/help3xsl/get_bookmark.xsl \
 					$$xhp \
 			; done \
diff --git a/help3xsl/get_bookmark.xsl b/help3xsl/get_bookmark.xsl
index 5c0bc8cff..b3e0ab48b 100644
--- a/help3xsl/get_bookmark.xsl
+++ b/help3xsl/get_bookmark.xsl
@@ -18,7 +18,7 @@ xsltproc get_bookmark.xsl <file.xhp>
 <xsl:param name="app"/>
 <xsl:param name="local"/>
 <xsl:param name="Language"/>
-<xsl:param name="productname" select="'LibreOffice'"/>
+<xsl:param name="productname"/>
 <xsl:param name="productversion"/>
 
 <xsl:output indent="yes" method="text"/>
diff --git a/help3xsl/get_tree.xsl b/help3xsl/get_tree.xsl
index e20774dd0..749dd4a53 100644
--- a/help3xsl/get_tree.xsl
+++ b/help3xsl/get_tree.xsl
@@ -16,7 +16,7 @@ xsltproc get_tree.xsl <file.tree>
 <xsl:param name="lang"/>
 <xsl:param name="local"/>
 <xsl:param name="productversion"/>
-<xsl:param name="productname" select="'LibreOffice'"/>
+<xsl:param name="productname"/>
 <xsl:output indent="no" method="text"/>
 <!--
 ############################
diff --git a/help3xsl/get_url.xsl b/help3xsl/get_url.xsl
index 0f9a3f1a5..59e2e4edd 100644
--- a/help3xsl/get_url.xsl
+++ b/help3xsl/get_url.xsl
@@ -15,11 +15,6 @@ xsltproc get_bookmark.xsl <file.xhp>
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
-<xsl:param name="app"/>
-<xsl:param name="Language"/>
-<xsl:param name="productname" select="'LibreOffice'"/>
-<xsl:param name="productversion"/>
-
 <xsl:output indent="yes" method="text"/>
 
 <!--
diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index 8ad842669..26231d656 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -29,18 +29,16 @@
 ############################
 //-->
 
-<xsl:param name="productversion"/>
 <xsl:param name="local" />
 <xsl:param name="root"/>
 <xsl:param name="Language"/>
+<xsl:param name="productname"/>
+<xsl:param name="productversion"/>
 
-<xsl:param name="productname" select="'LibreOffice'"/>
 <xsl:param name="System" select="'WIN'"/>
 <xsl:param name="imgtheme" select="''"/>
 <xsl:param name="Id" />
 
-
-
 <!-- General Usage -->
 <xsl:variable name="am" select="'&'"/>
 <xsl:variable name="sl" select="'/'"/>