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

31 files changed, 47 insertions, 47 deletions

diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index d8137095b829..7ce171170875 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -144,7 +144,7 @@ OUString CertPathDialog::getDirectory() const
 
 CertPathDialog::~CertPathDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void CertPathDialog::dispose()
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index ecb996322bee..a8ae9c686c9d 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -327,7 +327,7 @@ namespace offapp
 
     ConnectionPoolOptionsPage::~ConnectionPoolOptionsPage()
     {
-        dispose();
+        disposeOnce();
     }
 
     void ConnectionPoolOptionsPage::dispose()
diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx
index a911a1eaceee..805c8da68f70 100644
--- a/cui/source/options/cuisrchdlg.cxx
+++ b/cui/source/options/cuisrchdlg.cxx
@@ -62,7 +62,7 @@ SvxJSearchOptionsDialog::SvxJSearchOptionsDialog(vcl::Window *pParent,
 
 SvxJSearchOptionsDialog::~SvxJSearchOptionsDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxJSearchOptionsDialog::dispose()
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index d9822ac51f10..e719b47ca093 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -163,7 +163,7 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( vcl::Window* pParent, cons
 
 DbRegistrationOptionsPage::~DbRegistrationOptionsPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void DbRegistrationOptionsPage::dispose()
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index 74e87425b1e5..7fbe47732ec7 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -72,7 +72,7 @@ namespace svx
 
     ODocumentLinkDialog::~ODocumentLinkDialog()
     {
-        dispose();
+        disposeOnce();
     }
 
     void ODocumentLinkDialog::dispose()
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index a19a8898e124..ae6a02c5fe54 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -138,7 +138,7 @@ SvTreeListEntry* SvxFontSubstTabPage::CreateEntry(OUString& rFont1, OUString& rF
 
 SvxFontSubstTabPage::~SvxFontSubstTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxFontSubstTabPage::dispose()
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index 02d818438286..2e8be40b8109 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -166,7 +166,7 @@ CuiAboutConfigTabPage::CuiAboutConfigTabPage( vcl::Window* pParent/*, const SfxI
 
 CuiAboutConfigTabPage::~CuiAboutConfigTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void CuiAboutConfigTabPage::dispose()
@@ -494,7 +494,7 @@ CuiAboutConfigValueDialog::CuiAboutConfigValueDialog( vcl::Window* pWindow,
 
 CuiAboutConfigValueDialog::~CuiAboutConfigValueDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void CuiAboutConfigValueDialog::dispose()
diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx
index 61354e138c6b..d6b78b86555c 100644
--- a/cui/source/options/optaccessibility.cxx
+++ b/cui/source/options/optaccessibility.cxx
@@ -58,7 +58,7 @@ SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage(vcl::Window* pPar
 
 SvxAccessibilityOptionsTabPage::~SvxAccessibilityOptionsTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxAccessibilityOptionsTabPage::dispose()
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 49b501572ce9..fb2dc014918a 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -151,7 +151,7 @@ SvxAsianLayoutPage::SvxAsianLayoutPage( vcl::Window* pParent, const SfxItemSet&
 
 SvxAsianLayoutPage::~SvxAsianLayoutPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxAsianLayoutPage::dispose()
diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx
index 1be35826d5d5..fdc362a0c14c 100644
--- a/cui/source/options/optbasic.cxx
+++ b/cui/source/options/optbasic.cxx
@@ -47,7 +47,7 @@ SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage( vcl::Window* pParent, const SfxI
 
 SvxBasicIDEOptionsPage::~SvxBasicIDEOptionsPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxBasicIDEOptionsPage::dispose()
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 7cb85b4fe9f1..9ca96f9b10a9 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -83,7 +83,7 @@ SvxDefaultColorOptPage::SvxDefaultColorOptPage(vcl::Window* pParent, const SfxIt
 
 SvxDefaultColorOptPage::~SvxDefaultColorOptPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxDefaultColorOptPage::dispose()
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 08d7d9059b61..bce0bfbb96ca 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -174,7 +174,7 @@ class ColorConfigWindow_Impl
 {
 public:
     ColorConfigWindow_Impl(vcl::Window* pParent);
-    virtual ~ColorConfigWindow_Impl() { dispose(); }
+    virtual ~ColorConfigWindow_Impl() { disposeOnce(); }
     virtual void dispose() SAL_OVERRIDE;
 
 public:
@@ -915,7 +915,7 @@ void ColorConfigCtrl_Impl::InitHeaderBar(const OUString &rOn, const OUString &rU
 
 ColorConfigCtrl_Impl::~ColorConfigCtrl_Impl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ColorConfigCtrl_Impl::dispose()
@@ -1067,7 +1067,7 @@ SvxColorOptionsTabPage::SvxColorOptionsTabPage(
 
 SvxColorOptionsTabPage::~SvxColorOptionsTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxColorOptionsTabPage::dispose()
diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index 40203d831f41..ab25dfd141e9 100644
--- a/cui/source/options/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -59,7 +59,7 @@ SvxCTLOptionsPage::SvxCTLOptionsPage( vcl::Window* pParent, const SfxItemSet& rS
 
 SvxCTLOptionsPage::~SvxCTLOptionsPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxCTLOptionsPage::dispose()
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index d48e9a5fa348..02390097a49a 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -119,7 +119,7 @@ SvxNewDictionaryDialog::SvxNewDictionaryDialog( vcl::Window* pParent,
 
 SvxNewDictionaryDialog::~SvxNewDictionaryDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxNewDictionaryDialog::dispose()
@@ -346,7 +346,7 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog(
 
 SvxEditDictionaryDialog::~SvxEditDictionaryDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxEditDictionaryDialog::dispose()
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 65953a886a0a..29b1eacfe9d3 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -56,7 +56,7 @@ OfaMSFilterTabPage::OfaMSFilterTabPage(vcl::Window* pParent, const SfxItemSet& r
 
 OfaMSFilterTabPage::~OfaMSFilterTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void OfaMSFilterTabPage::dispose()
@@ -178,7 +178,7 @@ OfaMSFilterTabPage2::OfaMSFilterTabPage2( vcl::Window* pParent, const SfxItemSet
 
 OfaMSFilterTabPage2::~OfaMSFilterTabPage2()
 {
-    dispose();
+    disposeOnce();
 }
 
 void OfaMSFilterTabPage2::dispose()
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index dabfc6b8fdb1..ceb7c2f35bda 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -309,7 +309,7 @@ OfaMiscTabPage::OfaMiscTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
 
 OfaMiscTabPage::~OfaMiscTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void OfaMiscTabPage::dispose()
@@ -703,7 +703,7 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
 
 OfaViewTabPage::~OfaViewTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void OfaViewTabPage::dispose()
@@ -1248,7 +1248,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(vcl::Window* pParent, const SfxItemSet&
 
 OfaLanguagesTabPage::~OfaLanguagesTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void OfaLanguagesTabPage::dispose()
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 9d6afd387479..5986df31380e 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -221,7 +221,7 @@ SvxGeneralTabPage::SvxGeneralTabPage(vcl::Window* pParent, const SfxItemSet& rCo
 
 SvxGeneralTabPage::~SvxGeneralTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxGeneralTabPage::dispose()
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index 34d7fff2d462..8860af692b7d 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -86,7 +86,7 @@ SfxTabPage( pParent, "OptHtmlPage" , "cui/ui/opthtmlpage.ui", &rSet )
 
 OfaHtmlTabPage::~OfaHtmlTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void OfaHtmlTabPage::dispose()
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 490b41c2ae4b..f92b13c3a105 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -217,7 +217,7 @@ SvxProxyTabPage::SvxProxyTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
 
 SvxProxyTabPage::~SvxProxyTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxProxyTabPage::dispose()
@@ -649,7 +649,7 @@ SvxSecurityTabPage::SvxSecurityTabPage(vcl::Window* pParent, const SfxItemSet& r
 
 SvxSecurityTabPage::~SvxSecurityTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxSecurityTabPage::dispose()
@@ -1011,7 +1011,7 @@ SvxEMailTabPage::SvxEMailTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
 
 SvxEMailTabPage::~SvxEMailTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxEMailTabPage::dispose()
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 7cd9977e3913..7a2334a5b8b9 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -202,7 +202,7 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( vcl::Window* pParent, const SfxItemSet&
 
 SvxJavaOptionsPage::~SvxJavaOptionsPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxJavaOptionsPage::dispose()
@@ -823,7 +823,7 @@ SvxJavaParameterDlg::SvxJavaParameterDlg( vcl::Window* pParent ) :
 
 SvxJavaParameterDlg::~SvxJavaParameterDlg()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxJavaParameterDlg::dispose()
@@ -962,7 +962,7 @@ SvxJavaClassPathDlg::SvxJavaClassPathDlg(vcl::Window* pParent)
 
 SvxJavaClassPathDlg::~SvxJavaClassPathDlg()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxJavaClassPathDlg::dispose()
diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx
index 263405d1322e..4b1696fbeb54 100644
--- a/cui/source/options/optjsearch.cxx
+++ b/cui/source/options/optjsearch.cxx
@@ -57,7 +57,7 @@ SvxJSearchOptionsPage::SvxJSearchOptionsPage( vcl::Window* pParent, const SfxIte
 
 SvxJSearchOptionsPage::~SvxJSearchOptionsPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxJSearchOptionsPage::dispose()
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 9c357e682d8d..53b3051bb07c 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -364,7 +364,7 @@ public:
             get(m_pBreakNF, "wordlength");
         }
     }
-    virtual ~OptionsBreakSet() { dispose(); }
+    virtual ~OptionsBreakSet() { disposeOnce(); }
     virtual void dispose() SAL_OVERRIDE
     {
         m_pBeforeFrame.clear();
@@ -1131,7 +1131,7 @@ SvxLinguTabPage::SvxLinguTabPage( vcl::Window* pParent, const SfxItemSet& rSet )
 
 SvxLinguTabPage::~SvxLinguTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxLinguTabPage::dispose()
@@ -1918,7 +1918,7 @@ SvxEditModulesDlg::SvxEditModulesDlg(vcl::Window* pParent, SvxLinguData_Impl& rD
 
 SvxEditModulesDlg::~SvxEditModulesDlg()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxEditModulesDlg::dispose()
diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index 79a86d9d6f69..0dc00ee33168 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -143,7 +143,7 @@ OfaMemoryOptionsPage::OfaMemoryOptionsPage(vcl::Window* pParent, const SfxItemSe
 
 OfaMemoryOptionsPage::~OfaMemoryOptionsPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void OfaMemoryOptionsPage::dispose()
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index bd8c7846002b..4454823969f7 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -119,7 +119,7 @@ void SvxOpenCLTabPage::dispose()
 
 SvxOpenCLTabPage::~SvxOpenCLTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxOpenCLTabPage::dispose()
@@ -232,7 +232,7 @@ public:
     DECL_LINK(EditModifiedHdl, Edit*);
 
     ListEntryDialog(vcl::Window* pParent, const OpenCLConfig::ImplMatcher& rEntry, const OString& rTag);
-    virtual ~ListEntryDialog() { dispose(); }
+    virtual ~ListEntryDialog() { disposeOnce(); }
     virtual void dispose() SAL_OVERRIDE
     {
         mpOS.clear();
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 39e94a02efe5..8b1e967136d4 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -247,7 +247,7 @@ SvxPathTabPage::SvxPathTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
 
 SvxPathTabPage::~SvxPathTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxPathTabPage::dispose()
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 8da1a6cbf11f..a8a9280b7dd3 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -199,7 +199,7 @@ SfxSaveTabPage::SfxSaveTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet
 
 SfxSaveTabPage::~SfxSaveTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxSaveTabPage::dispose()
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index 30eb7188e71f..536e444c85e5 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -84,7 +84,7 @@ SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage(vcl::Window* pParent, const SfxIt
 
 SvxOnlineUpdateTabPage::~SvxOnlineUpdateTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxOnlineUpdateTabPage::dispose()
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index e6d73e4dd044..a232cea5e516 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -94,7 +94,7 @@ SelectPersonaDialog::SelectPersonaDialog( vcl::Window *pParent )
 
 SelectPersonaDialog::~SelectPersonaDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SelectPersonaDialog::dispose()
@@ -312,7 +312,7 @@ SvxPersonalizationTabPage::SvxPersonalizationTabPage( vcl::Window *pParent, cons
 
 SvxPersonalizationTabPage::~SvxPersonalizationTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxPersonalizationTabPage::dispose()
diff --git a/cui/source/options/securityoptions.cxx b/cui/source/options/securityoptions.cxx
index 5071769e2c40..aea7fd280645 100644
--- a/cui/source/options/securityoptions.cxx
+++ b/cui/source/options/securityoptions.cxx
@@ -74,7 +74,7 @@ SecurityOptionsDialog::SecurityOptionsDialog(vcl::Window* pParent, SvtSecurityOp
 
 SecurityOptionsDialog::~SecurityOptionsDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SecurityOptionsDialog::dispose()
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index e45cbc823974..6262d24f2f9e 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -552,7 +552,7 @@ OfaTreeOptionsDialog::OfaTreeOptionsDialog( vcl::Window* pParent, const OUString
 
 OfaTreeOptionsDialog::~OfaTreeOptionsDialog()
 {
-   dispose();
+    disposeOnce();
 }
 
 void OfaTreeOptionsDialog::dispose()
@@ -2168,7 +2168,7 @@ ExtensionsTabPage::ExtensionsTabPage(
 
 ExtensionsTabPage::~ExtensionsTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ExtensionsTabPage::dispose()
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index d114fe9eace5..f6d6cd5e9e40 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -142,7 +142,7 @@ WebConnectionInfoDialog::WebConnectionInfoDialog(vcl::Window* pParent)
 
 WebConnectionInfoDialog::~WebConnectionInfoDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void WebConnectionInfoDialog::dispose()