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, 7 insertions, 7 deletions

diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx
index 123d5867194b..886cab46c063 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -93,7 +93,7 @@ FuncPage::FuncPage(vcl::Window* pParent,const IFunctionManager* _pFunctionManage
 
 FuncPage::~FuncPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void FuncPage::dispose()
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index 7093e0f6fcff..c6747f9dfc94 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -44,7 +44,7 @@ ArgEdit::ArgEdit( vcl::Window* pParent, WinBits nBits )
 
 ArgEdit::~ArgEdit()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ArgEdit::dispose()
@@ -374,7 +374,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeEditBox(vcl::Window *p
 
 EditBox::~EditBox()
 {
-    dispose();
+    disposeOnce();
 }
 
 void EditBox::dispose()
@@ -498,7 +498,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeRefEdit(vcl::Window *p
 
 RefEdit::~RefEdit()
 {
-    dispose();
+    disposeOnce();
 }
 
 void RefEdit::dispose()
@@ -607,7 +607,7 @@ RefButton::RefButton( vcl::Window* _pParent, WinBits nStyle ) :
 
 RefButton::~RefButton()
 {
-    dispose();
+    disposeOnce();
 }
 
 void RefButton::dispose()
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index 45f540b5ba9a..539661b05b1c 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -221,7 +221,7 @@ void ParaWin::UpdateArgInput( sal_uInt16 nOffset, sal_uInt16 i )
 
 ParaWin::~ParaWin()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ParaWin::dispose()
diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx
index 55d851f2e406..eb39a60e55d6 100644
--- a/formula/source/ui/dlg/structpg.cxx
+++ b/formula/source/ui/dlg/structpg.cxx
@@ -105,7 +105,7 @@ StructPage::StructPage(vcl::Window* pParent):
 
 StructPage::~StructPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void StructPage::dispose()