From a632fa5f2e059642f0feffb200e8c9a71ee75802 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Tue, 6 Jan 2015 10:29:11 +0200
Subject: vcl: rename VclReference to VclPtr

and remove the typedefs. The code is more obvious this way.

Change-Id: I4c8f5b5ab050dd96216302a03e760ed0e3ab3464
---
 sd/source/ui/animations/CustomAnimationDialog.cxx | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'sd')

diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 6497b0e83c21..db14887a5bef 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -320,7 +320,7 @@ Control* FontPropertyBox::getControl()
 class DropdownMenuBox : public Edit
 {
 public:
-    DropdownMenuBox( vcl::Window* pParent, const EditRef &pSubControl, PopupMenu* pMenu );
+    DropdownMenuBox( vcl::Window* pParent, const VclPtr<Edit> &pSubControl, PopupMenu* pMenu );
     virtual ~DropdownMenuBox();
 
     void Resize() SAL_OVERRIDE;
@@ -329,12 +329,12 @@ public:
     void SetMenuSelectHdl( const Link& rLink ) { mpDropdownButton->SetSelectHdl( rLink ); }
 
 private:
-    EditRef     mpSubControl;
-    MenuButton* mpDropdownButton;
-    PopupMenu*  mpMenu;
+    VclPtr<Edit> mpSubControl;
+    MenuButton*  mpDropdownButton;
+    PopupMenu*   mpMenu;
 };
 
-DropdownMenuBox::DropdownMenuBox( vcl::Window* pParent, const EditRef &pSubControl, PopupMenu* pMenu )
+DropdownMenuBox::DropdownMenuBox( vcl::Window* pParent, const VclPtr<Edit> &pSubControl, PopupMenu* pMenu )
 :   Edit( pParent, WB_BORDER|WB_TABSTOP| WB_DIALOGCONTROL ),
     mpSubControl(pSubControl),mpDropdownButton(0),mpMenu(pMenu)
 {
@@ -350,7 +350,7 @@ DropdownMenuBox::DropdownMenuBox( vcl::Window* pParent, const EditRef &pSubContr
 
 DropdownMenuBox::~DropdownMenuBox()
 {
-    SetSubEdit(EditRef());
+    SetSubEdit(VclPtr<Edit>());
     delete mpDropdownButton;
     delete mpMenu;
 }
@@ -406,7 +406,7 @@ public:
 private:
     DropdownMenuBox* mpControl;
     PopupMenu* mpMenu;
-    VclReference<MetricField> mpMetric;
+    VclPtr<MetricField> mpMetric;
 };
 
 CharHeightPropertyBox::CharHeightPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl )
@@ -486,7 +486,7 @@ public:
 private:
     DropdownMenuBox* mpControl;
     PopupMenu* mpMenu;
-    VclReference<MetricField> mpMetric;
+    VclPtr<MetricField> mpMetric;
     Link maModifyHdl;
 };
 
@@ -590,7 +590,7 @@ public:
 private:
     DropdownMenuBox* mpControl;
     PopupMenu* mpMenu;
-    VclReference<MetricField> mpMetric;
+    VclPtr<MetricField> mpMetric;
     Link maModifyHdl;
 };
 
@@ -715,7 +715,7 @@ public:
 private:
     DropdownMenuBox* mpControl;
     PopupMenu* mpMenu;
-    VclReference<MetricField> mpMetric;
+    VclPtr<MetricField> mpMetric;
     Link maModifyHdl;
     int mnDirection;
 };
@@ -877,7 +877,7 @@ public:
 private:
     DropdownMenuBox* mpControl;
     PopupMenu* mpMenu;
-    EditRef mpEdit;
+    VclPtr<Edit> mpEdit;
     Link maModifyHdl;
 
     float mfFontWeight;
-- 
cgit