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

7 files changed, 11 insertions, 11 deletions

diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
index f93712e744eb..56db76bd1b64 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
@@ -52,7 +52,7 @@ DependencyDialog::DependencyDialog(
 
 DependencyDialog::~DependencyDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void DependencyDialog::dispose()
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index e450383be3ea..ad92ddd86b14 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -203,7 +203,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeExtBoxWithBtns(vcl::Wi
 
 ExtBoxWithBtns_Impl::~ExtBoxWithBtns_Impl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ExtBoxWithBtns_Impl::dispose()
@@ -724,7 +724,7 @@ ExtMgrDialog::ExtMgrDialog(vcl::Window *pParent, TheExtensionManager *pManager)
 
 ExtMgrDialog::~ExtMgrDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ExtMgrDialog::dispose()
@@ -1222,7 +1222,7 @@ UpdateRequiredDialog::UpdateRequiredDialog(vcl::Window *pParent, TheExtensionMan
 
 UpdateRequiredDialog::~UpdateRequiredDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void UpdateRequiredDialog::dispose()
@@ -1610,7 +1610,7 @@ ShowLicenseDialog::ShowLicenseDialog( vcl::Window * pParent,
 
 ShowLicenseDialog::~ShowLicenseDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ShowLicenseDialog::dispose()
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 0432d5d14867..6eef818cdece 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -239,7 +239,7 @@ void ExtensionBox_Impl::Init()
 
 ExtensionBox_Impl::~ExtensionBox_Impl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ExtensionBox_Impl::dispose()
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 01af7a6dd309..a7372e268be6 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -564,7 +564,7 @@ UpdateDialog::UpdateDialog(
 
 UpdateDialog::~UpdateDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void UpdateDialog::dispose()
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 5c8ab0caf4e3..583e60993211 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -239,7 +239,7 @@ UpdateInstallDialog::UpdateInstallDialog(
 
 UpdateInstallDialog::~UpdateInstallDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void UpdateInstallDialog::dispose()
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index 840b90baad88..c9714195a864 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -99,7 +99,7 @@ struct LicenseDialogImpl : public ModalDialog
         css::uno::Reference< css::uno::XComponentContext > const & xContext,
         const OUString & sExtensionName,
         const OUString & sLicenseText);
-    virtual ~LicenseDialogImpl() { dispose(); }
+    virtual ~LicenseDialogImpl() { disposeOnce(); }
     virtual void dispose() SAL_OVERRIDE;
 
     virtual void Activate() SAL_OVERRIDE;
@@ -138,7 +138,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLicenseView(vcl::Windo
 
 LicenseView::~LicenseView()
 {
-    dispose();
+    disposeOnce();
 }
 
 void LicenseView::dispose()
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index a9460132562a..d0eba20cd0e5 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -155,7 +155,7 @@ SplashScreen::SplashScreen()
 
 SplashScreen::~SplashScreen()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SplashScreen::dispose()