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, 5 insertions, 8 deletions

diff --git a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
index 380e927ca568..7390f30b08a7 100644
--- a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
+++ b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
@@ -90,7 +90,7 @@ protected:
     ObjectContact&                                  mrOriginalObjectContact;
 
     // Set StartPoint for next run, also given in constructor
-    SdrPageWeakRef                                  mxStartPage;
+    tools::WeakReference<SdrPage>                   mxStartPage;
 
     // Hierarchy access methods
     virtual sal_uInt32 GetPaintObjectCount() const override;
diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx
index 79730758b419..d621d87d2fd0 100644
--- a/include/svx/sdr/table/tablecontroller.hxx
+++ b/include/svx/sdr/table/tablecontroller.hxx
@@ -176,7 +176,7 @@ private:
     sdr::overlay::OverlayObjectList*  mpSelectionOverlay;
 
     SdrView* mpView;
-    SdrObjectWeakRef mxTableObj;
+    tools::WeakReference<SdrObject> mxTableObj;
     SdrModel* mpModel;
 
     css::uno::Reference< css::util::XModifyListener > mxModifyListener;
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index b55385e77d17..20f61dff15af 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -74,7 +74,8 @@ class SVX_DLLPUBLIC SdrObjEditView: public SdrGlueEditView, public EditViewCallb
 
 protected:
     // TextEdit
-    SdrObjectWeakRef            mxTextEditObj;         // current object in TextEdit
+    tools::WeakReference<SdrObject>
+                                mxTextEditObj;         // current object in TextEdit
     SdrPageView*                pTextEditPV;
     SdrOutliner*                pTextEditOutliner;     // outliner for the TextEdit
     OutlinerView*               pTextEditOutlinerView; // current view of the outliners
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 265ec9b96c72..25ab2c824e14 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -1003,8 +1003,6 @@ private:
     SdrObjFactory() = delete;
 };
 
-typedef tools::WeakReference< SdrObject > SdrObjectWeakRef;
-
 template< typename T > T* SdrObject::CloneHelper() const
 {
     OSL_ASSERT( typeid( T ) == typeid( *this ));
diff --git a/include/svx/svdoutl.hxx b/include/svx/svdoutl.hxx
index 5d1f9e842593..b13cd4b0ab6f 100644
--- a/include/svx/svdoutl.hxx
+++ b/include/svx/svdoutl.hxx
@@ -30,7 +30,7 @@ class SdrPage;
 class SVX_DLLPUBLIC SdrOutliner : public Outliner
 {
 protected:
-    SdrObjectWeakRef mpTextObj;
+    tools::WeakReference<SdrObject> mpTextObj;
     const SdrPage* mpVisualizedPage;
 
 public:
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index 0952a9335ac3..7f9917bacb29 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -512,8 +512,6 @@ private:
     void impl_setModelForLayerAdmin(SdrModel* pNewModel);
 };
 
-typedef tools::WeakReference< SdrPage > SdrPageWeakRef;
-
 
 #endif // INCLUDED_SVX_SVDPAGE_HXX