diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2019-09-19 16:08:59 +0200 |
|---|---|---|
| committer | Xisco Faulí <xiscofauli@libreoffice.org> | 2019-09-19 21:57:24 +0200 |
| commit | 586de7ac433dca98edf4a5a3d13b5e393b9880ed (patch) | |
| tree | 22444906ec7c91d09424afb5c21eeaa18bb52bad /svgio/source/svgreader | |
| parent | 496f93c8667a28a37112f1a9835308b756d771de (diff) | |
tdf#123926: SVGIO: Check parent's fill when...
... the element is a clippath and fill=none
fill="none" is created as SvgPaint(aColor, true, false, false)
in svgtools.cxx meaning bSet = true, bCurrent = False and
bOn = False, so it never checks its parent if it's a clippath
Change-Id: Ia8c556674809b2b86280219e4084550e366bbff8
Reviewed-on: https://gerrit.libreoffice.org/79201
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Diffstat (limited to 'svgio/source/svgreader')
| -rw-r--r-- | svgio/source/svgreader/svgstyleattributes.cxx | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx index 5cda5995e82f..bd882e0e24c7 100644 --- a/svgio/source/svgreader/svgstyleattributes.cxx +++ b/svgio/source/svgreader/svgstyleattributes.cxx @@ -2006,6 +2006,19 @@ namespace svgio { return &maFill.getBColor(); } + else if(mbIsClipPathContent) + { + const SvgStyleAttributes* pSvgStyleAttributes = getParentStyle(); + + if (pSvgStyleAttributes && maResolvingParent[0] < nStyleDepthLimit) + { + ++maResolvingParent[0]; + const basegfx::BColor* pFill = pSvgStyleAttributes->getFill(); + --maResolvingParent[0]; + + return pFill; + } + } } else if (!mpSvgGradientNodeFill && !mpSvgPatternNodeFill) { |