diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-18 08:33:14 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 11:59:25 +0100 |
| commit | 0556598b35eb6d81fdaff04520f14202660f0333 (patch) | |
| tree | 2fb64309bbd8e519f25b1e55824bad5513754e91 /xmlsecurity | |
| parent | 7aa921cb53eedd0a107fbe9f75365adcce4d37d9 (diff) | |
vclwidget: check for calling delete on subclasses of vcl::Window
Change-Id: I7fb7cf919e3f46dd03a18b1cb95fa881915f9642
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/source/dialogs/certificateviewer.cxx | 6 | ||||
| -rw-r--r-- | xmlsecurity/source/dialogs/macrosecurity.cxx | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index 5ca843572da7..7a28f7bd52d3 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -66,9 +66,9 @@ CertificateViewer::~CertificateViewer() void CertificateViewer::dispose() { - delete mpTabCtrl->GetTabPage(mnGeneralId); - delete mpTabCtrl->GetTabPage(mnDetailsId); - delete mpTabCtrl->GetTabPage(mnPathId); + mpTabCtrl->GetTabPage(mnGeneralId)->disposeOnce(); + mpTabCtrl->GetTabPage(mnDetailsId)->disposeOnce(); + mpTabCtrl->GetTabPage(mnPathId)->disposeOnce(); mpTabCtrl.clear(); TabDialog::dispose(); } diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index 8924a49e562c..9bf3ce12a4cb 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -89,13 +89,13 @@ MacroSecurity::~MacroSecurity() void MacroSecurity::dispose() { - delete m_pTabCtrl->GetTabPage(m_nSecTrustId); - delete m_pTabCtrl->GetTabPage(m_nSecLevelId); + m_pTabCtrl->GetTabPage(m_nSecTrustId)->disposeOnce(); + m_pTabCtrl->GetTabPage(m_nSecLevelId)->disposeOnce(); m_pTabCtrl.clear(); m_pOkBtn.clear(); m_pResetBtn.clear(); - mpLevelTP.clear(); - mpTrustSrcTP.clear(); + mpLevelTP.disposeAndClear(); + mpTrustSrcTP.disposeAndClear(); TabDialog::dispose(); } |