diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-16 12:17:44 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 11:20:46 +0100 |
| commit | c72fac269626cd4c2c3f62a6eed69e47b59256a4 (patch) | |
| tree | d36dd1a09731cb07254ae4a09036b2d64a59de44 /avmedia | |
| parent | de6b9148eb64dfa4b31c87c1ac46fda0821645e3 (diff) | |
vclwidget: convert lots more sites to use VclPtr
seems there was a lot of shared_ptr usage floating around...
Change-Id: Icd05243170eb8493709275fc36bf986fc194b781
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/viewer/mediawindow_impl.cxx | 4 | ||||
| -rw-r--r-- | avmedia/source/viewer/mediawindow_impl.hxx | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 8646e4d41bc9..5ff2f062ce9e 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -204,7 +204,9 @@ void MediaWindowImpl::dispose() mpEmptyBmpEx = NULL; delete mpAudioBmpEx; mpAudioBmpEx = NULL; - mpMediaWindowControl.clear(); + mpMediaWindowControl.disposeAndClear(); + mpChildWindow.disposeAndClear(); + Control::dispose(); } diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx index 40131c3c6fe2..c56558c375db 100644 --- a/avmedia/source/viewer/mediawindow_impl.hxx +++ b/avmedia/source/viewer/mediawindow_impl.hxx @@ -172,7 +172,7 @@ namespace avmedia ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxEventsIf; MediaEventListenersImpl* mpEvents; bool mbEventTransparent; - std::unique_ptr<MediaChildWindow> mpChildWindow; + VclPtr<MediaChildWindow> mpChildWindow; VclPtr<MediaWindowControl> mpMediaWindowControl; BitmapEx* mpEmptyBmpEx; BitmapEx* mpAudioBmpEx; |