4 files changed, 36 insertions, 0 deletions
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx
index c475a3c4be0e..dfd3a549afd6 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -81,7 +81,13 @@ CertificateChooser::CertificateChooser( vcl::Window* _pParent, uno::Reference< u
 
 CertificateChooser::~CertificateChooser()
 {
+    dispose();
+}
+
+void CertificateChooser::dispose()
+{
     delete m_pCertLB;
+    ModalDialog::dispose();
 }
 
 short CertificateChooser::Execute()
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index 309a29a6bbf2..4c67c84e6f9c 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -61,9 +61,15 @@ CertificateViewer::CertificateViewer(
 
 CertificateViewer::~CertificateViewer()
 {
+    dispose();
+}
+
+void CertificateViewer::dispose()
+{
     delete mpTabCtrl->GetTabPage(mnGeneralId);
     delete mpTabCtrl->GetTabPage(mnDetailsId);
     delete mpTabCtrl->GetTabPage(mnPathId);
+    TabDialog::dispose();
 }
 
 CertificateViewerTP::CertificateViewerTP( vcl::Window* _pParent, const OString& rID,
@@ -256,8 +262,14 @@ CertificateViewerDetailsTP::CertificateViewerDetailsTP( vcl::Window* _pParent, C
 
 CertificateViewerDetailsTP::~CertificateViewerDetailsTP()
 {
+    dispose();
+}
+
+void CertificateViewerDetailsTP::dispose()
+{
     Clear();
     delete m_pElementsLB;
+    CertificateViewerTP::dispose();
 }
 
 void CertificateViewerDetailsTP::ActivatePage()
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 6f5db4db79af..948655c0da23 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -235,7 +235,13 @@ DigitalSignaturesDialog::DigitalSignaturesDialog(
 
 DigitalSignaturesDialog::~DigitalSignaturesDialog()
 {
+    dispose();
+}
+
+void DigitalSignaturesDialog::dispose()
+{
     delete m_pSignaturesLB;
+    ModalDialog::dispose();
 }
 
 bool DigitalSignaturesDialog::Init()
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index e5246617540a..3fc606537eac 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -84,8 +84,14 @@ MacroSecurity::MacroSecurity( vcl::Window* _pParent,
 
 MacroSecurity::~MacroSecurity()
 {
+    dispose();
+}
+
+void MacroSecurity::dispose()
+{
     delete m_pTabCtrl->GetTabPage(m_nSecTrustId);
     delete m_pTabCtrl->GetTabPage(m_nSecLevelId);
+    TabDialog::dispose();
 }
 
 MacroSecurityTP::MacroSecurityTP(vcl::Window* _pParent, const OString& rID,
@@ -394,7 +400,13 @@ MacroSecurityTrustedSourcesTP::MacroSecurityTrustedSourcesTP(vcl::Window* _pPare
 
 MacroSecurityTrustedSourcesTP::~MacroSecurityTrustedSourcesTP()
 {
+    dispose();
+}
+
+void MacroSecurityTrustedSourcesTP::dispose()
+{
     delete m_pTrustCertLB;
+    MacroSecurityTP::dispose();
 }
 
 void MacroSecurityTrustedSourcesTP::ActivatePage()