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

48 files changed, 65 insertions, 59 deletions

diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index d8c184973bb1..62a4bddeea3f 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -101,7 +101,7 @@ namespace
     public:
         // parent window, Query text, initial value
         QueryString(vcl::Window*, OUString &, OUString &);
-        virtual ~QueryString() { dispose(); }
+        virtual ~QueryString() { disposeOnce(); }
         virtual void dispose() SAL_OVERRIDE
         {
             m_pOKButton.clear();
diff --git a/vcl/generic/print/prtsetup.cxx b/vcl/generic/print/prtsetup.cxx
index a67c9de91ed2..1603b8e4c1c5 100644
--- a/vcl/generic/print/prtsetup.cxx
+++ b/vcl/generic/print/prtsetup.cxx
@@ -93,7 +93,7 @@ RTSDialog::RTSDialog(const PrinterInfo& rJobData, vcl::Window* pParent)
 
 RTSDialog::~RTSDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void RTSDialog::dispose()
@@ -196,7 +196,7 @@ RTSPaperPage::RTSPaperPage(RTSDialog* pParent)
 
 RTSPaperPage::~RTSPaperPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void RTSPaperPage::dispose()
@@ -378,7 +378,7 @@ RTSDevicePage::RTSDevicePage( RTSDialog* pParent )
 
 RTSDevicePage::~RTSDevicePage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void RTSDevicePage::dispose()
diff --git a/vcl/qa/cppunit/lifecycle.cxx b/vcl/qa/cppunit/lifecycle.cxx
index 2a46022eb569..d73dcc8e16b4 100644
--- a/vcl/qa/cppunit/lifecycle.cxx
+++ b/vcl/qa/cppunit/lifecycle.cxx
@@ -102,7 +102,7 @@ public:
     DisposableChild(vcl::Window *pParent) : vcl::Window(pParent) {}
     virtual ~DisposableChild()
     {
-        dispose();
+        disposeOnce();
     }
 };
 
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index 859f0c876950..50151aca4865 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -290,7 +290,7 @@ HelpTextWindow::HelpTextWindow( vcl::Window* pParent, const OUString& rText, sal
 
 HelpTextWindow::~HelpTextWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void HelpTextWindow::dispose()
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index fb1a4a88bcdf..7bcea274c659 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -95,7 +95,7 @@ Button::Button( WindowType nType ) :
 
 Button::~Button()
 {
-    dispose();
+    disposeOnce();
 }
 
 void Button::dispose()
@@ -2309,7 +2309,7 @@ void RadioButton::ImplLoadRes( const ResId& rResId )
 
 RadioButton::~RadioButton()
 {
-    dispose();
+    disposeOnce();
 }
 
 void RadioButton::dispose()
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 969cadc9007e..c5ef3eb50b9f 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -68,7 +68,7 @@ ComboBox::ComboBox( vcl::Window* pParent, const ResId& rResId ) :
 
 ComboBox::~ComboBox()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ComboBox::dispose()
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 264a54668843..85ca49501f24 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -67,7 +67,7 @@ Control::Control( vcl::Window* pParent, const ResId& rResId ) :
 
 Control::~Control()
 {
-   dispose();
+    disposeOnce();
 }
 
 void Control::dispose()
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 8fe828e415cd..63511fd855a4 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -239,7 +239,7 @@ bool Edit::set_property(const OString &rKey, const OString &rValue)
 
 Edit::~Edit()
 {
-    dispose();
+    disposeOnce();
 }
 
 void Edit::dispose()
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 52b8bdac4ea9..69922de6df07 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -460,7 +460,7 @@ void FixedText::set_mnemonic_widget(vcl::Window *pWindow)
 
 FixedText::~FixedText()
 {
-    dispose();
+    disposeOnce();
 }
 
 void FixedText::dispose()
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index fce7d3fc6e17..d6fde49a34f5 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -536,7 +536,7 @@ ImplListBoxWindow::ImplListBoxWindow( vcl::Window* pParent, WinBits nWinStyle )
 
 ImplListBoxWindow::~ImplListBoxWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ImplListBoxWindow::dispose()
@@ -2169,7 +2169,7 @@ ImplListBox::ImplListBox( vcl::Window* pParent, WinBits nWinStyle ) :
 
 ImplListBox::~ImplListBox()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ImplListBox::dispose()
@@ -2933,7 +2933,7 @@ ImplListBoxFloatingWindow::ImplListBoxFloatingWindow( vcl::Window* pParent ) :
 
 ImplListBoxFloatingWindow::~ImplListBoxFloatingWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ImplListBoxFloatingWindow::dispose()
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 1e50eee4dfe8..00eba39e52d6 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -70,7 +70,7 @@ ListBox::ListBox( vcl::Window* pParent, const ResId& rResId ) :
 
 ListBox::~ListBox()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ListBox::dispose()
diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx
index f38886726927..314c41ab7f9f 100644
--- a/vcl/source/control/menubtn.cxx
+++ b/vcl/source/control/menubtn.cxx
@@ -82,7 +82,7 @@ MenuButton::MenuButton( vcl::Window* pParent, WinBits nWinBits )
 
 MenuButton::~MenuButton()
 {
-    dispose();
+    disposeOnce();
 }
 
 void MenuButton::dispose()
diff --git a/vcl/source/control/morebtn.cxx b/vcl/source/control/morebtn.cxx
index eb28f3a7088e..aa542ca932d9 100644
--- a/vcl/source/control/morebtn.cxx
+++ b/vcl/source/control/morebtn.cxx
@@ -80,7 +80,7 @@ MoreButton::MoreButton( vcl::Window* pParent, WinBits nStyle ) :
 
 MoreButton::~MoreButton()
 {
-    dispose();
+    disposeOnce();
 }
 
 void MoreButton::dispose()
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index ddefa9a7dc26..0db5ffbc9676 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -125,7 +125,7 @@ ScrollBar::ScrollBar( vcl::Window* pParent, WinBits nStyle ) :
 
 ScrollBar::~ScrollBar()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ScrollBar::dispose()
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index 4fcd128012e0..03af006bcc89 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -359,7 +359,7 @@ SpinField::SpinField( vcl::Window* pParent, const ResId& rResId ) :
 
 SpinField::~SpinField()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SpinField::dispose()
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index ecb2c6022496..961dd919f760 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -192,7 +192,7 @@ TabControl::TabControl( vcl::Window* pParent, WinBits nStyle ) :
 
 TabControl::~TabControl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void TabControl::dispose()
diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx
index e91f24bc6c7a..eedadc4e5637 100644
--- a/vcl/source/control/throbber.cxx
+++ b/vcl/source/control/throbber.cxx
@@ -59,7 +59,7 @@ Throbber::Throbber( vcl::Window* i_parentWindow, WinBits i_style, const ImageSet
 
 Throbber::~Throbber()
 {
-    dispose();
+    disposeOnce();
 }
 
 void Throbber::dispose()
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index 30213f56cf80..f11e40495751 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -724,7 +724,7 @@ TextWindow::TextWindow( vcl::Window* pParent ) : Window( pParent )
 
 TextWindow::~TextWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void TextWindow::dispose()
@@ -937,7 +937,7 @@ VclMultiLineEdit::VclMultiLineEdit( vcl::Window* pParent, WinBits nWinStyle )
 
 VclMultiLineEdit::~VclMultiLineEdit()
 {
-    dispose();
+    disposeOnce();
 }
 
 void VclMultiLineEdit::dispose()
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index a023af642fa6..127ece3a8f4f 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -1846,7 +1846,7 @@ ImplBorderWindow::ImplBorderWindow( vcl::Window* pParent, WinBits nStyle ,
 
 ImplBorderWindow::~ImplBorderWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ImplBorderWindow::dispose()
diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx
index cc3c69e32a07..37a4b3a5a856 100644
--- a/vcl/source/window/btndlg.cxx
+++ b/vcl/source/window/btndlg.cxx
@@ -59,7 +59,7 @@ ButtonDialog::ButtonDialog( vcl::Window* pParent, WinBits nStyle ) :
 
 ButtonDialog::~ButtonDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ButtonDialog::dispose()
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 6c8641948e5d..1ade01e83e01 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -544,7 +544,7 @@ void Dialog::settingOptimalLayoutSize(Window *pBox)
 
 Dialog::~Dialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void Dialog::dispose()
diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx
index 1aad1dc73574..43ce7bdb3c4d 100644
--- a/vcl/source/window/dockingarea.cxx
+++ b/vcl/source/window/dockingarea.cxx
@@ -92,7 +92,7 @@ DockingAreaWindow::DockingAreaWindow( vcl::Window* pParent ) :
 
 DockingAreaWindow::~DockingAreaWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void DockingAreaWindow::dispose()
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index ab5b04de0ab2..2010fd9e0e9f 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -98,7 +98,7 @@ ImplDockFloatWin2::ImplDockFloatWin2( vcl::Window* pParent, WinBits nWinBits,
 
 ImplDockFloatWin2::~ImplDockFloatWin2()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ImplDockFloatWin2::dispose()
@@ -521,7 +521,7 @@ ImplPopupFloatWin::ImplPopupFloatWin( vcl::Window* pParent, ImplDockingWindowWra
 
 ImplPopupFloatWin::~ImplPopupFloatWin()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ImplPopupFloatWin::dispose()
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 853e759f81d2..6ceafc25b9c8 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -112,7 +112,7 @@ ImplDockFloatWin::ImplDockFloatWin( vcl::Window* pParent, WinBits nWinBits,
 
 ImplDockFloatWin::~ImplDockFloatWin()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ImplDockFloatWin::dispose()
@@ -471,7 +471,7 @@ DockingWindow::DockingWindow(vcl::Window* pParent, const OString& rID,
 
 DockingWindow::~DockingWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void DockingWindow::dispose()
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 7102b602633c..3b41ab0d4b53 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -185,7 +185,7 @@ void FloatingWindow::doDeferredInit(WinBits nBits)
 
 FloatingWindow::~FloatingWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void FloatingWindow::dispose()
diff --git a/vcl/source/window/introwin.cxx b/vcl/source/window/introwin.cxx
index 709f97696992..3dae19c4ac93 100644
--- a/vcl/source/window/introwin.cxx
+++ b/vcl/source/window/introwin.cxx
@@ -40,7 +40,7 @@ IntroWindow::IntroWindow( ) :
 
 IntroWindow::~IntroWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void IntroWindow::dispose()
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index e763b776d3b2..d0933b12aaf3 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1288,7 +1288,7 @@ void VclBin::setAllocation(const Size &rAllocation)
 
 VclFrame::~VclFrame()
 {
-    dispose();
+    disposeOnce();
 }
 
 void VclFrame::dispose()
@@ -2041,7 +2041,7 @@ void MessageDialog::dispose()
 
 MessageDialog::~MessageDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void MessageDialog::response(short nResponseId)
diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx
index ac2170b8cc87..08b820cea241 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -165,7 +165,7 @@ MenuBarWindow::MenuBarWindow( vcl::Window* pParent ) :
 
 MenuBarWindow::~MenuBarWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void MenuBarWindow::dispose()
diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx
index 66297ea3f5c3..62c43e254b70 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -104,7 +104,7 @@ void MenuFloatingWindow::doShutdown()
 
 MenuFloatingWindow::~MenuFloatingWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void MenuFloatingWindow::dispose()
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 5527aa5edd0c..a96011be5cd9 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -151,7 +151,7 @@ MessBox::MessBox( vcl::Window* pParent, WinBits nStyle,
 
 MessBox::~MessBox()
 {
-    dispose();
+    disposeOnce();
 }
 
 void MessBox::dispose()
diff --git a/vcl/source/window/openglwin.cxx b/vcl/source/window/openglwin.cxx
index d026be2086f4..13cf52e7d000 100644
--- a/vcl/source/window/openglwin.cxx
+++ b/vcl/source/window/openglwin.cxx
@@ -41,7 +41,7 @@ OpenGLWindow::OpenGLWindow(vcl::Window* pParent):
 
 OpenGLWindow::~OpenGLWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void OpenGLWindow::dispose()
diff --git a/vcl/source/window/popupmenuwindow.cxx b/vcl/source/window/popupmenuwindow.cxx
index fec8ebca0385..2d9c52699054 100644
--- a/vcl/source/window/popupmenuwindow.cxx
+++ b/vcl/source/window/popupmenuwindow.cxx
@@ -46,7 +46,7 @@ PopupMenuFloatingWindow::PopupMenuFloatingWindow( vcl::Window* pParent, WinBits
 
 PopupMenuFloatingWindow::~PopupMenuFloatingWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void PopupMenuFloatingWindow::dispose()
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index bf4081aa2ae1..096f26fd3583 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -82,7 +82,7 @@ PrintDialog::PrintPreviewWindow::PrintPreviewWindow( vcl::Window* i_pParent )
 
 PrintDialog::PrintPreviewWindow::~PrintPreviewWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void PrintDialog::PrintPreviewWindow::dispose()
@@ -716,7 +716,7 @@ PrintDialog::PrintDialog( vcl::Window* i_pParent, const std::shared_ptr<PrinterC
 
 PrintDialog::~PrintDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void PrintDialog::dispose()
@@ -1916,7 +1916,7 @@ PrintProgressDialog::PrintProgressDialog(vcl::Window* i_pParent, int i_nMax)
 
 PrintProgressDialog::~PrintProgressDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void PrintProgressDialog::dispose()
diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx
index 7d4b2325ebe2..22f19a7c01c6 100644
--- a/vcl/source/window/scrwnd.cxx
+++ b/vcl/source/window/scrwnd.cxx
@@ -84,7 +84,7 @@ ImplWheelWindow::ImplWheelWindow( vcl::Window* pParent ) :
 
 ImplWheelWindow::~ImplWheelWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ImplWheelWindow::dispose()
diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx
index 8201ea14627b..70482c02a039 100644
--- a/vcl/source/window/split.cxx
+++ b/vcl/source/window/split.cxx
@@ -151,7 +151,7 @@ Splitter::Splitter( vcl::Window* pParent, WinBits nStyle ) :
 
 Splitter::~Splitter()
 {
-    dispose();
+    disposeOnce();
 }
 
 void Splitter::dispose()
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 0e43c0cbe2ef..4884a926254c 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -1347,7 +1347,7 @@ SplitWindow::SplitWindow( vcl::Window* pParent, WinBits nStyle ) :
 
 SplitWindow::~SplitWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SplitWindow::dispose()
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index 15db5b5e6909..95a6d4c20274 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -151,7 +151,7 @@ StatusBar::StatusBar( vcl::Window* pParent, WinBits nStyle ) :
 
 StatusBar::~StatusBar()
 {
-    dispose();
+    disposeOnce();
 }
 
 void StatusBar::dispose()
diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx
index 119bd1b0499e..618170994105 100644
--- a/vcl/source/window/syschild.cxx
+++ b/vcl/source/window/syschild.cxx
@@ -133,7 +133,7 @@ SystemChildWindow::SystemChildWindow( vcl::Window* pParent, WinBits nStyle, Syst
 
 SystemChildWindow::~SystemChildWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SystemChildWindow::dispose()
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index e13f1a2d5a67..9cb57f310b2e 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -106,7 +106,7 @@ void SystemWindow::loadUI(vcl::Window* pParent, const OString& rID, const OUStri
 
 SystemWindow::~SystemWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SystemWindow::dispose()
diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx
index 4f52d5c491ad..3f317677ea06 100644
--- a/vcl/source/window/tabdlg.cxx
+++ b/vcl/source/window/tabdlg.cxx
@@ -221,7 +221,7 @@ TabDialog::TabDialog( vcl::Window* pParent, const OUString& rID, const OUString&
 
 TabDialog::~TabDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void TabDialog::dispose()
diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx
index 995438ff86b4..964f96043d78 100644
--- a/vcl/source/window/tabpage.cxx
+++ b/vcl/source/window/tabpage.cxx
@@ -87,7 +87,7 @@ TabPage::TabPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXM
 
 TabPage::~TabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void TabPage::dispose()
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 678bd438f997..83d61cba80b6 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -1570,7 +1570,7 @@ ToolBox::ToolBox( vcl::Window* pParent, const ResId& rResId ) :
 
 ToolBox::~ToolBox()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ToolBox::dispose()
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index c2ac77f66d70..5f53a4d25326 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -137,6 +137,12 @@ bool Window::IsDisposed() const
     return !mpWindowImpl;
 }
 
+void Window::disposeOnce()
+{
+    if (!IsDisposed())
+        dispose();
+}
+
 void Window::dispose()
 {
     if (IsDisposed())
@@ -580,7 +586,7 @@ void Window::dispose()
 Window::~Window()
 {
     vcl::LazyDeletor<vcl::Window>::Undelete( this );
-    dispose();
+    disposeOnce();
 }
 
 } /* namespace vcl */
diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx
index d53718a448ca..cdd4be98f6cf 100644
--- a/vcl/source/window/wrkwin.cxx
+++ b/vcl/source/window/wrkwin.cxx
@@ -113,7 +113,7 @@ WorkWindow::WorkWindow( SystemParentData* pParent ) :
 
 WorkWindow::~WorkWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void WorkWindow::dispose()
diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx
index 3bac12e20d28..e05f29ca788a 100644
--- a/vcl/unx/generic/app/i18n_status.cxx
+++ b/vcl/unx/generic/app/i18n_status.cxx
@@ -124,7 +124,7 @@ XIMStatusWindow::XIMStatusWindow( bool bOn ) :
 
 XIMStatusWindow::~XIMStatusWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void XIMStatusWindow::dispose()
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index a38c01a7b029..533b07665b16 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -941,7 +941,7 @@ namespace
 
     RTSPWDialog::~RTSPWDialog()
     {
-        dispose();
+        disposeOnce();
     }
 
     void RTSPWDialog::dispose()
diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx
index 481818bfa034..8562feb214f6 100644
--- a/vcl/workben/icontest.cxx
+++ b/vcl/workben/icontest.cxx
@@ -74,7 +74,7 @@ public:
     VclPtr<FixedBitmap> mpFixedBitmap;
 
     MyWorkWindow( vcl::Window* pParent, WinBits nWinStyle );
-    virtual ~MyWorkWindow() { dispose(); }
+    virtual ~MyWorkWindow() { disposeOnce(); }
     virtual void dispose() SAL_OVERRIDE { mpFixedBitmap.clear(); WorkWindow::dispose(); }
     void LoadGraphic( const OUString& sImageFile );
 
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 33c4eff1fec6..18fb1c69d651 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -1384,7 +1384,7 @@ public:
     }
     virtual ~DemoWin()
     {
-        dispose();
+        disposeOnce();
     }
     virtual void dispose() SAL_OVERRIDE
     {