svgio: simplify and rename to make it easier to understand

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

2 files changed, 5 insertions, 8 deletions

diff --git a/svgio/inc/svgnode.hxx b/svgio/inc/svgnode.hxx
index 727006b3ee18..c8b81fcb1d70 100644
--- a/svgio/inc/svgnode.hxx
+++ b/svgio/inc/svgnode.hxx
@@ -188,9 +188,6 @@ namespace svgio::svgreader
 
             /// alternative parent
             void setAlternativeParent(const SvgNode* pAlternativeParent = nullptr) { mpAlternativeParent = pAlternativeParent; }
-
-            /// Check if there is a local css style
-            bool hasLocalCssStyle() { return static_cast<bool>(mpLocalCssStyle); }
         };
 
       class Visitor
diff --git a/svgio/inc/svgstyleattributes.hxx b/svgio/inc/svgstyleattributes.hxx
index 30cbab965644..6c2b550381a0 100644
--- a/svgio/inc/svgstyleattributes.hxx
+++ b/svgio/inc/svgstyleattributes.hxx
@@ -190,7 +190,7 @@ namespace svgio::svgreader
         {
         private:
             SvgNode&                    mrOwner;
-            const SvgStyleAttributes*   mpCssStyleParent;
+            const SvgStyleAttributes*   mpCssStyle;
             SvgPaint                    maFill;
             SvgPaint                    maStroke;
             SvgPaint                    maStopColor;
@@ -312,13 +312,13 @@ namespace svgio::svgreader
                 drawinglayer::primitive2d::Primitive2DContainer&& rSource,
                 const std::optional<basegfx::B2DHomMatrix>& pTransform) const;
 
-            /// helper to set mpCssStyleParent temporarily for CSS style hierarchies
-            void setCssStyleParent(const SvgStyleAttributes* pNew) { mpCssStyleParent = pNew; }
-            const SvgStyleAttributes* getCssStyleParent() const { return mpCssStyleParent; }
+            /// helper to set mpCssStyle temporarily for CSS style hierarchies
+            void setCssStyle(const SvgStyleAttributes* pNew) { mpCssStyle = pNew; }
+            const SvgStyleAttributes* getCssStyle() const { return mpCssStyle; }
 
             /// scan helpers
             void readCssStyle(std::u16string_view rCandidate);
-            const SvgStyleAttributes* getParentStyle() const;
+            const SvgStyleAttributes* getCssStyleOrParentStyle() const;
 
             SvgStyleAttributes(SvgNode& rOwner);
             ~SvgStyleAttributes();