diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-08-26 08:17:39 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-08-26 08:17:39 +0000 |
| commit | 8aaa14a95b40109cdbfe00e63f5eab32d7c450f0 (patch) | |
| tree | 7abbd79e0c6df8f8369ac1edae3fce5d0ba0ce1a /helpcontent2/source/auxiliary | |
| parent | df4b38d7a9ae2dddc52ab794e89b3a4d31c67af5 (diff) | |
CWS-TOOLING: integrate CWS hcshared22
2009-07-21 13:08:41 +0200 ufi r274186 : hidlst
2009-07-21 12:34:16 +0200 ufi r274179 : makefiles
2009-07-21 12:33:01 +0200 ufi r274177 : fixes
2009-07-21 12:22:32 +0200 ufi r274175 : hidlst
2009-07-21 10:20:12 +0200 ufi r274167 : bugfixes
2009-07-21 10:19:42 +0200 ufi r274166 : bugfixes
2009-07-21 10:07:53 +0200 ufi r274165 : errorfix
2009-07-21 09:56:18 +0200 ufi r274162 : vor build
2009-07-13 11:49:18 +0200 ufi r273923 : CWS-TOOLING: rebase CWS hcshared22 to trunk@273858 (milestone: DEV300:m52)
2009-07-10 12:29:33 +0200 ufi r273885 : makefiles
2009-07-10 09:48:46 +0200 ufi r273875 : vor rebase
2009-07-10 09:48:19 +0200 ufi r273874 : vor rebase
2009-07-10 09:47:23 +0200 ufi r273873 : vor rebase
Diffstat (limited to 'helpcontent2/source/auxiliary')
| -rw-r--r-- | helpcontent2/source/auxiliary/main_transform.xsl | 9 | ||||
| -rwxr-xr-x | helpcontent2/source/auxiliary/shared.tree | 2 | ||||
| -rwxr-xr-x | helpcontent2/source/auxiliary/swriter.tree | 1 |
3 files changed, 6 insertions, 6 deletions
diff --git a/helpcontent2/source/auxiliary/main_transform.xsl b/helpcontent2/source/auxiliary/main_transform.xsl index 4ff4dfab8b..ca649b8c6f 100644 --- a/helpcontent2/source/auxiliary/main_transform.xsl +++ b/helpcontent2/source/auxiliary/main_transform.xsl @@ -24,7 +24,8 @@ 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 ***********************************************************************//--> <!-- @@ -628,14 +629,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> diff --git a/helpcontent2/source/auxiliary/shared.tree b/helpcontent2/source/auxiliary/shared.tree index 450f283296..857fcab690 100755 --- a/helpcontent2/source/auxiliary/shared.tree +++ b/helpcontent2/source/auxiliary/shared.tree @@ -167,7 +167,7 @@ <topic id="shared/text/shared/guide/insert_specialchar.xhp">Inserting Special Characters</topic> <topic id="shared/text/shared/guide/tabs.xhp">Inserting and Editing Tab Stops</topic> <topic id="shared/text/shared/guide/table_cellmerge.xhp">Merging and Splitting Cells</topic> -<topic id="shared/text/shared/guide/protection.xhp">Protecting Content in %PRODUCTNAME</topic> +<topic id="shared/text/shared/guide/protection.xhp">Protecting Contents in %PRODUCTNAME</topic> <topic id="shared/text/shared/guide/redlining_protect.xhp">Protecting Records</topic> <topic id="shared/text/shared/guide/pageformat_max.xhp">Selecting the Maximum Printable Area on a Page</topic> <topic id="shared/text/shared/guide/measurement_units.xhp">Selecting Measurement Units</topic> diff --git a/helpcontent2/source/auxiliary/swriter.tree b/helpcontent2/source/auxiliary/swriter.tree index 9dc9d21964..901258414d 100755 --- a/helpcontent2/source/auxiliary/swriter.tree +++ b/helpcontent2/source/auxiliary/swriter.tree @@ -123,7 +123,6 @@ <topic id="swriter/text/swriter/guide/hidden_text.xhp">Hiding Text</topic> <topic id="swriter/text/swriter/guide/header_pagestyles.xhp">Defining Different Headers and Footers</topic> <topic id="swriter/text/swriter/guide/header_with_chapter.xhp">Inserting a Chapter Name and Number in a Header or a Footer</topic> -<topic id="swriter/text/swriter/guide/para_style_quickuse.xhp">Quickly Applying Paragraph Styles</topic> <topic id="swriter/text/swriter/guide/shortcut_writing.xhp">Applying Text Formatting While You Type</topic> <topic id="swriter/text/swriter/guide/reset_format.xhp">Resetting Font Attributes</topic> <topic id="swriter/text/swriter/guide/stylist_fillformat.xhp">Applying Styles in Fill Format Mode</topic> |