tdf#156018: check if there is a css style with element inside element

Change-Id: I54fa5bea42560eec5ae51dd7ba07de11f418c75c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153466
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>

2 files changed, 28 insertions, 0 deletions

diff --git a/svgio/source/svgreader/svgnode.cxx b/svgio/source/svgreader/svgnode.cxx
index d45624d3edc6..2137209d5599 100644
--- a/svgio/source/svgreader/svgnode.cxx
+++ b/svgio/source/svgreader/svgnode.cxx
@@ -160,6 +160,21 @@ namespace svgio::svgreader
                 // add CssStyle if found
                 maCssStyleVector.push_back(pNew);
             }
+
+            // check if there is a css style with element inside element
+            if(pParent)
+            {
+                OUString sParentType(SVGTokenToStr(pParent->getType()));
+
+                aNewConcatenated = sParentType + rClassStr;
+                pNew = rDocument.findGlobalCssStyleAttributes(aNewConcatenated);
+
+                if(pNew)
+                {
+                    // add CssStyle if found
+                    maCssStyleVector.push_back(pNew);
+                }
+            }
         }
 
         void SvgNode::fillCssStyleVector(const OUString& rClassStr, const SvgStyleAttributes& rOriginal)
diff --git a/svgio/source/svgreader/svgtoken.cxx b/svgio/source/svgreader/svgtoken.cxx
index 45af658b1ebd..ed50612323e5 100644
--- a/svgio/source/svgreader/svgtoken.cxx
+++ b/svgio/source/svgreader/svgtoken.cxx
@@ -243,6 +243,19 @@ SVGToken StrToSVGToken(const OUString& rStr, bool bCaseIndependent)
     }
 }
 
+OUString SVGTokenToStr(const SVGToken& rToken)
+{
+    for (auto it = aSVGTokenMapperList.begin(); it != aSVGTokenMapperList.end(); ++it)
+    {
+        if (it->second == rToken)
+        {
+            OUString aFirst(it->first);
+            return aFirst;
+        }
+    }
+    return OUString();
+}
+
 OUString getStrTitle()
 {
     return OUString(constToken_Title);