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

6 files changed, 22 insertions, 15 deletions

diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx
index efbd225715f8..b075e0d391d1 100644
--- a/starmath/inc/ElementsDockingWindow.hxx
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -109,6 +109,7 @@ class SmElementsControl : public Control
 public:
     SmElementsControl(vcl::Window *pParent);
     virtual ~SmElementsControl();
+    virtual void dispose() SAL_OVERRIDE;
 
     void setElementSetId(sal_uInt16 aSetId);
 
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx
index 0170bd744d0c..1797c9a57a23 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -238,7 +238,13 @@ SmElementsControl::SmElementsControl(vcl::Window *pParent)
 
 SmElementsControl::~SmElementsControl()
 {
+    disposeOnce();
+}
+
+void SmElementsControl::dispose()
+{
     mpDocShell->DoClose();
+    Control::dispose();
 }
 
 void SmElementsControl::setVerticalMode(bool bVerticalMode)
@@ -671,7 +677,7 @@ SmElementsDockingWindow::SmElementsDockingWindow(SfxBindings* pInputBindings, Sf
 
 SmElementsDockingWindow::~SmElementsDockingWindow ()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SmElementsDockingWindow::dispose()
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index f000e7826210..0bb93b4a2d52 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -179,7 +179,7 @@ SmPrintOptionsTabPage::SmPrintOptionsTabPage(vcl::Window *pParent, const SfxItem
 
 SmPrintOptionsTabPage::~SmPrintOptionsTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SmPrintOptionsTabPage::dispose()
@@ -387,7 +387,7 @@ SmFontDialog::SmFontDialog(vcl::Window * pParent, OutputDevice *pFntListDevice,
 
 SmFontDialog::~SmFontDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SmFontDialog::dispose()
@@ -477,7 +477,7 @@ SmFontSizeDialog::SmFontSizeDialog(vcl::Window * pParent)
 
 SmFontSizeDialog::~SmFontSizeDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SmFontSizeDialog::dispose()
@@ -591,7 +591,7 @@ SmFontTypeDialog::SmFontTypeDialog(vcl::Window * pParent, OutputDevice *pFntList
 
 SmFontTypeDialog::~SmFontTypeDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SmFontTypeDialog::dispose()
@@ -961,7 +961,7 @@ SmDistanceDialog::SmDistanceDialog(vcl::Window *pParent)
 
 SmDistanceDialog::~SmDistanceDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SmDistanceDialog::dispose()
@@ -1086,7 +1086,7 @@ SmAlignDialog::SmAlignDialog(vcl::Window * pParent)
 
 SmAlignDialog::~SmAlignDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SmAlignDialog::dispose()
@@ -1158,7 +1158,7 @@ SmShowSymbolSetWindow::SmShowSymbolSetWindow(vcl::Window *pParent, WinBits nStyl
 
 SmShowSymbolSetWindow::~SmShowSymbolSetWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SmShowSymbolSetWindow::dispose()
@@ -1306,7 +1306,7 @@ SmShowSymbolSet::SmShowSymbolSet(vcl::Window *pParent)
 
 SmShowSymbolSet::~SmShowSymbolSet()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SmShowSymbolSet::dispose()
@@ -1610,7 +1610,7 @@ SmSymbolDialog::SmSymbolDialog(vcl::Window *pParent, OutputDevice *pFntListDevic
 
 SmSymbolDialog::~SmSymbolDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SmSymbolDialog::dispose()
@@ -2172,7 +2172,7 @@ SmSymDefineDialog::SmSymDefineDialog(vcl::Window * pParent,
 
 SmSymDefineDialog::~SmSymDefineDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SmSymDefineDialog::dispose()
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 18f8696db25e..890c1b1c967f 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -123,7 +123,7 @@ SmEditWindow::SmEditWindow( SmCmdBoxWindow &rMyCmdBoxWin ) :
 
 SmEditWindow::~SmEditWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SmEditWindow::dispose()
diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx
index 7d14a1e0db2c..c716a12633a4 100644
--- a/starmath/source/toolbox.cxx
+++ b/starmath/source/toolbox.cxx
@@ -139,7 +139,7 @@ SmToolBoxWindow::SmToolBoxWindow(SfxBindings *pTmpBindings,
 
 SmToolBoxWindow::~SmToolBoxWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SmToolBoxWindow::dispose()
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index ee50e101fa07..2a5ec956f3f1 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -119,7 +119,7 @@ SmGraphicWindow::SmGraphicWindow(SmViewShell* pShell):
 
 SmGraphicWindow::~SmGraphicWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SmGraphicWindow::dispose()
@@ -728,7 +728,7 @@ SmCmdBoxWindow::SmCmdBoxWindow(SfxBindings *pBindings_, SfxChildWindow *pChildWi
 
 SmCmdBoxWindow::~SmCmdBoxWindow ()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SmCmdBoxWindow::dispose()