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

15 files changed, 32 insertions, 32 deletions

diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx
index cbb50ba8cf21..615aed48c4aa 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -82,7 +82,7 @@ DocListenerBox::DocListenerBox( vcl::Window* pParent )
 
 DocListenerBox::~DocListenerBox()
 {
-    dispose();
+    disposeOnce();
 }
 
 void DocListenerBox::dispose()
@@ -156,7 +156,7 @@ LibBox::LibBox( vcl::Window* pParent, const uno::Reference< frame::XFrame >& rFr
 
 LibBox::~LibBox()
 {
-    dispose();
+    disposeOnce();
 }
 
 void LibBox::dispose()
@@ -386,7 +386,7 @@ LanguageBox::LanguageBox( vcl::Window* pParent ) :
 
 LanguageBox::~LanguageBox()
 {
-    dispose();
+    disposeOnce();
 }
 
 void LanguageBox::dispose()
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 33ddae459da9..152fe617b374 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -227,7 +227,7 @@ SbModuleRef ModulWindow::XModule()
 
 ModulWindow::~ModulWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ModulWindow::dispose()
@@ -1477,7 +1477,7 @@ ModulWindowLayout::ModulWindowLayout (vcl::Window* pParent, ObjectCatalog& rObje
 
 ModulWindowLayout::~ModulWindowLayout()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ModulWindowLayout::dispose()
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index f405491cce56..d943ceccfcf4 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -250,7 +250,7 @@ EditorWindow::EditorWindow (vcl::Window* pParent, ModulWindow* pModulWindow) :
 
 EditorWindow::~EditorWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void EditorWindow::dispose()
@@ -1674,7 +1674,7 @@ WatchWindow::WatchWindow (Layout* pParent) :
 
 WatchWindow::~WatchWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void WatchWindow::dispose()
@@ -1924,7 +1924,7 @@ StackWindow::StackWindow (Layout* pParent) :
 
 StackWindow::~StackWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void StackWindow::dispose()
@@ -2060,7 +2060,7 @@ ComplexEditorWindow::ComplexEditorWindow( ModulWindow* pParent ) :
 
 ComplexEditorWindow::~ComplexEditorWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ComplexEditorWindow::dispose()
@@ -2169,7 +2169,7 @@ WatchTreeListBox::WatchTreeListBox( vcl::Window* pParent, WinBits nWinBits )
 
 WatchTreeListBox::~WatchTreeListBox()
 {
-    dispose();
+    disposeOnce();
 }
 
 void WatchTreeListBox::dispose()
@@ -2687,7 +2687,7 @@ pCodeCompleteWindow( pPar )
 
 CodeCompleteListBox::~CodeCompleteListBox()
 {
-    dispose();
+    disposeOnce();
 }
 
 void CodeCompleteListBox::dispose()
@@ -2869,7 +2869,7 @@ pListBox( new CodeCompleteListBox(this) )
 
 CodeCompleteWindow::~CodeCompleteWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void CodeCompleteWindow::dispose()
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 4735f12e70e9..c6957e326ed9 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -1408,7 +1408,7 @@ DialogWindowLayout::DialogWindowLayout (vcl::Window* pParent, ObjectCatalog& rOb
 
 DialogWindowLayout::~DialogWindowLayout()
 {
-    dispose();
+    disposeOnce();
 }
 
 void DialogWindowLayout::dispose()
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index feb01c0066ef..79ebd6d8dacd 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -206,7 +206,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTreeListBox(vcl::Windo
 
 TreeListBox::~TreeListBox ()
 {
-    dispose();
+    disposeOnce();
 }
 
 void TreeListBox::dispose()
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 7e0bfeafe149..da7e39300659 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -55,7 +55,7 @@ BaseWindow::BaseWindow( vcl::Window* pParent, const ScriptDocument& rDocument, c
 
 BaseWindow::~BaseWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void BaseWindow::dispose()
@@ -283,7 +283,7 @@ DockingWindow::DockingWindow (Layout* pParent) :
 
 DockingWindow::~DockingWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void DockingWindow::dispose()
diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx
index 321f68bd9a9d..366cc7b2d839 100644
--- a/basctl/source/basicide/brkdlg.cxx
+++ b/basctl/source/basicide/brkdlg.cxx
@@ -108,7 +108,7 @@ BreakPointDialog::BreakPointDialog( vcl::Window* pParent, BreakPointList& rBrkPn
 
 BreakPointDialog::~BreakPointDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void BreakPointDialog::dispose()
diff --git a/basctl/source/basicide/layout.cxx b/basctl/source/basicide/layout.cxx
index 14a3b54af1a0..c475ab41e468 100644
--- a/basctl/source/basicide/layout.cxx
+++ b/basctl/source/basicide/layout.cxx
@@ -55,7 +55,7 @@ Layout::Layout (vcl::Window* pParent) :
 
 Layout::~Layout()
 {
-    dispose();
+    disposeOnce();
 }
 
 void Layout::dispose()
diff --git a/basctl/source/basicide/linenumberwindow.cxx b/basctl/source/basicide/linenumberwindow.cxx
index 97c1fd9e9b77..a2f01eea8795 100644
--- a/basctl/source/basicide/linenumberwindow.cxx
+++ b/basctl/source/basicide/linenumberwindow.cxx
@@ -27,7 +27,7 @@ LineNumberWindow::LineNumberWindow (vcl::Window* pParent, ModulWindow* pModulWin
 
 LineNumberWindow::~LineNumberWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void LineNumberWindow::dispose()
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 104d3650ac96..49b155aacc36 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -112,7 +112,7 @@ MacroChooser::MacroChooser( vcl::Window* pParnt, bool bCreateEntries )
 
 MacroChooser::~MacroChooser()
 {
-    dispose();
+    disposeOnce();
 }
 
 void MacroChooser::dispose()
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 9174328463cc..6309b88f79ab 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -161,7 +161,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeCheckBox(vcl::Window *
 
 CheckBox::~CheckBox()
 {
-    dispose();
+    disposeOnce();
 }
 
 void CheckBox::dispose()
@@ -394,7 +394,7 @@ NewObjectDialog::NewObjectDialog(vcl::Window * pParent, ObjectMode::Mode eMode,
 
 NewObjectDialog::~NewObjectDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void NewObjectDialog::dispose()
@@ -417,7 +417,7 @@ GotoLineDialog::GotoLineDialog(vcl::Window * pParent )
 
 GotoLineDialog::~GotoLineDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void GotoLineDialog::dispose()
@@ -463,7 +463,7 @@ ExportDialog::ExportDialog(vcl::Window * pParent)
 
 ExportDialog::~ExportDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ExportDialog::dispose()
@@ -520,7 +520,7 @@ LibPage::LibPage(vcl::Window * pParent)
 
 LibPage::~LibPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void LibPage::dispose()
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index d80dbc18ba98..43967f65e0e7 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -486,7 +486,7 @@ OrganizeDialog::OrganizeDialog(vcl::Window* pParent, sal_Int16 tabId,
 
 OrganizeDialog::~OrganizeDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void OrganizeDialog::dispose()
@@ -600,7 +600,7 @@ ObjectPage::ObjectPage(vcl::Window *pParent, const OString &rName, sal_uInt16 nM
 
 ObjectPage::~ObjectPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ObjectPage::dispose()
@@ -945,7 +945,7 @@ LibDialog::LibDialog( vcl::Window* pParent )
 
 LibDialog::~LibDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void LibDialog::dispose()
diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx
index 8c29c63aef01..e0dc7059d02f 100644
--- a/basctl/source/basicide/objdlg.cxx
+++ b/basctl/source/basicide/objdlg.cxx
@@ -69,7 +69,7 @@ ObjectCatalog::ObjectCatalog (vcl::Window* pParent) :
 
 ObjectCatalog::~ObjectCatalog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ObjectCatalog::dispose()
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index cb0ec81910fd..27be747ddf3a 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -75,7 +75,7 @@ ManageLanguageDialog::ManageLanguageDialog(vcl::Window* pParent, boost::shared_p
 
 ManageLanguageDialog::~ManageLanguageDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ManageLanguageDialog::dispose()
@@ -259,7 +259,7 @@ SetDefaultLanguageDialog::SetDefaultLanguageDialog(vcl::Window* pParent, boost::
 
 SetDefaultLanguageDialog::~SetDefaultLanguageDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SetDefaultLanguageDialog::dispose()
diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
index caf5caba3207..5f89f2627a40 100644
--- a/basctl/source/dlged/propbrw.cxx
+++ b/basctl/source/dlged/propbrw.cxx
@@ -190,7 +190,7 @@ void PropBrw::ImplReCreateController()
 
 PropBrw::~PropBrw()
 {
-    dispose();
+    disposeOnce();
 }
 
 void PropBrw::dispose()