From 423b79e7366203db3f57dea75b8cb9eb852b5614 Mon Sep 17 00:00:00 2001
From: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Date: Sun, 14 Feb 2016 18:32:22 +0100
Subject: tdf#97752 SVGIO ignore not matching parent paints
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fill attributes can have ONE of 3 kinds of paints:
* pain colour fills
* gradient fills
* pattern fills
if element has a fill we should not get fills of an other
kind from parent

Change-Id: I376a8fea4a7185b037a069a28191b7f37f6788bd
Signed-off-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Reviewed-on: https://gerrit.libreoffice.org/22273
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Xisco Faulí <anistenis@gmail.com>
---
 svgio/source/svgreader/svgstyleattributes.cxx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'svgio/source/svgreader')

diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx
index bf4f057480fd..a6ad68d888bc 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -1980,7 +1980,7 @@ namespace svgio
                     return &maFill.getBColor();
                 }
             }
-            else
+            else if (!mpSvgGradientNodeFill && !mpSvgPatternNodeFill)
             {
                 const SvgStyleAttributes* pSvgStyleAttributes = getParentStyle();
 
@@ -2010,7 +2010,7 @@ namespace svgio
                     return &maStroke.getBColor();
                 }
             }
-            else
+            else if (!mpSvgGradientNodeStroke && !mpSvgPatternNodeStroke)
             {
                 const SvgStyleAttributes* pSvgStyleAttributes = getParentStyle();
 
@@ -2045,7 +2045,7 @@ namespace svgio
             {
                 return mpSvgGradientNodeFill;
             }
-            else
+            else if (!maFill.isSet() && !mpSvgPatternNodeFill)
             {
                 const SvgStyleAttributes* pSvgStyleAttributes = getParentStyle();
 
@@ -2068,7 +2068,7 @@ namespace svgio
             {
                 return mpSvgGradientNodeStroke;
             }
-            else
+            else if (!maStroke.isSet() && !mpSvgPatternNodeStroke)
             {
                 const SvgStyleAttributes* pSvgStyleAttributes = getParentStyle();
 
@@ -2091,7 +2091,7 @@ namespace svgio
             {
                 return mpSvgPatternNodeFill;
             }
-            else
+            else if (!maFill.isSet() && !mpSvgGradientNodeFill)
             {
                 const SvgStyleAttributes* pSvgStyleAttributes = getParentStyle();
 
@@ -2114,7 +2114,7 @@ namespace svgio
             {
                 return mpSvgPatternNodeStroke;
             }
-            else
+            else if (!maStroke.isSet() && !mpSvgGradientNodeStroke)
             {
                 const SvgStyleAttributes* pSvgStyleAttributes = getParentStyle();
 
-- 
cgit