vclwidget: only call dispose() once

by using a new utility method in vcl::Window
This means that we don't have to make all our dispose
methods safe to call more than once.

Change-Id: I2110c7de4a86c70fdc97dd8fd318c86b56865374

4 files changed, 11 insertions, 11 deletions

diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx
index 28050b6b5e44..1616b8196367 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -81,7 +81,7 @@ CertificateChooser::CertificateChooser( vcl::Window* _pParent, uno::Reference< u
 
 CertificateChooser::~CertificateChooser()
 {
-    dispose();
+    disposeOnce();
 }
 
 void CertificateChooser::dispose()
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index 5c77f69e2d1d..5ca843572da7 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -61,7 +61,7 @@ CertificateViewer::CertificateViewer(
 
 CertificateViewer::~CertificateViewer()
 {
-    dispose();
+    disposeOnce();
 }
 
 void CertificateViewer::dispose()
@@ -82,7 +82,7 @@ CertificateViewerTP::CertificateViewerTP( vcl::Window* _pParent, const OString&
 
 CertificateViewerTP::~CertificateViewerTP()
 {
-    dispose();
+    disposeOnce();
 }
 
 void CertificateViewerTP::dispose()
@@ -151,7 +151,7 @@ CertificateViewerGeneralTP::CertificateViewerGeneralTP( vcl::Window* _pParent, C
 
 CertificateViewerGeneralTP::~CertificateViewerGeneralTP()
 {
-    dispose();
+    disposeOnce();
 }
 
 void CertificateViewerGeneralTP::dispose()
@@ -293,7 +293,7 @@ CertificateViewerDetailsTP::CertificateViewerDetailsTP( vcl::Window* _pParent, C
 
 CertificateViewerDetailsTP::~CertificateViewerDetailsTP()
 {
-    dispose();
+    disposeOnce();
 }
 
 void CertificateViewerDetailsTP::dispose()
@@ -372,7 +372,7 @@ CertificateViewerCertPathTP::CertificateViewerCertPathTP( vcl::Window* _pParent,
 
 CertificateViewerCertPathTP::~CertificateViewerCertPathTP()
 {
-    dispose();
+    disposeOnce();
 }
 
 void CertificateViewerCertPathTP::dispose()
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 9cfde2bec778..444b69926bd8 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -235,7 +235,7 @@ DigitalSignaturesDialog::DigitalSignaturesDialog(
 
 DigitalSignaturesDialog::~DigitalSignaturesDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void DigitalSignaturesDialog::dispose()
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index 6ff60ac94dbd..8924a49e562c 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -84,7 +84,7 @@ MacroSecurity::MacroSecurity( vcl::Window* _pParent,
 
 MacroSecurity::~MacroSecurity()
 {
-    dispose();
+    disposeOnce();
 }
 
 void MacroSecurity::dispose()
@@ -108,7 +108,7 @@ MacroSecurityTP::MacroSecurityTP(vcl::Window* _pParent, const OString& rID,
 
 MacroSecurityTP::~MacroSecurityTP()
 {
-    dispose();
+    disposeOnce();
 }
 
 void MacroSecurityTP::dispose()
@@ -172,7 +172,7 @@ MacroSecurityLevelTP::MacroSecurityLevelTP(vcl::Window* _pParent, MacroSecurity*
 
 MacroSecurityLevelTP::~MacroSecurityLevelTP()
 {
-    dispose();
+    disposeOnce();
 }
 
 void MacroSecurityLevelTP::dispose()
@@ -430,7 +430,7 @@ MacroSecurityTrustedSourcesTP::MacroSecurityTrustedSourcesTP(vcl::Window* _pPare
 
 MacroSecurityTrustedSourcesTP::~MacroSecurityTrustedSourcesTP()
 {
-    dispose();
+    disposeOnce();
 }
 
 void MacroSecurityTrustedSourcesTP::dispose()