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

8 files changed, 12 insertions, 12 deletions

diff --git a/sw/source/ui/table/colwd.cxx b/sw/source/ui/table/colwd.cxx
index b7a212bf6891..50ffa471b6f3 100644
--- a/sw/source/ui/table/colwd.cxx
+++ b/sw/source/ui/table/colwd.cxx
@@ -68,7 +68,7 @@ SwTableWidthDlg::SwTableWidthDlg(vcl::Window *pParent, SwTableFUNC &rTableFnc )
 
 SwTableWidthDlg::~SwTableWidthDlg()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwTableWidthDlg::dispose()
diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx
index 907b6cdc8d39..63fb7aa83277 100644
--- a/sw/source/ui/table/convert.cxx
+++ b/sw/source/ui/table/convert.cxx
@@ -174,7 +174,7 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable )
 
 SwConvertTableDlg:: ~SwConvertTableDlg()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwConvertTableDlg::dispose()
diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx
index d4f9d3a23dfb..e67319432c11 100644
--- a/sw/source/ui/table/instable.cxx
+++ b/sw/source/ui/table/instable.cxx
@@ -137,7 +137,7 @@ IMPL_LINK_NOARG(SwInsTableDlg, OKHdl)
 
 SwInsTableDlg::~SwInsTableDlg()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwInsTableDlg::dispose()
diff --git a/sw/source/ui/table/mergetbl.cxx b/sw/source/ui/table/mergetbl.cxx
index 6e687b7658ce..1206a8b04842 100644
--- a/sw/source/ui/table/mergetbl.cxx
+++ b/sw/source/ui/table/mergetbl.cxx
@@ -30,7 +30,7 @@ SwMergeTblDlg::SwMergeTblDlg( vcl::Window *pParent, bool& rWithPrev )
 
 SwMergeTblDlg::~SwMergeTblDlg()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwMergeTblDlg::dispose()
diff --git a/sw/source/ui/table/rowht.cxx b/sw/source/ui/table/rowht.cxx
index 70cc897d4280..6c8bdb49b0c0 100644
--- a/sw/source/ui/table/rowht.cxx
+++ b/sw/source/ui/table/rowht.cxx
@@ -77,7 +77,7 @@ SwTableHeightDlg::SwTableHeightDlg(vcl::Window *pParent, SwWrtShell &rS)
 
 SwTableHeightDlg::~SwTableHeightDlg()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwTableHeightDlg::dispose()
diff --git a/sw/source/ui/table/splittbl.cxx b/sw/source/ui/table/splittbl.cxx
index 7fab28173baf..c1d00489c519 100644
--- a/sw/source/ui/table/splittbl.cxx
+++ b/sw/source/ui/table/splittbl.cxx
@@ -35,7 +35,7 @@ SwSplitTblDlg::SwSplitTblDlg( vcl::Window *pParent, SwWrtShell &rSh )
 
 SwSplitTblDlg::~SwSplitTblDlg()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwSplitTblDlg::dispose()
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index b3d529ce14a8..23103b1b195f 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -107,7 +107,7 @@ SwFormatTablePage::SwFormatTablePage(vcl::Window* pParent, const SfxItemSet& rSe
 
 SwFormatTablePage::~SwFormatTablePage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwFormatTablePage::dispose()
@@ -777,7 +777,7 @@ SwTableColumnPage::SwTableColumnPage(vcl::Window* pParent, const SfxItemSet& rSe
 
 SwTableColumnPage::~SwTableColumnPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwTableColumnPage::dispose()
@@ -1352,7 +1352,7 @@ SwTextFlowPage::SwTextFlowPage(vcl::Window* pParent, const SfxItemSet& rSet)
 
 SwTextFlowPage::~SwTextFlowPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwTextFlowPage::dispose()
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index 7ddf9351d0d7..49f7f58c2b6a 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -132,7 +132,7 @@ OUString SwStringInputDlg::GetInputString() const
 
 SwStringInputDlg::~SwStringInputDlg()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwStringInputDlg::dispose()
@@ -183,7 +183,7 @@ SwAutoFormatDlg::SwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pWrtShell,
 
 SwAutoFormatDlg::~SwAutoFormatDlg()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwAutoFormatDlg::dispose()
@@ -565,7 +565,7 @@ void AutoFmtPreview::DetectRTL(SwWrtShell* pWrtShell)
 
 AutoFmtPreview::~AutoFmtPreview()
 {
-    dispose();
+    disposeOnce();
 }
 
 void AutoFmtPreview::dispose()