1 files changed, 31 insertions, 33 deletions

diff --git a/include/svx/e3dundo.hxx b/include/svx/e3dundo.hxx
index 8be61b7b9e0e..17335ea1e8e0 100644
--- a/include/svx/e3dundo.hxx
+++ b/include/svx/e3dundo.hxx
@@ -31,17 +31,15 @@
 \************************************************************************/
 class SAL_WARN_UNUSED E3dUndoAction : public SdrUndoAction
 {
-
     protected:
-        E3dObject *pMy3DObj;
+        E3dObject&      mrMy3DObj;
 
     public:
-        E3dUndoAction (SdrModel  *pModel,
-                       E3dObject *p3DObj) :
-            SdrUndoAction (*pModel),
-            pMy3DObj (p3DObj)
-            {
-            }
+        E3dUndoAction(E3dObject &r3DObj)
+        :   SdrUndoAction(r3DObj.getSdrModelFromSdrObject()),
+            mrMy3DObj(r3DObj)
+        {
+        }
 
         virtual ~E3dUndoAction () override;
 
@@ -55,25 +53,25 @@ class SAL_WARN_UNUSED E3dUndoAction : public SdrUndoAction
 \************************************************************************/
 class SAL_WARN_UNUSED E3dRotateUndoAction : public E3dUndoAction
 {
-        basegfx::B3DHomMatrix aMyOldRotation;
-        basegfx::B3DHomMatrix aMyNewRotation;
-
-    public:
-        E3dRotateUndoAction (SdrModel       *pModel,
-                             E3dObject      *p3DObj,
-                             const basegfx::B3DHomMatrix &aOldRotation,
-                             const basegfx::B3DHomMatrix &aNewRotation) :
-            E3dUndoAction (pModel, p3DObj),
-            aMyOldRotation (aOldRotation),
-            aMyNewRotation (aNewRotation)
-            {
-            }
-
-        virtual ~E3dRotateUndoAction () override;
-
-        virtual void Undo() override;
-        virtual void Redo() override;
-
+private:
+    basegfx::B3DHomMatrix   maMyOldRotation;
+    basegfx::B3DHomMatrix   maMyNewRotation;
+
+public:
+    E3dRotateUndoAction(
+        E3dObject& r3DObj,
+        const basegfx::B3DHomMatrix &aOldRotation,
+        const basegfx::B3DHomMatrix &aNewRotation)
+    :   E3dUndoAction(r3DObj),
+        maMyOldRotation(aOldRotation),
+        maMyNewRotation(aNewRotation)
+    {
+    }
+
+    virtual ~E3dRotateUndoAction () override;
+
+    virtual void Undo() override;
+    virtual void Redo() override;
 };
 
 /************************************************************************\
@@ -83,16 +81,16 @@ class SAL_WARN_UNUSED E3dRotateUndoAction : public E3dUndoAction
 \************************************************************************/
 class SAL_WARN_UNUSED SVX_DLLPUBLIC E3dAttributesUndoAction : public SdrUndoAction
 {
+private:
     using SdrUndoAction::Repeat;
 
-    SdrObject*  pObject;
-
-    const SfxItemSet aNewSet;
-    const SfxItemSet aOldSet;
+    SdrObject&          mrObject;
+    const SfxItemSet    maNewSet;
+    const SfxItemSet    maOldSet;
 
  public:
-        E3dAttributesUndoAction( SdrModel &rModel,
-            E3dObject* pInObject,
+        E3dAttributesUndoAction(
+            E3dObject& rInObject,
             const SfxItemSet& rNewSet,
             const SfxItemSet& rOldSet);