vclwidget: convert lots more sites to use VclPtr

seems there was a lot of shared_ptr usage floating around...

Change-Id: Icd05243170eb8493709275fc36bf986fc194b781

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;