diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-20 11:27:10 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 12:37:44 +0100 |
| commit | 61b224f392eb856bf4cfa0c04c68202a463cbdbf (patch) | |
| tree | 77a28e38763bc5f9d95e2c278601d31dc6fbf65d /vcl/source/control | |
| parent | f1d9eef4163e88a3cb6360178b52ce441e65d8ae (diff) | |
vclwidget: fixup locally allocated vcl::Window objects
They need to be wrapped in ScopedVclPtr in order to be disposed properly.
Change-Id: Ib64dba353774f54711e4de7f5d15d859c6a4dc7e
Diffstat (limited to 'vcl/source/control')
| -rw-r--r-- | vcl/source/control/edit.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 4ab221fccc07..246df6ee6e75 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -805,7 +805,7 @@ void Edit::ShowTruncationWarning( vcl::Window* pParent ) ResMgr* pResMgr = ImplGetResMgr(); if( pResMgr ) { - VclPtr<MessageDialog> aBox(new MessageDialog(pParent, ResId(SV_EDIT_WARNING_STR, *pResMgr), VCL_MESSAGE_WARNING)); + ScopedVclPtr<MessageDialog> aBox(new MessageDialog(pParent, ResId(SV_EDIT_WARNING_STR, *pResMgr), VCL_MESSAGE_WARNING)); aBox->Execute(); } } @@ -2784,9 +2784,8 @@ Size Edit::CalcMinimumSize() const Size Edit::GetMinimumEditSize() { vcl::Window* pDefWin = ImplGetDefaultWindow(); - VclPtr<Edit> aEdit(new Edit( pDefWin, WB_BORDER ) ); + ScopedVclPtr<Edit> aEdit(new Edit( pDefWin, WB_BORDER ) ); Size aSize( aEdit->CalcMinimumSize() ); - aEdit.disposeAndClear(); return aSize; } |