diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-25 11:50:14 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-26 08:10:52 +0100 |
commit | 398bbde8231e77bd4106c09c34839f0f16f2f7ee (patch) | |
tree | 195bbc38e3d96eef620a6a50e33d0ea15a47d0a3 /svx/source/svdraw/svdpage.cxx | |
parent | c7e2b4ff70c751541167fea7adacaf2556b43312 (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 'svx/source/svdraw/svdpage.cxx')
-rw-r--r-- | svx/source/svdraw/svdpage.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 527c17f7b609..2251699472eb 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -59,11 +59,11 @@ using namespace ::com::sun::star; class SdrObjList::WeakSdrObjectContainerType - : public ::std::vector<SdrObjectWeakRef> + : public ::std::vector<tools::WeakReference<SdrObject>> { public: explicit WeakSdrObjectContainerType (const sal_Int32 nInitialSize) - : ::std::vector<SdrObjectWeakRef>(nInitialSize) {}; + : ::std::vector<tools::WeakReference<SdrObject>>(nInitialSize) {}; }; @@ -758,7 +758,7 @@ void SdrObjList::SetObjectNavigationPosition ( OSL_ASSERT(mxNavigationOrder.get()!=nullptr); OSL_ASSERT( mxNavigationOrder->size() == maList.size()); - SdrObjectWeakRef aReference (&rObject); + tools::WeakReference<SdrObject> aReference (&rObject); // Look up the object whose navigation position is to be changed. WeakSdrObjectContainerType::iterator iObject (::std::find( @@ -919,7 +919,7 @@ void SdrObjList::ReplaceObjectInContainer ( // not transferred to the new object so erase the former and append // the later object from/to the navigation order. OSL_ASSERT(nObjectPosition < maList.size()); - SdrObjectWeakRef aReference (maList[nObjectPosition]); + tools::WeakReference<SdrObject> aReference (maList[nObjectPosition]); WeakSdrObjectContainerType::iterator iObject (::std::find( mxNavigationOrder->begin(), mxNavigationOrder->end(), @@ -949,7 +949,7 @@ void SdrObjList::RemoveObjectFromContainer ( // Update the navigation positions. if (HasObjectNavigationOrder()) { - SdrObjectWeakRef aReference (maList[nObjectPosition]); + tools::WeakReference<SdrObject> aReference (maList[nObjectPosition]); WeakSdrObjectContainerType::iterator iObject (::std::find( mxNavigationOrder->begin(), mxNavigationOrder->end(), |