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

13 files changed, 16 insertions, 16 deletions

diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index 13bc3e733168..5eaf63a98ddb 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -147,7 +147,7 @@ SwInsertBookmarkDlg::SwInsertBookmarkDlg( vcl::Window *pParent, SwWrtShell &rS,
 
 SwInsertBookmarkDlg::~SwInsertBookmarkDlg()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwInsertBookmarkDlg::dispose()
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 49bd6c9e0624..73fb01038128 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -119,7 +119,7 @@ SwEndNoteOptionPage::SwEndNoteOptionPage(vcl::Window *pParent, bool bEN,
 
 SwEndNoteOptionPage::~SwEndNoteOptionPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwEndNoteOptionPage::dispose()
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index 26b2b9407202..d5baec16a62d 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -112,7 +112,7 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(vcl::Window * pParent,
 
 SwGlossaryGroupDlg::~SwGlossaryGroupDlg()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwGlossaryGroupDlg::dispose()
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 42f0b992a54c..bcc826ec51fa 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -160,7 +160,7 @@ SwNewGlosNameDlg::SwNewGlosNameDlg(vcl::Window* pParent,
 
 SwNewGlosNameDlg::~SwNewGlosNameDlg()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwNewGlosNameDlg::dispose()
@@ -249,7 +249,7 @@ SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame* pViewFrame,
 
 SwGlossaryDlg::~SwGlossaryDlg()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwGlossaryDlg::dispose()
diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx
index 023db178128d..0824f3de8fd3 100644
--- a/sw/source/ui/misc/insfnote.cxx
+++ b/sw/source/ui/misc/insfnote.cxx
@@ -204,7 +204,7 @@ SwInsFootNoteDlg::SwInsFootNoteDlg(vcl::Window *pParent, SwWrtShell &rShell, boo
 
 SwInsFootNoteDlg::~SwInsFootNoteDlg()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwInsFootNoteDlg::dispose()
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index ee634066417d..b14903c9e170 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -169,7 +169,7 @@ SwLineNumberingDlg::SwLineNumberingDlg(SwView *pVw)
 
 SwLineNumberingDlg::~SwLineNumberingDlg()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwLineNumberingDlg::dispose()
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 69d7d24f605e..5fd96981c7b8 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -163,7 +163,7 @@ SwNumPositionTabPage::SwNumPositionTabPage(vcl::Window* pParent,
 
 SwNumPositionTabPage::~SwNumPositionTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwNumPositionTabPage::dispose()
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index c4216d09eab1..9d6d290341e6 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -79,7 +79,7 @@ public:
 
 SwNumNamesDlg::~SwNumNamesDlg()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwNumNamesDlg::dispose()
@@ -209,7 +209,7 @@ SwOutlineTabDialog::SwOutlineTabDialog(vcl::Window* pParent, const SfxItemSet* p
 
 SwOutlineTabDialog::~SwOutlineTabDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwOutlineTabDialog::dispose()
@@ -762,7 +762,7 @@ IMPL_LINK_NOARG(SwOutlineSettingsTabPage, CharFmtHdl)
 
 SwOutlineSettingsTabPage::~SwOutlineSettingsTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwOutlineSettingsTabPage::dispose()
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index cd75060e3e82..8f1551cecc7e 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -135,7 +135,7 @@ SwFootNotePage::SwFootNotePage(vcl::Window *pParent, const SfxItemSet &rSet)
 
 SwFootNotePage::~SwFootNotePage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwFootNotePage::dispose()
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index 0ff7f97a51ac..df7cbcd2a4ed 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -151,7 +151,7 @@ SwTextGridPage::SwTextGridPage(vcl::Window *pParent, const SfxItemSet &rSet) :
 
 SwTextGridPage::~SwTextGridPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwTextGridPage::dispose()
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index 1b947836bced..03789e013085 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -250,7 +250,7 @@ SwSortDlg::SwSortDlg(vcl::Window* pParent, SwWrtShell &rShell)
 
 SwSortDlg::~SwSortDlg()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwSortDlg::dispose()
diff --git a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
index cb8a89e92eba..252e264f4b58 100644
--- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
+++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
@@ -55,7 +55,7 @@ SwModalRedlineAcceptDlg::SwModalRedlineAcceptDlg(vcl::Window *pParent)
 
 SwModalRedlineAcceptDlg::~SwModalRedlineAcceptDlg()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwModalRedlineAcceptDlg::dispose()
diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx
index da0a0d42e712..5f888f3f7497 100644
--- a/sw/source/ui/misc/titlepage.cxx
+++ b/sw/source/ui/misc/titlepage.cxx
@@ -270,7 +270,7 @@ IMPL_LINK_NOARG(SwTitlePageDlg, StartPageHdl)
 
 SwTitlePageDlg::~SwTitlePageDlg()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwTitlePageDlg::dispose()