diff options
author | Noel Grandin <noel@peralex.com> | 2015-01-06 10:29:11 +0200 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-09 19:57:33 +0100 |
commit | a632fa5f2e059642f0feffb200e8c9a71ee75802 (patch) | |
tree | ab1c9cc0dee047fd2fa2d050ebeb12c6ab8bb6a9 /sd | |
parent | 10981bc4e349f59818d8f750db378e1ae579ba09 (diff) |
vcl: rename VclReference to VclPtr
and remove the typedefs. The code is more obvious this way.
Change-Id: I4c8f5b5ab050dd96216302a03e760ed0e3ab3464
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/animations/CustomAnimationDialog.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
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; |