diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-28 08:29:09 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-28 08:29:09 +0000 |
| commit | 2b7d017e8d3ed9e5fcee6587670d7dab6ecc15e9 (patch) | |
| tree | e420797a5d9c73a7909bb1bde42db4db18d1fefe /helpcontent2 | |
| parent | 5c80a933255418846027123334194f97919be709 (diff) | |
INTEGRATION: CWS hc680postbeta (1.8.2); FILE MERGED
2005/01/18 15:18:39 fpe 1.8.2.2: regular update
2005/01/18 09:24:28 fpe 1.8.2.1: tree files updated
Diffstat (limited to 'helpcontent2')
| -rw-r--r-- | helpcontent2/source/auxiliary/main_transform.xsl | 58 |
1 files changed, 39 insertions, 19 deletions
diff --git a/helpcontent2/source/auxiliary/main_transform.xsl b/helpcontent2/source/auxiliary/main_transform.xsl index 296c6af724..7e3392682c 100644 --- a/helpcontent2/source/auxiliary/main_transform.xsl +++ b/helpcontent2/source/auxiliary/main_transform.xsl @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - ========================= + ========================= DEBUG VERSION ONLY - ========================= + ========================= //--> @@ -23,6 +23,7 @@ Added <p> tags around falsely embedded pars and vars Dec 08 2004 #i38483#, fixed wrong handling of web links #i37377#, fixed missing usage of Database parameter for switching + Jan 04 2005 #i38905#, fixed buggy branding replacement template ***********************************************************************//--> <!--*********************************************************************** @@ -530,39 +531,58 @@ <!-- Branding --> <xsl:template name="brand" > <xsl:param name="string"/> - <xsl:choose> - <xsl:when test="contains($string,$brand1)"> - <xsl:value-of select="substring-before($string,$brand1)"/> - <xsl:value-of select="$productname"/> + + <xsl:choose> + + <xsl:when test="contains($string,$brand1)"> + <xsl:variable name="newstr"> + <xsl:value-of select="substring-before($string,$brand1)"/> + <xsl:value-of select="$productname"/> + <xsl:value-of select="substring-after($string,$brand1)"/> + </xsl:variable> <xsl:call-template name="brand"> - <xsl:with-param name="string" select="substring-after($string,$brand1)"/> + <xsl:with-param name="string" select="$newstr"/> </xsl:call-template> </xsl:when> + <xsl:when test="contains($string,$brand2)"> - <xsl:value-of select="substring-before($string,$brand2)"/> - <xsl:value-of select="$productversion"/> + <xsl:variable name="newstr"> + <xsl:value-of select="substring-before($string,$brand2)"/> + <xsl:value-of select="$productversion"/> + <xsl:value-of select="substring-after($string,$brand2)"/> + </xsl:variable> <xsl:call-template name="brand"> - <xsl:with-param name="string" select="substring-after($string,$brand2)"/> + <xsl:with-param name="string" select="$newstr"/> </xsl:call-template> </xsl:when> + <xsl:when test="contains($string,$brand3)"> - <xsl:value-of select="substring-before($string,$brand3)"/> - <xsl:value-of select="$productname"/> + <xsl:variable name="newstr"> + <xsl:value-of select="substring-before($string,$brand3)"/> + <xsl:value-of select="$productname"/> + <xsl:value-of select="substring-after($string,$brand3)"/> + </xsl:variable> <xsl:call-template name="brand"> - <xsl:with-param name="string" select="substring-after($string,$brand3)"/> + <xsl:with-param name="string" select="$newstr"/> </xsl:call-template> </xsl:when> - <xsl:when test="contains($string,$brand4)"> - <xsl:value-of select="substring-before($string,$brand4)"/> - <xsl:value-of select="$productversion"/> + + <xsl:when test="contains($string,$brand4)"> + <xsl:variable name="newstr"> + <xsl:value-of select="substring-before($string,$brand4)"/> + <xsl:value-of select="$productversion"/> + <xsl:value-of select="substring-after($string,$brand4)"/> + </xsl:variable> <xsl:call-template name="brand"> - <xsl:with-param name="string" select="substring-after($string,$brand4)"/> + <xsl:with-param name="string" select="$newstr"/> </xsl:call-template> </xsl:when> - <xsl:otherwise> + + <xsl:otherwise> <xsl:value-of select="$string"/> </xsl:otherwise> - </xsl:choose> + </xsl:choose> + </xsl:template> |