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

40 files changed, 65 insertions, 65 deletions

diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index ecc5208f2fff..196962befa88 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -94,7 +94,7 @@ SvDDELinkEditDialog::SvDDELinkEditDialog( vcl::Window* pParent, SvBaseLink* pLin
 
 SvDDELinkEditDialog::~SvDDELinkEditDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvDDELinkEditDialog::dispose()
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 54330246c40b..321ef7f328de 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -303,7 +303,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeContentListBox(vcl::Wi
 
 ContentListBox_Impl::~ContentListBox_Impl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ContentListBox_Impl::dispose()
@@ -434,7 +434,7 @@ HelpTabPage_Impl::HelpTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Impl
 
 HelpTabPage_Impl::~HelpTabPage_Impl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void HelpTabPage_Impl::dispose()
@@ -456,7 +456,7 @@ ContentTabPage_Impl::ContentTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindo
 
 ContentTabPage_Impl::~ContentTabPage_Impl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ContentTabPage_Impl::dispose()
@@ -573,7 +573,7 @@ IndexTabPage_Impl::IndexTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Im
 
 IndexTabPage_Impl::~IndexTabPage_Impl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void IndexTabPage_Impl::dispose()
@@ -982,7 +982,7 @@ SearchTabPage_Impl::SearchTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_
 
 SearchTabPage_Impl::~SearchTabPage_Impl()
 {
-   dispose();
+    disposeOnce();
 }
 
 void SearchTabPage_Impl::dispose()
@@ -1190,7 +1190,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeBookmarksBox(vcl::Wind
 
 BookmarksBox_Impl::~BookmarksBox_Impl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void BookmarksBox_Impl::dispose()
@@ -1328,7 +1328,7 @@ BookmarksTabPage_Impl::BookmarksTabPage_Impl(vcl::Window* pParent, SfxHelpIndexW
 
 BookmarksTabPage_Impl::~BookmarksTabPage_Impl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void BookmarksTabPage_Impl::dispose()
@@ -1482,7 +1482,7 @@ SfxHelpIndexWindow_Impl::SfxHelpIndexWindow_Impl(SfxHelpWindow_Impl* _pParent)
 
 SfxHelpIndexWindow_Impl::~SfxHelpIndexWindow_Impl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxHelpIndexWindow_Impl::dispose()
@@ -1968,7 +1968,7 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) :
 
 SfxHelpTextWindow_Impl::~SfxHelpTextWindow_Impl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxHelpTextWindow_Impl::dispose()
@@ -3074,7 +3074,7 @@ SfxHelpWindow_Impl::SfxHelpWindow_Impl(
 
 SfxHelpWindow_Impl::~SfxHelpWindow_Impl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxHelpWindow_Impl::dispose()
@@ -3293,7 +3293,7 @@ SfxAddHelpBookmarkDialog_Impl::SfxAddHelpBookmarkDialog_Impl(vcl::Window* pParen
 
 SfxAddHelpBookmarkDialog_Impl::~SfxAddHelpBookmarkDialog_Impl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxAddHelpBookmarkDialog_Impl::dispose()
diff --git a/sfx2/source/control/templateabstractview.cxx b/sfx2/source/control/templateabstractview.cxx
index cfbd8869cc0a..2452f7277db7 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -151,7 +151,7 @@ TemplateAbstractView::TemplateAbstractView(vcl::Window *pParent)
 
 TemplateAbstractView::~TemplateAbstractView()
 {
-    dispose();
+    disposeOnce();
 }
 
 void TemplateAbstractView::dispose()
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index 022172a2b8ce..c2e42d9a7eae 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -45,7 +45,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTemplateLocalView(vcl:
 
 TemplateLocalView::~TemplateLocalView()
 {
-    dispose();
+    disposeOnce();
 }
 
 void TemplateLocalView::dispose()
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index 555e55f56835..f8fecff1387a 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -66,7 +66,7 @@ ThumbnailView::ThumbnailView (vcl::Window *pParent, WinBits nWinStyle, bool bDis
 
 ThumbnailView::~ThumbnailView()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ThumbnailView::dispose()
diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx
index 81032bdd11d0..009a593b9901 100644
--- a/sfx2/source/dialog/alienwarn.cxx
+++ b/sfx2/source/dialog/alienwarn.cxx
@@ -51,7 +51,7 @@ SfxAlienWarningDialog::SfxAlienWarningDialog(vcl::Window* pParent, const OUStrin
 
 SfxAlienWarningDialog::~SfxAlienWarningDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxAlienWarningDialog::dispose()
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index 39bee6d64b43..cab9b33796b7 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -195,7 +195,7 @@ BackingWindow::BackingWindow( vcl::Window* i_pParent ) :
 
 BackingWindow::~BackingWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void BackingWindow::dispose()
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 8794ce044bcb..6a6e4b597090 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -170,7 +170,7 @@ SfxModalDialog::SfxModalDialog(vcl::Window *pParent, const OUString& rID, const
 
 SfxModalDialog::~SfxModalDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxModalDialog::dispose()
@@ -362,7 +362,7 @@ bool SfxModelessDialog::Notify( NotifyEvent& rEvt )
 
 SfxModelessDialog::~SfxModelessDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxModelessDialog::dispose()
@@ -512,7 +512,7 @@ bool SfxFloatingWindow::Close()
 
 SfxFloatingWindow::~SfxFloatingWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxFloatingWindow::dispose()
@@ -707,7 +707,7 @@ SfxSingleTabDialog::SfxSingleTabDialog(vcl::Window* pParent, const SfxItemSet* p
 
 SfxSingleTabDialog::~SfxSingleTabDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxSingleTabDialog::dispose()
diff --git a/sfx2/source/dialog/checkin.cxx b/sfx2/source/dialog/checkin.cxx
index b365adab07da..e628476df652 100644
--- a/sfx2/source/dialog/checkin.cxx
+++ b/sfx2/source/dialog/checkin.cxx
@@ -22,7 +22,7 @@ SfxCheckinDialog::SfxCheckinDialog( vcl::Window* pParent ) :
 
 SfxCheckinDialog::~SfxCheckinDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxCheckinDialog::dispose()
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 75581c9f63e7..efd2dbef2337 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -628,7 +628,7 @@ SfxDocumentDescPage::SfxDocumentDescPage( vcl::Window * pParent, const SfxItemSe
 
 SfxDocumentDescPage::~SfxDocumentDescPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxDocumentDescPage::dispose()
@@ -805,7 +805,7 @@ SfxDocumentPage::SfxDocumentPage(vcl::Window* pParent, const SfxItemSet& rItemSe
 
 SfxDocumentPage::~SfxDocumentPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxDocumentPage::dispose()
@@ -1238,7 +1238,7 @@ CustomPropertiesYesNoButton::CustomPropertiesYesNoButton( vcl::Window* pParent,
 
 CustomPropertiesYesNoButton::~CustomPropertiesYesNoButton()
 {
-    dispose();
+    disposeOnce();
 }
 
 void CustomPropertiesYesNoButton::dispose()
@@ -1293,7 +1293,7 @@ DurationDialog_Impl::DurationDialog_Impl(vcl::Window* pParent,
 
 DurationDialog_Impl::~DurationDialog_Impl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void DurationDialog_Impl::dispose()
@@ -1491,7 +1491,7 @@ CustomPropertiesWindow::CustomPropertiesWindow(vcl::Window* pParent,
 
 CustomPropertiesWindow::~CustomPropertiesWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void CustomPropertiesWindow::dispose()
@@ -2138,7 +2138,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeCustomPropertiesContro
 
 CustomPropertiesControl::~CustomPropertiesControl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void CustomPropertiesControl::dispose()
@@ -2189,7 +2189,7 @@ SfxCustomPropertiesPage::SfxCustomPropertiesPage( vcl::Window* pParent, const Sf
 
 SfxCustomPropertiesPage::~SfxCustomPropertiesPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxCustomPropertiesPage::dispose()
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 5c7160d02c3a..a69ac5b73b91 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -253,7 +253,7 @@ SfxTitleDockingWindow::SfxTitleDockingWindow( SfxBindings* pBind ,
 
 SfxTitleDockingWindow::~SfxTitleDockingWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxTitleDockingWindow::dispose()
@@ -1274,7 +1274,7 @@ void SfxDockingWindow::FillInfo(SfxChildWinInfo& rInfo) const
 
 SfxDockingWindow::~SfxDockingWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxDockingWindow::dispose()
diff --git a/sfx2/source/dialog/documentfontsdialog.cxx b/sfx2/source/dialog/documentfontsdialog.cxx
index 6f0fab8bade5..c326e1122e13 100644
--- a/sfx2/source/dialog/documentfontsdialog.cxx
+++ b/sfx2/source/dialog/documentfontsdialog.cxx
@@ -36,7 +36,7 @@ SfxDocumentFontsPage::SfxDocumentFontsPage( vcl::Window* parent, const SfxItemSe
 
 SfxDocumentFontsPage::~SfxDocumentFontsPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxDocumentFontsPage::dispose()
diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx
index 639bd4baca93..b7b9f73eeac5 100644
--- a/sfx2/source/dialog/infobar.cxx
+++ b/sfx2/source/dialog/infobar.cxx
@@ -145,7 +145,7 @@ void SfxInfoBarWindow::addButton(PushButton* pButton) {
 
 SfxInfoBarWindow::~SfxInfoBarWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxInfoBarWindow::dispose()
@@ -242,7 +242,7 @@ SfxInfoBarContainerWindow::SfxInfoBarContainerWindow(SfxInfoBarContainerChild* p
 
 SfxInfoBarContainerWindow::~SfxInfoBarContainerWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxInfoBarContainerWindow::dispose()
diff --git a/sfx2/source/dialog/inputdlg.cxx b/sfx2/source/dialog/inputdlg.cxx
index a49a412be52a..faa591d89f6a 100644
--- a/sfx2/source/dialog/inputdlg.cxx
+++ b/sfx2/source/dialog/inputdlg.cxx
@@ -28,7 +28,7 @@ InputDialog::InputDialog(const OUString &rLabelText, vcl::Window *pParent)
 
 InputDialog::~InputDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void InputDialog::dispose()
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 0a8a5b26210e..b4dd4e5adfcb 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -250,7 +250,7 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(vcl::Window* pParent, const Sfx
 
 SfxManageStyleSheetPage::~SfxManageStyleSheetPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxManageStyleSheetPage::dispose()
diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx
index 8fe73b084c61..e4aa3bcedce0 100644
--- a/sfx2/source/dialog/newstyle.cxx
+++ b/sfx2/source/dialog/newstyle.cxx
@@ -82,7 +82,7 @@ SfxNewStyleDlg::SfxNewStyleDlg( vcl::Window* pParent, SfxStyleSheetBasePool& rIn
 
 SfxNewStyleDlg::~SfxNewStyleDlg()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxNewStyleDlg::dispose()
diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index 1db877fbc258..192130584288 100644
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -127,7 +127,7 @@ SfxPasswordDialog::SfxPasswordDialog(vcl::Window* pParent, const OUString* pGrou
 
 SfxPasswordDialog::~SfxPasswordDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxPasswordDialog::dispose()
diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx
index b5e5d49ee7c9..0c00b345bb5b 100644
--- a/sfx2/source/dialog/printopt.cxx
+++ b/sfx2/source/dialog/printopt.cxx
@@ -87,7 +87,7 @@ SfxCommonPrintOptionsTabPage::SfxCommonPrintOptionsTabPage( vcl::Window* pParent
 
 SfxCommonPrintOptionsTabPage::~SfxCommonPrintOptionsTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxCommonPrintOptionsTabPage::dispose()
diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx
index c674d9823ac1..e9da704e257c 100644
--- a/sfx2/source/dialog/recfloat.cxx
+++ b/sfx2/source/dialog/recfloat.cxx
@@ -200,7 +200,7 @@ SfxRecordingFloat_Impl::SfxRecordingFloat_Impl(
 
 SfxRecordingFloat_Impl::~SfxRecordingFloat_Impl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxRecordingFloat_Impl::dispose()
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index 4a7d42377a39..4a4e97e14215 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -116,7 +116,7 @@ public:
                         }
 
                         virtual ~SfxEmptySplitWin_Impl()
-                        { dispose(); }
+                        { disposeOnce(); }
    virtual void         dispose() SAL_OVERRIDE
                         {
                             aTimer.Stop();
@@ -304,7 +304,7 @@ SfxSplitWindow::SfxSplitWindow( vcl::Window* pParent, SfxChildAlignment eAl,
 
 SfxSplitWindow::~SfxSplitWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxSplitWindow::dispose()
diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx
index 7fd8ec70aff2..0da322cbbcfb 100644
--- a/sfx2/source/dialog/srchdlg.cxx
+++ b/sfx2/source/dialog/srchdlg.cxx
@@ -62,7 +62,7 @@ SearchDialog::SearchDialog(vcl::Window* pWindow, const OUString& rConfigName)
 
 SearchDialog::~SearchDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SearchDialog::dispose()
diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx
index 5fc0c4c8d047..1735f1b28371 100644
--- a/sfx2/source/dialog/styledlg.cxx
+++ b/sfx2/source/dialog/styledlg.cxx
@@ -72,7 +72,7 @@ SfxStyleDialog::SfxStyleDialog
 
 SfxStyleDialog::~SfxStyleDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 /*  [Description]
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index bd4a59c6b334..854493c4f629 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -172,7 +172,7 @@ SfxTabPage::SfxTabPage(vcl::Window *pParent, const OString& rID, const OUString&
 
 SfxTabPage::~SfxTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxTabPage::dispose()
@@ -365,7 +365,7 @@ SfxTabDialog::SfxTabDialog
 
 SfxTabDialog::~SfxTabDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxTabDialog::dispose()
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index b092808feb93..9750f6c3717b 100644
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -211,7 +211,7 @@ namespace sfx2
 
     TaskPaneDockingWindow::~TaskPaneDockingWindow()
     {
-        dispose();
+        disposeOnce();
     }
 
     void TaskPaneDockingWindow::dispose()
diff --git a/sfx2/source/dialog/templateinfodlg.cxx b/sfx2/source/dialog/templateinfodlg.cxx
index e16db6db0f95..68c52d300074 100644
--- a/sfx2/source/dialog/templateinfodlg.cxx
+++ b/sfx2/source/dialog/templateinfodlg.cxx
@@ -54,7 +54,7 @@ SfxTemplateInfoDlg::SfxTemplateInfoDlg (vcl::Window *pParent)
 
 SfxTemplateInfoDlg::~SfxTemplateInfoDlg()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxTemplateInfoDlg::dispose()
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 9b728a078267..381b5beab56c 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -253,7 +253,7 @@ SfxTemplatePanelControl::SfxTemplatePanelControl(SfxBindings* pBindings, vcl::Wi
 
 SfxTemplatePanelControl::~SfxTemplatePanelControl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxTemplatePanelControl::dispose()
diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx
index 5f2a99ff6997..a176cc18b16c 100644
--- a/sfx2/source/dialog/titledockwin.cxx
+++ b/sfx2/source/dialog/titledockwin.cxx
@@ -59,7 +59,7 @@ namespace sfx2
 
     TitledDockingWindow::~TitledDockingWindow()
     {
-        dispose();
+        disposeOnce();
     }
 
     void TitledDockingWindow::dispose()
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index 0b43ce07f6f8..c3908fc86513 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -329,7 +329,7 @@ void SfxVersionDialog::Init_Impl()
 
 SfxVersionDialog::~SfxVersionDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxVersionDialog::dispose()
@@ -508,7 +508,7 @@ SfxViewVersionDialog_Impl::SfxViewVersionDialog_Impl(vcl::Window *pParent, SfxVe
 
 SfxViewVersionDialog_Impl::~SfxViewVersionDialog_Impl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxViewVersionDialog_Impl::dispose()
@@ -586,7 +586,7 @@ SfxCmisVersionsDialog::SfxCmisVersionsDialog ( SfxViewFrame* pVwFrame, bool bIsS
 
 SfxCmisVersionsDialog::~SfxCmisVersionsDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxCmisVersionsDialog::dispose()
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 629a6ef07efe..84a3a1c1e15b 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -2450,7 +2450,7 @@ WaitWindow_Impl::WaitWindow_Impl()
 
 WaitWindow_Impl::~WaitWindow_Impl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void  WaitWindow_Impl::dispose()
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 3ad16cf0901e..1d4f8e6fa858 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -454,7 +454,7 @@ SfxNewFileDialog::SfxNewFileDialog(vcl::Window *pParent, sal_uInt16 nFlags)
 
 SfxNewFileDialog::~SfxNewFileDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxNewFileDialog::dispose()
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 3ace50cbec6e..23a000345309 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -298,7 +298,7 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(vcl::Window *parent)
 
 SfxTemplateManagerDlg::~SfxTemplateManagerDlg()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxTemplateManagerDlg::dispose()
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 5e345f9bfae7..28e78f7f4fa3 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -75,7 +75,7 @@ Deck::Deck (
 
 Deck::~Deck()
 {
-    dispose();
+    disposeOnce();
 }
 
 void Deck::dispose()
diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx
index 456642f79e9c..7d762eac842e 100644
--- a/sfx2/source/sidebar/Panel.cxx
+++ b/sfx2/source/sidebar/Panel.cxx
@@ -71,7 +71,7 @@ Panel::Panel (
 
 Panel::~Panel()
 {
-    dispose();
+    disposeOnce();
 }
 
 void Panel::dispose()
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx
index 30ad8476bba8..e4cc3b80d9d6 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -60,7 +60,7 @@ PanelTitleBar::PanelTitleBar (
 
 PanelTitleBar::~PanelTitleBar()
 {
-    dispose();
+    disposeOnce();
 }
 
 void PanelTitleBar::dispose()
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index 047b218bb6e0..5e50d6da3e3f 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -53,7 +53,7 @@ SidebarDockingWindow::SidebarDockingWindow(
 
 SidebarDockingWindow::~SidebarDockingWindow (void)
 {
-    dispose();
+    disposeOnce();
 }
 
 void SidebarDockingWindow::dispose()
diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx
index 4d9f9f4c8c83..f52aa294e604 100644
--- a/sfx2/source/sidebar/SidebarToolBox.cxx
+++ b/sfx2/source/sidebar/SidebarToolBox.cxx
@@ -57,7 +57,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSidebarToolBox(vcl::Wi
 
 SidebarToolBox::~SidebarToolBox()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SidebarToolBox::dispose()
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 9b450cc1380e..f765972a88f7 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -64,7 +64,7 @@ TabBar::TabBar (
 
 TabBar::~TabBar()
 {
-    dispose();
+    disposeOnce();
 }
 
 void TabBar::dispose()
diff --git a/sfx2/source/sidebar/TitleBar.cxx b/sfx2/source/sidebar/TitleBar.cxx
index 0e0e49567d3b..2a78dfa89cfd 100644
--- a/sfx2/source/sidebar/TitleBar.cxx
+++ b/sfx2/source/sidebar/TitleBar.cxx
@@ -52,7 +52,7 @@ TitleBar::TitleBar (
 
 TitleBar::~TitleBar()
 {
-    dispose();
+    disposeOnce();
 }
 
 void TitleBar::dispose()
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index c1df7877299e..e993174b4ca5 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -1200,7 +1200,7 @@ SfxPopupWindow::SfxPopupWindow(
 
 SfxPopupWindow::~SfxPopupWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxPopupWindow::dispose()
diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx
index c9594f2ccf0c..ee08f4dbc0be 100644
--- a/sfx2/source/view/printer.cxx
+++ b/sfx2/source/view/printer.cxx
@@ -229,7 +229,7 @@ SfxPrintOptionsDialog::SfxPrintOptionsDialog(vcl::Window *pParent,
 
 SfxPrintOptionsDialog::~SfxPrintOptionsDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SfxPrintOptionsDialog::dispose()