[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - filter/source

[Marco Cecchetti]

 filter/source/svg/svgwriter.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 7963ef5999940021f3661b1101d7df3c00051d18
Author: Marco Cecchetti <marco.cecchetti at collabora.com>
Date:   Mon Nov 9 17:50:33 2015 +0100

    tdf#95356: unit test about text decorations for svg export
    
    1) Fixed the trailing space issue in text decoration attribute value.
    
    2) Changed the SVG export suite in order to make it more reusable for
    other tests.
    
    3) Added a unit test for testing that text decorations are exported
    correctly.
    
    Reviewed-on: https://gerrit.libreoffice.org/19870
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit 50506421f29d09fa4c44c46c3d60208a64a1c450)
    
    Conflicts:
    	sd/qa/unit/SVGExportTests.cxx
    
    Change-Id: I2bd71974242a0007726fbdd5ef5637a9ec62fd47

diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 6611308..9fd1f6e 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -811,13 +811,17 @@ void SVGTextWriter::addFontAttributes( bool bIsTextContainer )
             if( eCurFontUnderline != eParFontUnderline )
             {
                 if( eCurFontUnderline != UNDERLINE_NONE )
-                    sTextDecoration = "underline ";
+                    sTextDecoration = "underline";
                 bIsDecorationChanged = true;
             }
             if( eCurFontStrikeout != eParFontStrikeout )
             {
                 if( eCurFontStrikeout != STRIKEOUT_NONE )
-                    sTextDecoration += "line-through ";
+                {
+                    if( !sTextDecoration.isEmpty() )
+                        sTextDecoration += " ";
+                    sTextDecoration += "line-through";
+                }
                 bIsDecorationChanged = true;
             }