1 files changed, 5 insertions, 10 deletions
diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index 422f6b13b446..4bb90d88ee0e 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -137,10 +137,8 @@ protected:
     const SvxItemPropertySet* mpPropSet;
     const SfxItemPropertyMapEntry* maPropMapEntries;
 
-private:
-    ::tools::WeakReference< SdrObject > mpSdrObjectWeakReference;
-
-protected:
+    ::tools::WeakReference< SdrObject > mpObj;
+    SdrModel* mpModel;
     // translations for writer, which works in TWIPS
     void ForceMetricToItemPoolMetric(Pair& rPoint) const throw();
     void ForceMetricToItemPoolMetric(Point& rPoint) const throw() { ForceMetricToItemPoolMetric(rPoint.toPair()); }
@@ -208,13 +206,10 @@ public:
     void TakeSdrObjectOwnership();
     bool HasSdrObjectOwnership() const;
 
-    // used exclusively by SdrObject
-    void InvalidateSdrObject();
-
-    // Encapsulated access to SdrObject
-    SdrObject* GetSdrObject() const { return mpSdrObjectWeakReference.get(); }
-    bool HasSdrObject() const { return mpSdrObjectWeakReference.is(); }
+    void ChangeModel( SdrModel* pNewModel );
 
+    void InvalidateSdrObject() { mpObj.reset( nullptr ); };
+    SdrObject* GetSdrObject() const {return mpObj.get();}
     void SetShapeType( const OUString& ShapeType ) { maShapeType = ShapeType; }
     /// @throws css::uno::RuntimeException
     css::uno::Any GetBitmap( bool bMetaFile = false ) const;