1 files changed, 60 insertions, 0 deletions
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index dac471ea8bc3..25397c3f66ef 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -389,6 +389,11 @@ SwMailMergeDlg::SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rShell,
 
 SwMailMergeDlg::~SwMailMergeDlg()
 {
+    disposeOnce();
+}
+
+void SwMailMergeDlg::dispose()
+{
     if(m_xFrame.is())
     {
         m_xFrame->setComponent(NULL, NULL);
@@ -401,6 +406,39 @@ SwMailMergeDlg::~SwMailMergeDlg()
         delete pData;
     }
     delete pImpl;
+    m_pBeamerWin.clear();
+    m_pAllRB.clear();
+    m_pMarkedRB.clear();
+    m_pFromRB.clear();
+    m_pFromNF.clear();
+    m_pToNF.clear();
+    m_pPrinterRB.clear();
+    m_pMailingRB.clear();
+    m_pFileRB.clear();
+    m_pSingleJobsCB.clear();
+    m_pSaveMergedDocumentFT.clear();
+    m_pSaveSingleDocRB.clear();
+    m_pSaveIndividualRB.clear();
+    m_pGenerateFromDataBaseCB.clear();
+    m_pColumnFT.clear();
+    m_pColumnLB.clear();
+    m_pPathFT.clear();
+    m_pPathED.clear();
+    m_pPathPB.clear();
+    m_pFilterFT.clear();
+    m_pFilterLB.clear();
+    m_pAddressFldLB.clear();
+    m_pSubjectFT.clear();
+    m_pSubjectED.clear();
+    m_pFormatFT.clear();
+    m_pAttachFT.clear();
+    m_pAttachED.clear();
+    m_pAttachPB.clear();
+    m_pFormatHtmlCB.clear();
+    m_pFormatRtfCB.clear();
+    m_pFormatSwCB.clear();
+    m_pOkBTN.clear();
+    SvxStandardDialog::dispose();
 }
 
 void SwMailMergeDlg::Apply()
@@ -633,6 +671,17 @@ SwMailMergeCreateFromDlg::SwMailMergeCreateFromDlg(vcl::Window* pParent)
     get(m_pThisDocRB, "document");
 }
 
+SwMailMergeCreateFromDlg::~SwMailMergeCreateFromDlg()
+{
+    disposeOnce();
+}
+
+void SwMailMergeCreateFromDlg::dispose()
+{
+    m_pThisDocRB.clear();
+    ModalDialog::dispose();
+}
+
 SwMailMergeFieldConnectionsDlg::SwMailMergeFieldConnectionsDlg(vcl::Window* pParent)
     : ModalDialog(pParent, "MergeConnectDialog",
         "modules/swriter/ui/mergeconnectdialog.ui")
@@ -640,4 +689,15 @@ SwMailMergeFieldConnectionsDlg::SwMailMergeFieldConnectionsDlg(vcl::Window* pPar
     get(m_pUseExistingRB, "existing");
 }
 
+SwMailMergeFieldConnectionsDlg::~SwMailMergeFieldConnectionsDlg()
+{
+    disposeOnce();
+}
+
+void SwMailMergeFieldConnectionsDlg::dispose()
+{
+    m_pUseExistingRB.clear();
+    ModalDialog::dispose();
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */