return by unique_ptr from NewGeoData

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

13 files changed, 16 insertions, 17 deletions

diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx
index e786cbbfbcbd..4455711779af 100644
--- a/include/svx/obj3d.hxx
+++ b/include/svx/obj3d.hxx
@@ -127,7 +127,7 @@ public:
     virtual E3dObject* CloneSdrObject(SdrModel& rTargetModel) const override;
     E3dObject& operator=( const E3dObject& rObj );
 
-    virtual SdrObjGeoData *NewGeoData() const override;
+    virtual std::unique_ptr<SdrObjGeoData> NewGeoData() const override;
     virtual void          SaveGeoData(SdrObjGeoData& rGeo) const override;
     virtual void          RestGeoData(const SdrObjGeoData& rGeo) override;
 
diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx
index 13d4157d3449..680cd0717d84 100644
--- a/include/svx/scene3d.hxx
+++ b/include/svx/scene3d.hxx
@@ -130,7 +130,7 @@ public:
     virtual E3dScene* CloneSdrObject(SdrModel& rTargetModel) const override;
     E3dScene& operator=(const E3dScene&);
 
-    virtual SdrObjGeoData *NewGeoData() const override;
+    virtual std::unique_ptr<SdrObjGeoData> NewGeoData() const override;
     virtual void          SaveGeoData(SdrObjGeoData& rGeo) const override;
     virtual void          RestGeoData(const SdrObjGeoData& rGeo) override;
 
diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx
index 070cb2111dfd..e73ecf58ac97 100644
--- a/include/svx/svdoashp.hxx
+++ b/include/svx/svdoashp.hxx
@@ -228,7 +228,7 @@ public:
     // react on model/page change
     virtual void handlePageChange(SdrPage* pOldPage, SdrPage* pNewPage) override;
 
-    virtual SdrObjGeoData *NewGeoData() const override;
+    virtual std::unique_ptr<SdrObjGeoData> NewGeoData() const override;
     virtual void SaveGeoData(SdrObjGeoData &rGeo) const override;
     virtual void RestGeoData(const SdrObjGeoData &rGeo) override;
 
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index a944345eac99..bf70559ebdf4 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -172,7 +171,7 @@ public:
 /**
  * All geometrical data of an arbitrary object for use in undo/redo
  */
-class SAL_DLLPUBLIC_RTTI SdrObjGeoData
+class SVXCORE_DLLPUBLIC SdrObjGeoData
 {
 public:
     tools::Rectangle                   aBoundRect;
@@ -600,7 +599,7 @@ public:
     virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i);
 
     // get all geometrical data for undo/redo
-    virtual SdrObjGeoData* GetGeoData() const;
+    virtual std::unique_ptr<SdrObjGeoData> GetGeoData() const;
     virtual void SetGeoData(const SdrObjGeoData& rGeo);
 
     // ItemSet access
@@ -920,7 +919,7 @@ protected:
     /// data that must be saved for Undo.
     /// NewGeoData() creates an empty instance of a class derived from
     /// SdrObjGeoData.
-    virtual SdrObjGeoData* NewGeoData() const;
+    virtual std::unique_ptr<SdrObjGeoData> NewGeoData() const;
     virtual void SaveGeoData(SdrObjGeoData& rGeo) const;
     virtual void RestGeoData(const SdrObjGeoData& rGeo);
 
diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx
index c313fb9a1bb4..ee856c32364a 100644
--- a/include/svx/svdocapt.hxx
+++ b/include/svx/svdocapt.hxx
@@ -132,7 +132,7 @@ public:
     virtual Point GetSnapPoint(sal_uInt32 i) const override;
 
 private:
-    virtual SdrObjGeoData* NewGeoData() const override;
+    virtual std::unique_ptr<SdrObjGeoData> NewGeoData() const override;
     virtual void SaveGeoData(SdrObjGeoData& rGeo) const override;
     virtual void RestGeoData(const SdrObjGeoData& rGeo) override;
 
diff --git a/include/svx/svdocirc.hxx b/include/svx/svdocirc.hxx
index 32ecc1f661b0..cd573323a94d 100644
--- a/include/svx/svdocirc.hxx
+++ b/include/svx/svdocirc.hxx
@@ -133,7 +133,7 @@ public:
     virtual SdrObjectUniquePtr DoConvertToPolyObj(bool bBezier, bool bAddText) const override;
 
 private:
-    virtual SdrObjGeoData* NewGeoData() const override;
+    virtual std::unique_ptr<SdrObjGeoData> NewGeoData() const override;
     virtual void SaveGeoData(SdrObjGeoData& rGeo) const override;
     virtual void RestGeoData(const SdrObjGeoData& rGeo) override;
 public:
diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx
index 0bda2fece64d..b19c5514429b 100644
--- a/include/svx/svdoedge.hxx
+++ b/include/svx/svdoedge.hxx
@@ -265,7 +265,7 @@ public:
     virtual Point GetPoint(sal_uInt32 i) const override;
     virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i) override;
 
-    virtual SdrObjGeoData* NewGeoData() const override;
+    virtual std::unique_ptr<SdrObjGeoData> NewGeoData() const override;
     virtual void SaveGeoData(SdrObjGeoData& rGeo) const override;
     virtual void RestGeoData(const SdrObjGeoData& rGeo) override;
 
diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx
index 27f38203edbe..9a6d06267aa5 100644
--- a/include/svx/svdograf.hxx
+++ b/include/svx/svdograf.hxx
@@ -184,7 +184,7 @@ public:
 
     virtual void            NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override;
     virtual void            NbcMirror(const Point& rRef1, const Point& rRef2) override;
-    virtual SdrObjGeoData*  NewGeoData() const override;
+    virtual std::unique_ptr<SdrObjGeoData>  NewGeoData() const override;
     virtual void            SaveGeoData(SdrObjGeoData& rGeo) const override;
     virtual void            RestGeoData(const SdrObjGeoData& rGeo) override;
 
diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx
index ccc7d2a2f16b..599104e937b8 100644
--- a/include/svx/svdomeas.hxx
+++ b/include/svx/svdomeas.hxx
@@ -68,7 +68,7 @@ protected:
     void SetTextDirty() { bTextDirty=true; SetTextSizeDirty(); if (!aOutRect.IsEmpty()) { SetBoundRectDirty(); SetRectsDirty(true); } }
     void UndirtyText() const;
 
-    virtual SdrObjGeoData* NewGeoData() const override;
+    virtual std::unique_ptr<SdrObjGeoData> NewGeoData() const override;
     virtual void SaveGeoData(SdrObjGeoData& rGeo) const override;
     virtual void RestGeoData(const SdrObjGeoData& rGeo) override;
 
diff --git a/include/svx/svdopath.hxx b/include/svx/svdopath.hxx
index f1a5b1b2b2aa..f8360d178f71 100644
--- a/include/svx/svdopath.hxx
+++ b/include/svx/svdopath.hxx
@@ -128,7 +128,7 @@ public:
     SdrObject* RipPoint(sal_uInt32 nHdlNum, sal_uInt32& rNewPt0Index);
 
 private:
-    virtual SdrObjGeoData* NewGeoData() const override;
+    virtual std::unique_ptr<SdrObjGeoData> NewGeoData() const override;
     virtual void SaveGeoData(SdrObjGeoData& rGeo) const override;
     virtual void RestGeoData(const SdrObjGeoData& rGeo) override;
 
diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx
index 98b9229df404..2f0b284d4394 100644
--- a/include/svx/svdotable.hxx
+++ b/include/svx/svdotable.hxx
@@ -266,7 +266,7 @@ private:
     virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override;
     virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override;
 
-    virtual SdrObjGeoData* NewGeoData() const override;
+    virtual std::unique_ptr<SdrObjGeoData> NewGeoData() const override;
     virtual void SaveGeoData(SdrObjGeoData& rGeo) const override;
     virtual void RestGeoData(const SdrObjGeoData& rGeo) override;
 
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index fc7a817b543a..ed9cd61ad1f8 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -290,7 +290,7 @@ protected:
     // rAnchorRect is InOut-Parameter!
     void ImpSetContourPolygon( SdrOutliner& rOutliner, tools::Rectangle const & rAnchorRect, bool bLineWidth ) const;
 
-    virtual SdrObjGeoData* NewGeoData() const override;
+    virtual std::unique_ptr<SdrObjGeoData> NewGeoData() const override;
     virtual void SaveGeoData(SdrObjGeoData& rGeo) const override;
     virtual void RestGeoData(const SdrObjGeoData& rGeo) override;
     void NbcSetEckenradius(tools::Long nRad);
diff --git a/include/svx/svdovirt.hxx b/include/svx/svdovirt.hxx
index 12cd04095517..eade82c13c42 100644
--- a/include/svx/svdovirt.hxx
+++ b/include/svx/svdovirt.hxx
@@ -43,7 +43,7 @@ protected:
 protected:
     virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
 
-    virtual SdrObjGeoData* NewGeoData() const override;
+    virtual std::unique_ptr<SdrObjGeoData> NewGeoData() const override;
     virtual void SaveGeoData(SdrObjGeoData& rGeo) const override;
     virtual void RestGeoData(const SdrObjGeoData& rGeo) override;
 
@@ -131,7 +131,7 @@ public:
     virtual Point GetPoint(sal_uInt32 i) const override;
     virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i) override;
 
-    virtual SdrObjGeoData* GetGeoData() const override;
+    virtual std::unique_ptr<SdrObjGeoData> GetGeoData() const override;
     virtual void SetGeoData(const SdrObjGeoData& rGeo) override;
 
     virtual void NbcReformatText() override;