1 files changed, 4 insertions, 3 deletions
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index a40d8a384be2..267e39fb7d6a 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -46,7 +46,7 @@ namespace avmedia {
 
 
 MediaWindow::MediaWindow( vcl::Window* parent, bool bInternalMediaControl ) :
-    mpImpl( new priv::MediaWindowImpl( parent, this, bInternalMediaControl ) )
+    mpImpl( VclPtr<priv::MediaWindowImpl>::Create( parent, this, bInternalMediaControl ) )
 {
     mpImpl->Show();
 }
@@ -327,9 +327,10 @@ bool MediaWindow::executeMediaURLDialog(vcl::Window* /* pParent */,
 
 void MediaWindow::executeFormatErrorBox( vcl::Window* pParent )
 {
-    MessageDialog aErrBox( pParent, AVMEDIA_RESID( AVMEDIA_STR_ERR_URL ) );
+    ScopedVclPtrInstance< MessageDialog > aErrBox( pParent, AVMEDIA_RESID( AVMEDIA_STR_ERR_URL ) );
 
-    aErrBox.Execute();
+    aErrBox->Execute();
+    aErrBox.disposeAndClear();
 }