diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-03-17 20:19:40 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 11:51:01 +0100 |
| commit | 256371f49dad16347db48d7ff826779345538f3c (patch) | |
| tree | 3d3ab224e8434c16f95c4670ed5bc34a4e9f05f3 /avmedia | |
| parent | a140e0d0bab3bd09fe19711fc99e411fcc2675d7 (diff) | |
clear() is the equivalent of assigning a local ptr to NULL.
Sometimes it matters; doing a disposeAndClear() instead can change
the order of destruction profoundly. Fix a number of issues from:
"vclwidget: change all vcl::window fields to be wrapped in VclPtr"
Change-Id: I3127d3ed973458e8299156453258e167dbdb8ccf
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/framework/mediacontrol.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index e6c680e45d3d..baf1acfe8949 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -202,7 +202,7 @@ MediaControl::~MediaControl() void MediaControl::dispose() { maZoomToolBox->SetItemWindow( AVMEDIA_TOOLBOXITEM_ZOOM, NULL ); - mpZoomListBox.disposeAndClear(); + mpZoomListBox.clear(); maTimeEdit.disposeAndClear(); maZoomToolBox.disposeAndClear(); maVolumeSlider.disposeAndClear(); |