no need to use unique_ptr for B2DHomMatrix

it is already a COW type

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

17 files changed, 25 insertions, 35 deletions

diff --git a/svgio/source/svgreader/svganode.cxx b/svgio/source/svgreader/svganode.cxx
index 6065ed498e42..358282d143e9 100644
--- a/svgio/source/svgreader/svganode.cxx
+++ b/svgio/source/svgreader/svganode.cxx
@@ -60,7 +60,7 @@ namespace svgio::svgreader
 
                     if(!aMatrix.isIdentity())
                     {
-                        setTransform(&aMatrix);
+                        setTransform(aMatrix);
                     }
                     break;
                 }
diff --git a/svgio/source/svgreader/svgcirclenode.cxx b/svgio/source/svgreader/svgcirclenode.cxx
index 78e280eb0a26..8577ba2726f6 100644
--- a/svgio/source/svgreader/svgcirclenode.cxx
+++ b/svgio/source/svgreader/svgcirclenode.cxx
@@ -99,7 +99,7 @@ namespace svgio::svgreader
 
                     if(!aMatrix.isIdentity())
                     {
-                        setTransform(&aMatrix);
+                        setTransform(aMatrix);
                     }
                     break;
                 }
diff --git a/svgio/source/svgreader/svgclippathnode.cxx b/svgio/source/svgreader/svgclippathnode.cxx
index 1a8269684095..341ddaf00327 100644
--- a/svgio/source/svgreader/svgclippathnode.cxx
+++ b/svgio/source/svgreader/svgclippathnode.cxx
@@ -68,7 +68,7 @@ namespace svgio::svgreader
 
                     if(!aMatrix.isIdentity())
                     {
-                        setTransform(&aMatrix);
+                        setTransform(aMatrix);
                     }
                     break;
                 }
@@ -123,7 +123,7 @@ namespace svgio::svgreader
 
         void SvgClipPathNode::apply(
             drawinglayer::primitive2d::Primitive2DContainer& rContent,
-            const basegfx::B2DHomMatrix* pTransform) const
+            const std::optional<basegfx::B2DHomMatrix>& pTransform) const
         {
             if (rContent.empty() || Display::None == getDisplay())
                 return;
diff --git a/svgio/source/svgreader/svgellipsenode.cxx b/svgio/source/svgreader/svgellipsenode.cxx
index 7fd431aeb0f6..b1646b30d929 100644
--- a/svgio/source/svgreader/svgellipsenode.cxx
+++ b/svgio/source/svgreader/svgellipsenode.cxx
@@ -113,7 +113,7 @@ namespace svgio::svgreader
 
                     if(!aMatrix.isIdentity())
                     {
-                        setTransform(&aMatrix);
+                        setTransform(aMatrix);
                     }
                     break;
                 }
diff --git a/svgio/source/svgreader/svggnode.cxx b/svgio/source/svgreader/svggnode.cxx
index e186387a80ba..8e2c1a2486da 100644
--- a/svgio/source/svgreader/svggnode.cxx
+++ b/svgio/source/svgreader/svggnode.cxx
@@ -72,7 +72,7 @@ namespace svgio::svgreader
 
                     if(!aMatrix.isIdentity())
                     {
-                        setTransform(&aMatrix);
+                        setTransform(aMatrix);
                     }
                     break;
                 }
diff --git a/svgio/source/svgreader/svggradientnode.cxx b/svgio/source/svgreader/svggradientnode.cxx
index 8aa4371e0cfc..0b2ad5cabaf4 100644
--- a/svgio/source/svgreader/svggradientnode.cxx
+++ b/svgio/source/svgreader/svggradientnode.cxx
@@ -216,7 +216,7 @@ namespace svgio::svgreader
 
                     if(!aMatrix.isIdentity())
                     {
-                        setGradientTransform(&aMatrix);
+                        setGradientTransform(aMatrix);
                     }
                     break;
                 }
@@ -490,11 +490,11 @@ namespace svgio::svgreader
             return nullptr;
         }
 
-        const basegfx::B2DHomMatrix* SvgGradientNode::getGradientTransform() const
+        std::optional<basegfx::B2DHomMatrix> SvgGradientNode::getGradientTransform() const
         {
             if(mpaGradientTransform)
             {
-                return mpaGradientTransform.get();
+                return mpaGradientTransform;
             }
 
             const_cast< SvgGradientNode* >(this)->tryToFindLink();
@@ -507,17 +507,7 @@ namespace svgio::svgreader
                 return ret;
             }
 
-            return nullptr;
-        }
-
-        void SvgGradientNode::setGradientTransform(const basegfx::B2DHomMatrix* pMatrix)
-        {
-            mpaGradientTransform.reset();
-
-            if(pMatrix)
-            {
-                mpaGradientTransform.reset(new basegfx::B2DHomMatrix(*pMatrix) );
-            }
+            return std::nullopt;
         }
 
 } // end of namespace svgio::svgreader
diff --git a/svgio/source/svgreader/svgimagenode.cxx b/svgio/source/svgreader/svgimagenode.cxx
index feaf5933ad53..445e78a2646c 100644
--- a/svgio/source/svgreader/svgimagenode.cxx
+++ b/svgio/source/svgreader/svgimagenode.cxx
@@ -89,7 +89,7 @@ namespace svgio::svgreader
 
                     if(!aMatrix.isIdentity())
                     {
-                        setTransform(&aMatrix);
+                        setTransform(aMatrix);
                     }
                     break;
                 }
diff --git a/svgio/source/svgreader/svglinenode.cxx b/svgio/source/svgreader/svglinenode.cxx
index 1f4ef9bbd60d..4259c4b1ca95 100644
--- a/svgio/source/svgreader/svglinenode.cxx
+++ b/svgio/source/svgreader/svglinenode.cxx
@@ -106,7 +106,7 @@ namespace svgio::svgreader
 
                     if(!aMatrix.isIdentity())
                     {
-                        setTransform(&aMatrix);
+                        setTransform(aMatrix);
                     }
                     break;
                 }
diff --git a/svgio/source/svgreader/svgmasknode.cxx b/svgio/source/svgreader/svgmasknode.cxx
index 7f3ab9a772ca..d036bed33656 100644
--- a/svgio/source/svgreader/svgmasknode.cxx
+++ b/svgio/source/svgreader/svgmasknode.cxx
@@ -120,7 +120,7 @@ namespace svgio::svgreader
 
                     if(!aMatrix.isIdentity())
                     {
-                        setTransform(&aMatrix);
+                        setTransform(aMatrix);
                     }
                     break;
                 }
@@ -188,7 +188,7 @@ namespace svgio::svgreader
 
         void SvgMaskNode::apply(
             drawinglayer::primitive2d::Primitive2DContainer& rTarget,
-            const basegfx::B2DHomMatrix* pTransform) const
+            const std::optional<basegfx::B2DHomMatrix>& pTransform) const
         {
             if(rTarget.empty() || Display::None == getDisplay())
                 return;
diff --git a/svgio/source/svgreader/svgpathnode.cxx b/svgio/source/svgreader/svgpathnode.cxx
index 5187df877261..d32a92b6a8c5 100644
--- a/svgio/source/svgreader/svgpathnode.cxx
+++ b/svgio/source/svgreader/svgpathnode.cxx
@@ -75,7 +75,7 @@ namespace svgio::svgreader
 
                     if(!aMatrix.isIdentity())
                     {
-                        setTransform(&aMatrix);
+                        setTransform(aMatrix);
                     }
                     break;
                 }
diff --git a/svgio/source/svgreader/svgpatternnode.cxx b/svgio/source/svgreader/svgpatternnode.cxx
index 8d8721a5ee27..ff92896fa350 100644
--- a/svgio/source/svgreader/svgpatternnode.cxx
+++ b/svgio/source/svgreader/svgpatternnode.cxx
@@ -169,7 +169,7 @@ namespace svgio::svgreader
 
                     if(!aMatrix.isIdentity())
                     {
-                        setPatternTransform(&aMatrix);
+                        setPatternTransform(aMatrix);
                     }
                     break;
                 }
@@ -450,11 +450,11 @@ namespace svgio::svgreader
             return nullptr;
         }
 
-        const basegfx::B2DHomMatrix* SvgPatternNode::getPatternTransform() const
+        std::optional<basegfx::B2DHomMatrix> SvgPatternNode::getPatternTransform() const
         {
             if(mpaPatternTransform)
             {
-                return mpaPatternTransform.get();
+                return mpaPatternTransform;
             }
 
             const_cast< SvgPatternNode* >(this)->tryToFindLink();
@@ -467,7 +467,7 @@ namespace svgio::svgreader
                 return ret;
             }
 
-            return nullptr;
+            return std::nullopt;
         }
 
 } // end of namespace svgio::svgreader
diff --git a/svgio/source/svgreader/svgpolynode.cxx b/svgio/source/svgreader/svgpolynode.cxx
index 584a94e30d79..0956dcd2dad5 100644
--- a/svgio/source/svgreader/svgpolynode.cxx
+++ b/svgio/source/svgreader/svgpolynode.cxx
@@ -83,7 +83,7 @@ namespace svgio::svgreader
 
                     if(!aMatrix.isIdentity())
                     {
-                        setTransform(&aMatrix);
+                        setTransform(aMatrix);
                     }
                     break;
                 }
diff --git a/svgio/source/svgreader/svgrectnode.cxx b/svgio/source/svgreader/svgrectnode.cxx
index aa23954237e4..27c1042edcfc 100644
--- a/svgio/source/svgreader/svgrectnode.cxx
+++ b/svgio/source/svgreader/svgrectnode.cxx
@@ -141,7 +141,7 @@ namespace svgio::svgreader
 
                     if(!aMatrix.isIdentity())
                     {
-                        setTransform(&aMatrix);
+                        setTransform(aMatrix);
                     }
                     break;
                 }
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx
index 8ad08b0414e2..fc072882d864 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -1149,7 +1149,7 @@ namespace svgio::svgreader
         void SvgStyleAttributes::add_postProcess(
             drawinglayer::primitive2d::Primitive2DContainer& rTarget,
             const drawinglayer::primitive2d::Primitive2DContainer& rSource,
-            const basegfx::B2DHomMatrix* pTransform) const
+            const std::optional<basegfx::B2DHomMatrix>& pTransform) const
         {
             if(rSource.empty())
                 return;
diff --git a/svgio/source/svgreader/svgtextnode.cxx b/svgio/source/svgreader/svgtextnode.cxx
index ee096712969a..99d2cf0c6a10 100644
--- a/svgio/source/svgreader/svgtextnode.cxx
+++ b/svgio/source/svgreader/svgtextnode.cxx
@@ -70,7 +70,7 @@ namespace svgio::svgreader
 
                     if(!aMatrix.isIdentity())
                     {
-                        setTransform(&aMatrix);
+                        setTransform(aMatrix);
                     }
                     break;
                 }
diff --git a/svgio/source/svgreader/svgusenode.cxx b/svgio/source/svgreader/svgusenode.cxx
index e4fc03ae7345..9e3630a2bebb 100644
--- a/svgio/source/svgreader/svgusenode.cxx
+++ b/svgio/source/svgreader/svgusenode.cxx
@@ -68,7 +68,7 @@ namespace svgio::svgreader
 
                     if(!aMatrix.isIdentity())
                     {
-                        setTransform(&aMatrix);
+                        setTransform(aMatrix);
                     }
                     break;
                 }
diff --git a/svgio/source/svgreader/svgvisitor.cxx b/svgio/source/svgreader/svgvisitor.cxx
index ba4baaa2abfa..8ad5395f1ce3 100644
--- a/svgio/source/svgreader/svgvisitor.cxx
+++ b/svgio/source/svgreader/svgvisitor.cxx
@@ -77,7 +77,7 @@ void SvgDrawVisitor::visit(svgio::svgreader::SvgNode const& rNode)
                     aGradientInfo->x2 = pFillGradient->getX2().getNumber();
                     aGradientInfo->y2 = pFillGradient->getY2().getNumber();
 
-                    const basegfx::B2DHomMatrix* pGradientTransform
+                    std::optional<basegfx::B2DHomMatrix> pGradientTransform
                         = pFillGradient->getGradientTransform();
                     if (pGradientTransform)
                     {