Revert "SOSAW080: Added first bunch of basic changes to helpers"

This reverts commit 6c14c27c75a03e2363f2b363ddf0a6f2f46cfa91.

1 files changed, 8 insertions, 11 deletions

diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx
index d11a289060f8..65b934847489 100644
--- a/include/svx/svdograf.hxx
+++ b/include/svx/svdograf.hxx
@@ -129,16 +129,10 @@ private:
 
 public:
 
-    SdrGrafObj(SdrModel& rSdrModel);
-    SdrGrafObj(
-        SdrModel& rSdrModel,
-        const Graphic& rGrf);
-    SdrGrafObj(
-        SdrModel& rSdrModel,
-        const Graphic& rGrf,
-        const tools::Rectangle& rRect);
-
-    virtual ~SdrGrafObj() override;
+                            SdrGrafObj();
+                            SdrGrafObj(const Graphic& rGrf);
+                            SdrGrafObj(const Graphic& rGrf, const tools::Rectangle& rRect);
+    virtual                 ~SdrGrafObj() override;
 
     void                    SetGraphicObject( const GraphicObject& rGrfObj );
     const GraphicObject&    GetGraphicObject(bool bForceSwapIn = false) const;
@@ -149,7 +143,9 @@ public:
     const Graphic&          GetGraphic() const;
 
     Graphic                 GetTransformedGraphic( SdrGrafObjTransformsAttrs nTransformFlags = SdrGrafObjTransformsAttrs::ALL ) const;
+
     GraphicType             GetGraphicType() const;
+
     GraphicAttr             GetGraphicAttr( SdrGrafObjTransformsAttrs nTransformFlags = SdrGrafObjTransformsAttrs::ALL  ) const;
 
     // Keep ATM for SD.
@@ -186,7 +182,7 @@ public:
     // #i25616#
     virtual basegfx::B2DPolyPolygon TakeXorPoly() const override;
 
-    virtual SdrGrafObj* Clone(SdrModel* pTargetModel = nullptr) const override;
+    virtual SdrGrafObj* Clone() const override;
     SdrGrafObj&             operator=(const SdrGrafObj& rObj);
 
     virtual sal_uInt32 GetHdlCount() const override;
@@ -201,6 +197,7 @@ public:
     bool                    HasGDIMetaFile() const;
 
     virtual void            SetPage(SdrPage* pNewPage) override;
+    virtual void            SetModel(SdrModel* pNewModel) override;
 
     bool isEmbeddedVectorGraphicData() const;
     GDIMetaFile getMetafileFromEmbeddedVectorGraphicData() const;