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>

6 files changed, 12 insertions, 12 deletions

diff --git a/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx
index 393c235af00c..4658aca12515 100644
--- a/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx
@@ -37,7 +37,7 @@ namespace drawinglayer
         class SdrOleContentPrimitive2D : public BufferedDecompositionPrimitive2D
         {
         private:
-            SdrObjectWeakRef                            mpSdrOle2Obj;
+            tools::WeakReference<SdrObject>             mpSdrOle2Obj;
             basegfx::B2DHomMatrix                       maObjectTransform;
 
             // #i104867# The GraphicVersion number to identify in operator== if
diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
index ee202580b252..71ab1bb83a10 100644
--- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
+++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
@@ -179,7 +179,7 @@ void ObjectContactOfPagePainter::SetStartPage(const SdrPage* pPage)
 {
     if(pPage != GetStartPage())
     {
-        mxStartPage.reset(const_cast< SdrPage* >(pPage)); // no SdrPageWeakRef available to hold a const SdrPage*
+        mxStartPage.reset(const_cast< SdrPage* >(pPage)); // no tools::WeakReference<SdrPage> available to hold a const SdrPage*
     }
 }
 
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(),
diff --git a/svx/source/table/tableundo.cxx b/svx/source/table/tableundo.cxx
index 6a8573d81556..27c93bd4b158 100644
--- a/svx/source/table/tableundo.cxx
+++ b/svx/source/table/tableundo.cxx
@@ -34,7 +34,7 @@ using namespace ::com::sun::star::table;
 
 namespace sdr { namespace table {
 
-CellUndo::CellUndo( const SdrObjectWeakRef& xObjRef, const CellRef& xCell )
+CellUndo::CellUndo( const tools::WeakReference<SdrObject>& xObjRef, const CellRef& xCell )
     : SdrUndoAction( *xCell->GetModel() )
     , mxObjRef( xObjRef )
     , mxCell( xCell )
diff --git a/svx/source/table/tableundo.hxx b/svx/source/table/tableundo.hxx
index e8077a0bceaf..dda6c8b57e91 100644
--- a/svx/source/table/tableundo.hxx
+++ b/svx/source/table/tableundo.hxx
@@ -42,7 +42,7 @@ namespace sdr { namespace table {
 class CellUndo : public SdrUndoAction, public sdr::ObjectUser
 {
 public:
-    CellUndo( const SdrObjectWeakRef& xObjRef, const CellRef& xCell );
+    CellUndo( const tools::WeakReference<SdrObject>& xObjRef, const CellRef& xCell );
     virtual ~CellUndo() override;
 
     virtual void            Undo() override;
@@ -80,7 +80,7 @@ private:
     void setDataToCell( const Data& rData );
     void getDataFromCell( Data& rData );
 
-    SdrObjectWeakRef mxObjRef;
+    tools::WeakReference<SdrObject> mxObjRef;
     CellRef mxCell;
     Data maUndoData;
     Data maRedoData;
@@ -237,7 +237,7 @@ public:
     virtual void            Redo() override;
 
 private:
-    SdrObjectWeakRef mxObjRef;
+    tools::WeakReference<SdrObject> mxObjRef;
 
     struct Data
     {
diff --git a/svx/source/unodraw/gluepts.cxx b/svx/source/unodraw/gluepts.cxx
index e934b3e8bf89..42882aa0f1e1 100644
--- a/svx/source/unodraw/gluepts.cxx
+++ b/svx/source/unodraw/gluepts.cxx
@@ -39,7 +39,7 @@ const sal_uInt16 NON_USER_DEFINED_GLUE_POINTS = 4;
 class SvxUnoGluePointAccess : public WeakImplHelper< container::XIndexContainer, container::XIdentifierContainer >
 {
 private:
-    SdrObjectWeakRef    mpObject;
+    tools::WeakReference<SdrObject>    mpObject;
 
 public:
     explicit SvxUnoGluePointAccess( SdrObject* pObject ) throw();