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

[Xisco Fauli]

 svgio/source/svgreader/svgstyleattributes.cxx |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 1868a62a32cff30e3ba214cbd03917d2c6518073
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Thu Mar 10 20:01:44 2016 +0100

    tdf#47446: SVGIO: Take markers' parents into account too
    
    Change-Id: I41b7228ab5980581ab5e1c8c4d4d466da6045086
    Reviewed-on: https://gerrit.libreoffice.org/23124
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Xisco Faulí <anistenis at gmail.com>

diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx
index f344610..b60d84b 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -1954,8 +1954,20 @@ namespace svgio
 
         const basegfx::BColor* SvgStyleAttributes::getFill() const
         {
-            if(mbIsClipPathContent || ((SVGTokenMarker == mrOwner.getType()) && !maFill.isSet()))
+            if(mbIsClipPathContent)
+            {
+                static basegfx::BColor aBlack(0.0, 0.0, 0.0);
+                return &aBlack;
+            }
+            else if((SVGTokenMarker == mrOwner.getType()) && !maFill.isSet())
             {
+                const SvgStyleAttributes* pSvgStyleAttributes = getParentStyle();
+
+                if(pSvgStyleAttributes)
+                {
+                    return pSvgStyleAttributes->getFill();
+                }
+
                 static basegfx::BColor aBlack(0.0, 0.0, 0.0);
                 return &aBlack;
             }