3 files changed, 15 insertions, 15 deletions
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index 917639125d0f..3ce1454a07f9 100644
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.hxx
@@ -260,7 +260,7 @@ private:
         selection.  This copy is necessary because during the search
         process the mark list is modified.
     */
-    ::std::vector<SdrObjectWeakRef> maMarkListCopy;
+    ::std::vector<tools::WeakReference<SdrObject>> maMarkListCopy;
 
     /** Current object that may be a text object.  The object pointer to
         corresponds to <member>mnObjIndex</member>.  While iterating over the
diff --git a/sd/inc/OutlinerIterator.hxx b/sd/inc/OutlinerIterator.hxx
index 8271916d8b0a..38899e763709 100644
--- a/sd/inc/OutlinerIterator.hxx
+++ b/sd/inc/OutlinerIterator.hxx
@@ -224,7 +224,7 @@ private:
             This specifies at which object the iterator points initially.
     */
     static Iterator CreateSelectionIterator (
-        const ::std::vector<SdrObjectWeakRef>& rObjectList,
+        const ::std::vector<::tools::WeakReference<SdrObject>>& rObjectList,
         SdDrawDocument* pDocument,
         const std::shared_ptr<ViewShell>& rpViewShell,
         bool bDirectionIsForward,
@@ -297,7 +297,7 @@ public:
     bool operator== (const IteratorPosition& aPosition) const;
 
     /// Pointer to the actual <type>SdrObject</type> object.
-    SdrObjectWeakRef mxObject;
+    ::tools::WeakReference<SdrObject> mxObject;
 
     /// Number of the actual SdrText from the current <type>SdrObject</type>
     sal_Int32 mnText;
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