[Libreoffice-commits] .: filter/source

[Libreoffice Gerrit user]

 filter/source/xslt/odf2xhtml/export/common/body.xsl |    2 +-
 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b75e9576bfaf9f95532f2a9d6917cffbf37a57e0
Author: Peter Jentsch <pjotr at guineapics.de>
Date:   Wed Nov 28 00:33:01 2012 +0100

    fix fdo#40097 - Cross-references and TOC links broken in XHTML export
    
    Change-Id: I90bd2a8d5f788350f8f2bc8c443776e6598624b4

diff --git a/filter/source/xslt/odf2xhtml/export/common/body.xsl b/filter/source/xslt/odf2xhtml/export/common/body.xsl
index 895bb41..37a8afa 100644
--- a/filter/source/xslt/odf2xhtml/export/common/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/body.xsl
@@ -317,7 +317,7 @@
 
 		<xsl:choose>
 			<!-- internal OOo URL used in content tables -->
-			<xsl:when test="contains($href, '%7Coutline')">
+			<xsl:when test="contains($href, '%7Coutline') or contains($href, '|outline')">
 				<!-- the simple workaround for content tables in a single document is to create create an anchor from every heading element
 					 work-around downside: Multiple identical headings won't refer always to the first.
 				-->
diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index 6189629..d9de0e9 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -1243,7 +1243,7 @@
 		<!-- REFERENCE HANDLING - ANCHOR -->
 		<xsl:element namespace="{$namespace}" name="a">
 			<xsl:attribute name="id">
-				<xsl:value-of select="translate(concat('a_',$headingNumber, '_', normalize-space($title)), '&#xA;&<>.,;: %()[]/\+', '___________________________')"/>
+				<xsl:value-of select="translate(concat('a_',normalize-space($headingNumber), '_', normalize-space($title)), '&#xA;&<>.,;: %()[]/\+', '___________________________')"/>
 			</xsl:attribute>
 
 			<xsl:element name="span">