From d7a84ce8406096b455d81f50cd50ca2e877adc06 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Tue, 10 Mar 2015 09:07:06 +0200
Subject: 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
---
 sw/source/ui/fldui/DropDownFieldDialog.cxx | 2 +-
 sw/source/ui/fldui/changedb.cxx            | 2 +-
 sw/source/ui/fldui/flddb.cxx               | 2 +-
 sw/source/ui/fldui/flddinf.cxx             | 2 +-
 sw/source/ui/fldui/flddok.cxx              | 2 +-
 sw/source/ui/fldui/fldedt.cxx              | 2 +-
 sw/source/ui/fldui/fldfunc.cxx             | 2 +-
 sw/source/ui/fldui/fldref.cxx              | 2 +-
 sw/source/ui/fldui/fldvar.cxx              | 2 +-
 sw/source/ui/fldui/inpdlg.cxx              | 2 +-
 sw/source/ui/fldui/javaedit.cxx            | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'sw/source/ui/fldui')

diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx
index 13453cadb517..12ebb825233a 100644
--- a/sw/source/ui/fldui/DropDownFieldDialog.cxx
+++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx
@@ -73,7 +73,7 @@ sw::DropDownFieldDialog::DropDownFieldDialog(vcl::Window *pParent, SwWrtShell &r
 
 sw::DropDownFieldDialog::~DropDownFieldDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void sw::DropDownFieldDialog::dispose()
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index 224f56b9184e..b94c049dd59f 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -164,7 +164,7 @@ SvTreeListEntry* SwChangeDBDlg::Insert(const OUString& rDBName)
 // destroy dialog
 SwChangeDBDlg::~SwChangeDBDlg()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwChangeDBDlg::dispose()
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index 5faa704ee43c..a05a7f23f7bc 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -74,7 +74,7 @@ SwFldDBPage::SwFldDBPage(vcl::Window* pParent, const SfxItemSet& rCoreSet)
 
 SwFldDBPage::~SwFldDBPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwFldDBPage::dispose()
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index 58a9fd04a051..d5d41f3c9496 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -89,7 +89,7 @@ SwFldDokInfPage::SwFldDokInfPage(vcl::Window* pParent, const SfxItemSet& rCoreSe
 
 SwFldDokInfPage::~SwFldDokInfPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwFldDokInfPage::dispose()
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index 18df09e769c6..274414181dab 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -80,7 +80,7 @@ SwFldDokPage::SwFldDokPage(vcl::Window* pParent, const SfxItemSet& rCoreSet )
 
 SwFldDokPage::~SwFldDokPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwFldDokPage::dispose()
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index f936b66cff47..2bcc08d16209 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -214,7 +214,7 @@ SfxTabPage* SwFldEditDlg::CreatePage(sal_uInt16 nGroup)
 
 SwFldEditDlg::~SwFldEditDlg()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwFldEditDlg::dispose()
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 944512b429d8..07d0fdda56eb 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -91,7 +91,7 @@ SwFldFuncPage::SwFldFuncPage(vcl::Window* pParent, const SfxItemSet& rCoreSet)
 
 SwFldFuncPage::~SwFldFuncPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwFldFuncPage::dispose()
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 4bb357ea51f0..527e44c0bd74 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -107,7 +107,7 @@ SwFldRefPage::SwFldRefPage(vcl::Window* pParent, const SfxItemSet& rCoreSet )
 
 SwFldRefPage::~SwFldRefPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwFldRefPage::dispose()
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 9452d9847eac..1163e0ac5b43 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -87,7 +87,7 @@ SwFldVarPage::SwFldVarPage(vcl::Window* pParent, const SfxItemSet& rCoreSet )
 
 SwFldVarPage::~SwFldVarPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwFldVarPage::dispose()
diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx
index 38226fa20b53..1da4ca51f107 100644
--- a/sw/source/ui/fldui/inpdlg.cxx
+++ b/sw/source/ui/fldui/inpdlg.cxx
@@ -108,7 +108,7 @@ SwFldInputDlg::SwFldInputDlg( vcl::Window *pParent, SwWrtShell &rS,
 
 SwFldInputDlg::~SwFldInputDlg()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwFldInputDlg::dispose()
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index a265ff895ddf..7df369a9526c 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -88,7 +88,7 @@ SwJavaEditDialog::SwJavaEditDialog(vcl::Window* pParent, SwWrtShell* pWrtSh) :
 
 SwJavaEditDialog::~SwJavaEditDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SwJavaEditDialog::dispose()
-- 
cgit