1 files changed, 15 insertions, 2 deletions
diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx
index a7acc0189a26..85ddf2754b81 100644
--- a/uui/source/masterpasscrtdlg.cxx
+++ b/uui/source/masterpasscrtdlg.cxx
@@ -41,8 +41,8 @@ IMPL_LINK_NOARG(MasterPasswordCreateDialog, OKHdl_Impl)
     else
     {
         OUString aErrorMsg( ResId( STR_ERROR_PASSWORDS_NOT_IDENTICAL, *pResourceMgr ));
-        MessageDialog aErrorBox(this, aErrorMsg);
-        aErrorBox.Execute();
+        ScopedVclPtrInstance< MessageDialog > aErrorBox(this, aErrorMsg);
+        aErrorBox->Execute();
         m_pEDMasterPasswordCrt->SetText( OUString() );
         m_pEDMasterPasswordRepeat->SetText( OUString() );
         m_pEDMasterPasswordCrt->GrabFocus();
@@ -63,4 +63,17 @@ MasterPasswordCreateDialog::MasterPasswordCreateDialog(vcl::Window* pParent, Res
     m_pEDMasterPasswordCrt->SetModifyHdl( LINK( this, MasterPasswordCreateDialog, EditHdl_Impl ) );
 }
 
+MasterPasswordCreateDialog::~MasterPasswordCreateDialog()
+{
+    disposeOnce();
+}
+
+void MasterPasswordCreateDialog::dispose()
+{
+    m_pEDMasterPasswordCrt.clear();
+    m_pEDMasterPasswordRepeat.clear();
+    m_pOKBtn.clear();
+    ModalDialog::dispose();
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */