summaryrefslogtreecommitdiff
path: root/sd/inc/undo
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-01-25 11:50:14 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-01-26 08:10:52 +0100
commit398bbde8231e77bd4106c09c34839f0f16f2f7ee (patch)
tree195bbc38e3d96eef620a6a50e33d0ea15a47d0a3 /sd/inc/undo
parentc7e2b4ff70c751541167fea7adacaf2556b43312 (diff)
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>
Diffstat (limited to 'sd/inc/undo')
-rw-r--r--sd/inc/undo/undoobjects.hxx24
1 files changed, 12 insertions, 12 deletions
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