1 files changed, 17 insertions, 2 deletions
diff --git a/uui/source/nameclashdlg.cxx b/uui/source/nameclashdlg.cxx
index 63ad0926dc02..06ff359bf3ca 100644
--- a/uui/source/nameclashdlg.cxx
+++ b/uui/source/nameclashdlg.cxx
@@ -34,8 +34,8 @@ IMPL_LINK( NameClashDialog, ButtonHdl_Impl, PushButton *, pBtn )
         OUString aNewName = m_pEDNewName->GetText();
         if ( ( aNewName == maNewName ) || aNewName.isEmpty() )
         {
-            MessageDialog aError(NULL, maSameName);
-            aError.Execute();
+            ScopedVclPtrInstance< MessageDialog > aError(nullptr, maSameName);
+            aError->Execute();
             return 1;
         }
         maNewName = aNewName;
@@ -94,4 +94,19 @@ NameClashDialog::NameClashDialog( vcl::Window* pParent, ResMgr* pResMgr,
         m_pEDNewName->SetText( rClashingName );
 }
 
+NameClashDialog::~NameClashDialog()
+{
+    disposeOnce();
+}
+
+void NameClashDialog::dispose()
+{
+    m_pFTMessage.clear();
+    m_pEDNewName.clear();
+    m_pBtnOverwrite.clear();
+    m_pBtnRename.clear();
+    m_pBtnCancel.clear();
+    ModalDialog::dispose();
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */