diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-12-10 14:25:11 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-12-10 14:25:11 +0000 |
| commit | 8c1e2dc80cb9fd0293776c3ae0505dd80b1f6d0d (patch) | |
| tree | 21534fc3e042461e3939359c52da3f9d76a82a03 /helpcontent2 | |
| parent | 31d4197292315181f993b5504a6b5bc6d3af17e7 (diff) | |
CWS-TOOLING: integrate CWS ab65
2008-12-04 12:15:24 +0100 ab r264832 : #i83626# Removed warning
2008-12-04 12:04:09 +0100 ab r264830 : #i83626# Changed search result score handling
2008-11-28 13:37:09 +0100 ab r264548 : #i83626# Added missing juh.jar
2008-11-26 14:37:07 +0100 ab r264388 : #i83626# Added HelpComponent.java
2008-11-21 13:07:19 +0100 ab r264129 : #i83626# Fixed File URL versus system path confusion that made search operations fail on Unix
2008-11-19 12:22:10 +0100 ab r263978 : #i83627# Removed warning
2008-11-19 12:06:41 +0100 ab r263975 : #i83627# Removed warnings
2008-11-19 11:28:46 +0100 ab r263971 : #i83627# Support images in extension help
2008-11-11 11:48:21 +0100 ab r263551 : #i83626# Full text search in extension help
Diffstat (limited to 'helpcontent2')
| -rwxr-xr-x | helpcontent2/settings.pmk | 2 | ||||
| -rw-r--r-- | helpcontent2/source/auxiliary/main_transform.xsl | 37 | ||||
| -rw-r--r-- | helpcontent2/util/makefile.mk | 2 |
3 files changed, 25 insertions, 16 deletions
diff --git a/helpcontent2/settings.pmk b/helpcontent2/settings.pmk index f7d5485374..47af399db6 100755 --- a/helpcontent2/settings.pmk +++ b/helpcontent2/settings.pmk @@ -1,6 +1,6 @@ .INCLUDE : $(INCCOM)$/aux_langs.mk -my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/LuceneHelpWrapper.jar$ +my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/juh.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/LuceneHelpWrapper.jar$ .IF "$(SYSTEM_LUCENE)" == "YES" my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR) .ELSE diff --git a/helpcontent2/source/auxiliary/main_transform.xsl b/helpcontent2/source/auxiliary/main_transform.xsl index e9d141934e..4ff4dfab8b 100644 --- a/helpcontent2/source/auxiliary/main_transform.xsl +++ b/helpcontent2/source/auxiliary/main_transform.xsl @@ -108,7 +108,7 @@ </xsl:choose> </xsl:variable> -<!-- the other parameters given by the help caller --> + <!-- the other parameters given by the help caller --> <xsl:param name="System" select="'WIN'"/> <xsl:param name="productname" select="'Office'"/> <xsl:param name="productversion" select="''"/> @@ -132,9 +132,11 @@ <xsl:param name="Language" select="'en-US'"/> <xsl:variable name="lang" select="$Language"/> +<xsl:param name="ExtensionId" select="''"/> +<xsl:param name="ExtensionPath" select="''"/> -<!-- parts of help and image urls --> + <!-- 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.sun.star.pkg://',$imgrepos,'/')"/> <xsl:variable name="urlpost" select="concat('?Language=',$lang,$am,'System=',$System,$am,'UseDB=no')"/> @@ -811,18 +813,25 @@ <xsl:with-param name="s"><xsl:value-of select="@src"/></xsl:with-param> </xsl:call-template> </xsl:variable> - - <xsl:variable name="src"> - <xsl:choose> - <xsl:when test="(@localize='true') and not($lang='en-US')"> - <xsl:value-of select="concat($img_url_prefix,$fpath,$lang,'/',$fname)"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="concat($img_url_prefix,$fpath,$fname)"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - + + <xsl:variable name="src"> + <xsl:choose> + <xsl:when test="not($ExtensionId='') and starts-with(@src,$ExtensionId)"> + <xsl:value-of select="concat($ExtensionPath,'/',@src)"/> + </xsl:when> + <xsl:otherwise> + <xsl:choose> + <xsl:when test="(@localize='true') and not($lang='en-US')"> + <xsl:value-of select="concat($img_url_prefix,$fpath,$lang,'/',$fname)"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="concat($img_url_prefix,$fpath,$fname)"/> + </xsl:otherwise> + </xsl:choose> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + <!--<xsl:variable name="src"><xsl:value-of select="concat($img_url_prefix,@src)"/></xsl:variable>--> <xsl:variable name="alt"><xsl:value-of select="./alt"/></xsl:variable> <xsl:variable name="width" select="''"/> <!-- Images don't all have the correct size --> diff --git a/helpcontent2/util/makefile.mk b/helpcontent2/util/makefile.mk index 74c23e0432..fbc9d80840 100644 --- a/helpcontent2/util/makefile.mk +++ b/helpcontent2/util/makefile.mk @@ -29,7 +29,7 @@ TARGET = plain_util ZIP1TARGET=helpxsl ZIP1FLAGS= -u -r ZIP1DIR=$(PRJ)$/source$/auxiliary -ZIP1LIST=main_transform*.xsl +ZIP1LIST=main_transform*.xsl idxcaption.xsl idxcontent.xsl # --- Targets ------------------------------------------------------ .INCLUDE : target.mk |