Related: #i125293# More unified (still simple) CssStyles and solvers

(cherry picked from commit b760428400bbc7ab3db4d5de6239589e79981a06)

Conflicts:
svgio/inc/svgio/svgreader/svgdocument.hxx
svgio/inc/svgio/svgreader/svgnode.hxx
svgio/inc/svgio/svgreader/svgstylenode.hxx
svgio/source/svgreader/svgdocument.cxx
svgio/source/svgreader/svgnode.cxx
svgio/source/svgreader/svgstylenode.cxx

Change-Id: Ifcfc665df18f56e2cbc359411b633271c3b8d4bb

3 files changed, 13 insertions, 4 deletions

diff --git a/svgio/inc/svgio/svgreader/svgdocument.hxx b/svgio/inc/svgio/svgreader/svgdocument.hxx
index e61b291995f9..cbc651b3b99c 100644
--- a/svgio/inc/svgio/svgreader/svgdocument.hxx
+++ b/svgio/inc/svgio/svgreader/svgdocument.hxx
@@ -65,10 +65,11 @@ namespace svgio
 
             /// add/remove styles to mapper
             void addSvgStyleAttributesToMapper(const OUString& rStr, const SvgStyleAttributes& rSvgStyleAttributes);
+            void removeSvgStyleAttributesFromMapper(const OUString& rStr);
 
             /// find a style by it's Id
-            bool hasSvgStyleAttributesById() const { return !maIdStyleTokenMapperList.empty(); }
-            const SvgStyleAttributes* findSvgStyleAttributesById(const OUString& rStr) const;
+            bool hasGlobalCssStyleAttributes() const { return !maIdStyleTokenMapperList.empty(); }
+            const SvgStyleAttributes* findGlobalCssStyleAttributes(const OUString& rStr) const;
 
             /// data read access
             const SvgNodeVector& getSvgNodeVector() const { return maNodes; }
diff --git a/svgio/inc/svgio/svgreader/svgnode.hxx b/svgio/inc/svgio/svgreader/svgnode.hxx
index 4793ddf3e94b..9fa9e723b3fc 100644
--- a/svgio/inc/svgio/svgreader/svgnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgnode.hxx
@@ -126,6 +126,10 @@ namespace svgio
 
             /// helper for filling the CssStyle vector once dependent on mbCssStyleVectorBuilt
             void fillCssStyleVector(const OUString& rClassStr);
+            void fillCssStyleVectorUsingHierarchyAndSelectors(
+                const OUString& rClassStr,
+                const SvgNode& rCurrent,
+                OUString aConcatenated);
 
         public:
             SvgNode(
diff --git a/svgio/inc/svgio/svgreader/svgstylenode.hxx b/svgio/inc/svgio/svgreader/svgstylenode.hxx
index fc851dfe6940..e113ea98a143 100644
--- a/svgio/inc/svgio/svgreader/svgstylenode.hxx
+++ b/svgio/inc/svgio/svgreader/svgstylenode.hxx
@@ -45,8 +45,12 @@ namespace svgio
             /// #i125258# tell if this node is allowed to have a parent style (e.g. defs do not)
             virtual bool supportsParentStyle() const SAL_OVERRIDE;
 
-            virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) SAL_OVERRIDE;
-            void addCssStyleSheet(const OUString& aContent);
+            virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent);
+
+            /// CssStyleSheet add helpers
+            void addCssStyleSheet(const OUString& aSelectors, const SvgStyleAttributes& rNewStyle);
+            void addCssStyleSheet(const OUString& aSelectors, const OUString& aContent);
+            void addCssStyleSheet(const OUString& aSelectorsAndContent);
 
             /// textCss access
             bool isTextCss() const { return mbTextCss; }