various XLink fields are dead

after
commit 195364a57a5e3090648cb327607bc52da2be583c
Date:   Thu Jun 8 13:49:11 2023 +0200
tdf#155733: no need to store these values

Change-Id: I4a998add0079cbbcf9eaba38a43fc5411647dd64
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153745
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 30 insertions, 60 deletions

diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx
index eb7ab2f290c6..12766fde7986 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -1287,12 +1287,6 @@ namespace svgio::svgreader
             maTextDecoration(TextDecoration::notset),
             maTextAnchor(TextAnchor::notset),
             maVisibility(Visibility::notset),
-            mpClipPathXLink(nullptr),
-            mpFilterXLink(nullptr),
-            mpMaskXLink(nullptr),
-            mpMarkerStartXLink(nullptr),
-            mpMarkerMidXLink(nullptr),
-            mpMarkerEndXLink(nullptr),
             maFillRule(FillRule::notset),
             maClipRule(FillRule::notset),
             maBaselineShift(BaselineShift::Baseline),
@@ -2885,17 +2879,13 @@ namespace svgio::svgreader
 
         const SvgClipPathNode* SvgStyleAttributes::accessClipPathXLink() const
         {
-            if(!mpClipPathXLink)
-            {
-                const OUString aClipPath(getClipPathXLink());
+            const OUString aClipPath(getClipPathXLink());
 
-                if(!aClipPath.isEmpty())
-                {
-                    return dynamic_cast< const SvgClipPathNode* >(mrOwner.getDocument().findSvgNodeById(aClipPath));
-                }
+            if(!aClipPath.isEmpty())
+            {
+                return dynamic_cast< const SvgClipPathNode* >(mrOwner.getDocument().findSvgNodeById(aClipPath));
             }
-
-            return mpClipPathXLink;
+            return nullptr;
         }
 
         OUString SvgStyleAttributes::getFilterXLink() const
@@ -2925,17 +2915,13 @@ namespace svgio::svgreader
 
         const SvgFilterNode* SvgStyleAttributes::accessFilterXLink() const
         {
-            if(!mpFilterXLink)
-            {
-                const OUString aFilter(getFilterXLink());
+            const OUString aFilter(getFilterXLink());
 
-                if(!aFilter.isEmpty())
-                {
-                    return dynamic_cast< const SvgFilterNode* >(mrOwner.getDocument().findSvgNodeById(aFilter));
-                }
+            if(!aFilter.isEmpty())
+            {
+                return dynamic_cast< const SvgFilterNode* >(mrOwner.getDocument().findSvgNodeById(aFilter));
             }
-
-            return mpFilterXLink;
+            return nullptr;
         }
 
         OUString SvgStyleAttributes::getMaskXLink() const
@@ -2965,17 +2951,13 @@ namespace svgio::svgreader
 
         const SvgMaskNode* SvgStyleAttributes::accessMaskXLink() const
         {
-            if(!mpMaskXLink)
-            {
-                const OUString aMask(getMaskXLink());
+            const OUString aMask(getMaskXLink());
 
-                if(!aMask.isEmpty())
-                {
-                    return dynamic_cast< const SvgMaskNode* >(mrOwner.getDocument().findSvgNodeById(aMask));
-                }
+            if(!aMask.isEmpty())
+            {
+                return dynamic_cast< const SvgMaskNode* >(mrOwner.getDocument().findSvgNodeById(aMask));
             }
-
-            return mpMaskXLink;
+            return nullptr;
         }
 
         OUString SvgStyleAttributes::getMarkerStartXLink() const
@@ -3000,17 +2982,13 @@ namespace svgio::svgreader
 
         const SvgMarkerNode* SvgStyleAttributes::accessMarkerStartXLink() const
         {
-            if(!mpMarkerStartXLink)
-            {
-                const OUString aMarker(getMarkerStartXLink());
+            const OUString aMarker(getMarkerStartXLink());
 
-                if(!aMarker.isEmpty())
-                {
-                    return dynamic_cast< const SvgMarkerNode* >(mrOwner.getDocument().findSvgNodeById(getMarkerStartXLink()));
-                }
+            if(!aMarker.isEmpty())
+            {
+                return dynamic_cast< const SvgMarkerNode* >(mrOwner.getDocument().findSvgNodeById(getMarkerStartXLink()));
             }
-
-            return mpMarkerStartXLink;
+            return nullptr;
         }
 
         OUString SvgStyleAttributes::getMarkerMidXLink() const
@@ -3035,17 +3013,13 @@ namespace svgio::svgreader
 
         const SvgMarkerNode* SvgStyleAttributes::accessMarkerMidXLink() const
         {
-            if(!mpMarkerMidXLink)
-            {
-                const OUString aMarker(getMarkerMidXLink());
+            const OUString aMarker(getMarkerMidXLink());
 
-                if(!aMarker.isEmpty())
-                {
-                    return dynamic_cast< const SvgMarkerNode* >(mrOwner.getDocument().findSvgNodeById(getMarkerMidXLink()));
-                }
+            if(!aMarker.isEmpty())
+            {
+                return dynamic_cast< const SvgMarkerNode* >(mrOwner.getDocument().findSvgNodeById(getMarkerMidXLink()));
             }
-
-            return mpMarkerMidXLink;
+            return nullptr;
         }
 
         OUString SvgStyleAttributes::getMarkerEndXLink() const
@@ -3070,17 +3044,13 @@ namespace svgio::svgreader
 
         const SvgMarkerNode* SvgStyleAttributes::accessMarkerEndXLink() const
         {
-            if(!mpMarkerEndXLink)
-            {
-                const OUString aMarker(getMarkerEndXLink());
+            const OUString aMarker(getMarkerEndXLink());
 
-                if(!aMarker.isEmpty())
-                {
-                    return dynamic_cast< const SvgMarkerNode* >(mrOwner.getDocument().findSvgNodeById(getMarkerEndXLink()));
-                }
+            if(!aMarker.isEmpty())
+            {
+                return dynamic_cast< const SvgMarkerNode* >(mrOwner.getDocument().findSvgNodeById(getMarkerEndXLink()));
             }
-
-            return mpMarkerEndXLink;
+            return nullptr;
         }
 
         SvgNumber SvgStyleAttributes::getBaselineShiftNumber() const