diff options
| author | Xisco Fauli <anistenis@gmail.com> | 2016-03-10 20:01:44 +0100 |
|---|---|---|
| committer | Xisco Faulí <anistenis@gmail.com> | 2016-03-11 10:03:00 +0000 |
| commit | 1868a62a32cff30e3ba214cbd03917d2c6518073 (patch) | |
| tree | 47d1acadedb9349f9e6cbae7d4356bf9f57cc30c /svgio | |
| parent | 00badb6fb53aa28f4184aaecd8455dcd5267c5f8 (diff) | |
tdf#47446: SVGIO: Take markers' parents into account too
Change-Id: I41b7228ab5980581ab5e1c8c4d4d466da6045086
Reviewed-on: https://gerrit.libreoffice.org/23124
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Xisco Faulí <anistenis@gmail.com>
Diffstat (limited to 'svgio')
| -rw-r--r-- | svgio/source/svgreader/svgstyleattributes.cxx | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx index f3446107ab55..b60d84b4077b 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; } |