[Libreoffice-commits] core.git: filter/source

[Chr. Rossmanith]

 filter/source/svg/svgexport.cxx |    2 +-
 filter/source/svg/svgwriter.cxx |   11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 1ce132b5b41e218520cc51506665ee0bc625b24b
Author: Chr. Rossmanith <ChrRossmanith at gmx.de>
Date:   Tue Feb 14 23:16:30 2017 +0100

    tdf#105639: create valid id values in svg export
    
    Change-Id: I01a011501af317d7a9e90d7c70d50ef84c74b24e
    Reviewed-on: https://gerrit.libreoffice.org/34347
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 50cc5f7..3bf9c6c 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -1227,7 +1227,7 @@ void SVGFilter::implEmbedBulletGlyphs()
 
 void SVGFilter::implEmbedBulletGlyph( sal_Unicode cBullet, const OUString & sPathData )
 {
-    OUString sId = "bullet-char-template(" + OUString::number( (sal_Int32)cBullet ) + ")";
+    OUString sId = "bullet-char-template-" + OUString::number( (sal_Int32)cBullet );
     mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", sId );
 
     double fFactor = 1.0 / 2048;
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 82d5424..22b3f1f 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -1372,9 +1372,9 @@ void SVGTextWriter::implWriteBulletChars()
     {
         // <g id="?" > (used by animations)
         {
-            // As id we use the id of the text portion placeholder wrapped
-            // by bullet-char(*)
-            sId = "bullet-char(" + it->first+ ")";
+            // As id we use the id of the text portion placeholder with prefix
+            // bullet-char-*
+            sId = "bullet-char-" + it->first;
             mrExport.AddAttribute( XML_NAMESPACE_NONE, "id", sId );
             mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "BulletChar" );
             SvXMLElementExport aBulletCharElem( mrExport, XML_NAMESPACE_NONE, aXMLElemG, true, true );
@@ -1401,9 +1401,8 @@ void SVGTextWriter::implWriteBulletChars()
                     mrExport.AddAttribute( XML_NAMESPACE_NONE, "transform", sScaling );
 
                     // Add ref attribute
-                    sRefId = "#bullet-char-template(" +
-                             OUString::number( ( rInfo.cBulletChar ) ) +
-                             ")";
+                    sRefId = "#bullet-char-template-" +
+                             OUString::number( ( rInfo.cBulletChar ) );
                     mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrXLinkHRef, sRefId );
 
                     SvXMLElementExport aRefElem( mrExport, XML_NAMESPACE_NONE, "use", true, true );