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

[Chr. Rossmanith]

 filter/source/svg/svgreader.cxx |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 49ee56064b436caea85496fbdba8ae8e654d53fe
Author: Chr. Rossmanith <ChrRossmanith at gmx.de>
Date:   Mon Nov 2 09:39:57 2015 +0100

    SVG: don't use dashes if parsing stroke-dasharray fails
    
    Change-Id: Ib256e4a4921e11defe7018f82273739c9ecc3105
    Reviewed-on: https://gerrit.libreoffice.org/19735
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index 23e98b8..b4d84e6 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -945,9 +945,15 @@ struct AnnotatingVisitor
                     maCurrState.maDashArray = maParentStates.back().maDashArray;
                 else
                 {
-                    parseDashArray(aValueUtf8.getStr(),
-                                   maCurrState.maDashArray);
-                    maCurrState.meStrokeType = DASH;
+                    if( parseDashArray(aValueUtf8.getStr(),
+                                      maCurrState.maDashArray) )
+                    {
+                        maCurrState.meStrokeType = DASH;
+                    }
+                    else
+                    {
+                        maCurrState.meStrokeType = SOLID;
+                    }
                 }
                 break;
             }