diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-05-11 14:02:42 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-05-12 09:40:38 +0100 |
| commit | 936a49646738452f7331ed9a47ac015db9ee7295 (patch) | |
| tree | 7dff1a6db99e3e28b8bc2226d07b29d5f2b5cd0b /desktop | |
| parent | ab81e3bff2a1844be67209bc8947d539edbaf8e6 (diff) | |
Switch VclBuilder constructors to use VclPtr.
Change-Id: Id35a86eb52bbde6ca09a5e61a0b1a79b23be8faf
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_dialog2.cxx | 4 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/license_dialog.cxx | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 37e653e1ad00..010229251335 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -195,14 +195,12 @@ void ExtBoxWithBtns_Impl::InitFromDialog(ExtMgrDialog *pParentDialog) SetScrollHdl( LINK( this, ExtBoxWithBtns_Impl, ScrollHdl ) ); } - VCL_BUILDER_DECL_FACTORY(ExtBoxWithBtns) { (void)rMap; - return new ExtBoxWithBtns_Impl(pParent); + rRet = VclPtr<ExtBoxWithBtns_Impl>::Create(pParent); } - ExtBoxWithBtns_Impl::~ExtBoxWithBtns_Impl() { disposeOnce(); diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 26b577ebab7d..7988fc9052d1 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -833,7 +833,7 @@ Size ExtensionBox_Impl::GetOptimalSize() const VCL_BUILDER_DECL_FACTORY(ExtensionBox) { (void)rMap; - return new ExtensionBox_Impl(pParent); + rRet = VclPtr<ExtensionBox_Impl>::Create(pParent); } long ExtensionBox_Impl::PointToPos( const Point& rPos ) diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index 141d64b2ddc7..f37082e443ab 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -132,7 +132,7 @@ VCL_BUILDER_DECL_FACTORY(LicenseView) OString sBorder = VclBuilder::extractCustomProperty(rMap); if (!sBorder.isEmpty()) nWinStyle |= WB_BORDER; - return new LicenseView(pParent, nWinStyle | WB_VSCROLL); + rRet = VclPtr<LicenseView>::Create(pParent, nWinStyle | WB_VSCROLL); } LicenseView::~LicenseView() |