diff options
Diffstat (limited to 'helpcontent2/source/auxiliary/main_transform.xsl')
| -rw-r--r-- | helpcontent2/source/auxiliary/main_transform.xsl | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/helpcontent2/source/auxiliary/main_transform.xsl b/helpcontent2/source/auxiliary/main_transform.xsl index 4ff4dfab8b..d9b6c32296 100644 --- a/helpcontent2/source/auxiliary/main_transform.xsl +++ b/helpcontent2/source/auxiliary/main_transform.xsl @@ -24,21 +24,18 @@ Aug 16 2005 workaround for #i53365# Aug 19 2005 fixed missing list processing in embedded sections Aug 19 2005 #i53535#, fixed wrong handling of Database parameter - Oct 17 2006 #i70462#, disabled sorting to avoid output of error messages to console + Oct 17 2006 #i70462#, disabled sorting to avoid output of error messages to console + Jun 15 2009 #i101799#, fixed wrong handling of http URLs with anchors ***********************************************************************//--> <!-- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - Copyright 2008 by Sun Microsystems, Inc. + Copyright 2000, 2010 Oracle and/or its affiliates. OpenOffice.org - a multi-platform office productivity suite - $RCSfile: main_transform.xsl,v $ - - $Revision: 1.18 $ - This file is part of OpenOffice.org. OpenOffice.org is free software: you can redistribute it and/or modify @@ -55,7 +52,7 @@ version 3 along with OpenOffice.org. If not, see <http://www.openoffice.org/license.html> for a copy of the LGPLv3 License. - + --> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> @@ -138,7 +135,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.sun.star.pkg://',$imgrepos,'/')"/> +<xsl:variable name="img_url_prefix" select="concat('vnd.sun.star.zip://',$imgrepos,'/')"/> <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"/> @@ -628,14 +625,14 @@ <xsl:variable name="archive"><xsl:value-of select="concat(substring-before(substring-after(@href,'text/'),'/'),'/')"/></xsl:variable> <xsl:variable name="dbpostfix"><xsl:call-template name="createDBpostfix"><xsl:with-param name="archive" select="$archive"/></xsl:call-template></xsl:variable> <xsl:choose> + <xsl:when test="starts-with(@href,'http://')"> <!-- web links --> + <a href="{@href}"><xsl:apply-templates /></a> + </xsl:when> <xsl:when test="contains(@href,'#')"> <xsl:variable name="anchor"><xsl:value-of select="concat('#',substring-after(@href,'#'))"/></xsl:variable> <xsl:variable name="href"><xsl:value-of select="concat($linkprefix,$archive,substring-before(@href,'#'),$linkpostfix,$dbpostfix,$anchor)"/></xsl:variable> <a href="{$href}"><xsl:apply-templates /></a> </xsl:when> - <xsl:when test="starts-with(@href,'http://')"> <!-- web links --> - <a href="{@href}"><xsl:apply-templates /></a> - </xsl:when> <xsl:otherwise> <xsl:variable name="href"><xsl:value-of select="concat($linkprefix,$archive,@href,$linkpostfix,$dbpostfix)"/></xsl:variable> <a href="{$href}"><xsl:apply-templates /></a> |