[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 2 commits - filter/source

[Robert Antoni Buj Gelonch]

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

New commits:
commit 04746c585a50f30f96a3b2cb7ce9dc3f1fdbd6bd
Author: Robert Antoni Buj Gelonch <robert.buj at gmail.com>
Date:   Thu May 14 15:46:02 2015 +0200

    odf2xhtml: tdf#66999 there is no attribute 'name'
    
    Change-Id: If00ef284326f16f59a2e85864a344b634a02f37e
    Reviewed-on: https://gerrit.libreoffice.org/15730
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index a89adfc..615e1a1 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -2909,7 +2909,7 @@
 
 	<xsl:template match="text:bookmark|text:bookmark-start">
 		<xsl:element name="a">
-			<xsl:attribute name="name">
+			<xsl:attribute name="id">
 				<xsl:value-of select="@text:name"/>
 			</xsl:attribute>
 		</xsl:element>
commit 445314e0bc5235b8a0c68348cd6ceed5517fc079
Author: Robert Antoni Buj Gelonch <robert.buj at gmail.com>
Date:   Thu May 14 15:49:53 2015 +0200

    odf2xhtml: tdf#66999 character '–' is not allowed in the value of attribute 'id'
    
    Change-Id: I3c72917cf809adbb8b074cd187c50b12def1616c
    Reviewed-on: https://gerrit.libreoffice.org/15731
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index 32f0ffe..a89adfc 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -1262,7 +1262,7 @@
 		<!-- REFERENCE HANDLING - ANCHOR -->
 		<xsl:element namespace="{$namespace}" name="a">
 			<xsl:attribute name="id">
-				<xsl:value-of select="translate(concat('a_',normalize-space($headingNumber), '_', normalize-space($title)), '&#xA;&<>.,;: %()[]/\+', '___________________________')"/>
+				<xsl:value-of select="translate(concat('a_',normalize-space($headingNumber), '_', normalize-space($title)), '&#xA;&<>–.,;: %()[]/\+', '____________________________')" disable-output-escaping="yes"/>
 			</xsl:attribute>
 
 			<xsl:element name="span">