From 398bbde8231e77bd4106c09c34839f0f16f2f7ee Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Thu, 25 Jan 2018 11:50:14 +0200
Subject: expand out SdrObjectWeakRef and SdrPageWeakRef typedefs

Change-Id: Icacc7354df4a927533e6fec072cdd527e4c57b96
Reviewed-on: https://gerrit.libreoffice.org/48566
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 sd/inc/undo/undoobjects.hxx | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'sd/inc/undo')

diff --git a/sd/inc/undo/undoobjects.hxx b/sd/inc/undo/undoobjects.hxx
index 964b0776caaa..bd3f05d99b1a 100644
--- a/sd/inc/undo/undoobjects.hxx
+++ b/sd/inc/undo/undoobjects.hxx
@@ -56,7 +56,7 @@ public:
     virtual void Redo() override;
 
 private:
-    SdrObjectWeakRef mxSdrObject;
+    ::tools::WeakReference<SdrObject> mxSdrObject;
 };
 
 class UndoDeleteObject : public SdrUndoDelObj, public UndoRemovePresObjectImpl
@@ -68,7 +68,7 @@ public:
     virtual void Redo() override;
 
 private:
-    SdrObjectWeakRef mxSdrObject;
+    ::tools::WeakReference<SdrObject> mxSdrObject;
 };
 
 class UndoReplaceObject : public SdrUndoReplaceObj, public UndoRemovePresObjectImpl
@@ -80,7 +80,7 @@ public:
     virtual void Redo() override;
 
 private:
-    SdrObjectWeakRef mxSdrObject;
+    ::tools::WeakReference<SdrObject> mxSdrObject;
 };
 
 class UndoObjectSetText : public SdrUndoObjSetText
@@ -95,7 +95,7 @@ public:
 private:
     std::unique_ptr<SfxUndoAction> mpUndoAnimation;
     bool            mbNewEmptyPresObj;
-    SdrObjectWeakRef mxSdrObject;
+    ::tools::WeakReference<SdrObject> mxSdrObject;
 };
 
 // Undo for SdrObject::SetUserCall()
@@ -111,7 +111,7 @@ public:
 private:
     SdrObjUserCall* mpOldUserCall;
     SdrObjUserCall* mpNewUserCall;
-    SdrObjectWeakRef mxSdrObject;
+    ::tools::WeakReference<SdrObject> mxSdrObject;
 };
 
 // Undo for SdPage::InsertPresObj() and SdPage::RemovePresObj()
@@ -127,8 +127,8 @@ public:
 private:
     PresObjKind meOldKind;
     PresObjKind meNewKind;
-    SdrPageWeakRef mxPage;
-    SdrObjectWeakRef mxSdrObject;
+    ::tools::WeakReference<SdrPage> mxPage;
+    ::tools::WeakReference<SdrObject> mxSdrObject;
 };
 
 // Restores correct position and size for presentation shapes with user call
@@ -143,7 +143,7 @@ public:
     virtual void Redo() override;
 
 private:
-    SdrPageWeakRef mxPage;
+    ::tools::WeakReference<SdrPage> mxPage;
 };
 
 class UndoGeoObject final : public SdrUndoGeoObj
@@ -155,8 +155,8 @@ public:
     virtual void Redo() override;
 
 private:
-    SdrPageWeakRef mxPage;
-    SdrObjectWeakRef mxSdrObject;
+    ::tools::WeakReference<SdrPage> mxPage;
+    ::tools::WeakReference<SdrObject> mxSdrObject;
 };
 
 class UndoAttrObject final : public SdrUndoAttrObj
@@ -168,8 +168,8 @@ public:
     virtual void Redo() override;
 
 private:
-    SdrPageWeakRef mxPage;
-    SdrObjectWeakRef mxSdrObject;
+    ::tools::WeakReference<SdrPage> mxPage;
+    ::tools::WeakReference<SdrObject> mxSdrObject;
 };
 
 } // namespace sd
-- 
cgit