fix fdo#40097 - Cross-references and TOC links broken in XHTML export

Change-Id: I90bd2a8d5f788350f8f2bc8c443776e6598624b4

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.
 				-->

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;&amp;&lt;&gt;.,;: %()[]/\+', '___________________________')"/>
+				<xsl:value-of select="translate(concat('a_',normalize-space($headingNumber), '_', normalize-space($title)), '&#xA;&amp;&lt;&gt;.,;: %()[]/\+', '___________________________')"/>
 			</xsl:attribute>
 
 			<xsl:element name="span">