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

66 files changed, 108 insertions, 109 deletions

diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 2d528fdff1e7..6eb9fcf0c8b4 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -86,14 +86,13 @@ public:
 
 class MaskSet : public ValueSet
 {
-    VclPtr<SvxBmpMask>     pSvxBmpMask;
-
+    VclPtr<SvxBmpMask> pSvxBmpMask;
 
 public:
     MaskSet(SvxBmpMask* pMask, vcl::Window* pParent);
-    virtual ~MaskSet() { dispose(); }
+    virtual ~MaskSet() { disposeOnce(); }
     virtual void dispose() SAL_OVERRIDE { pSvxBmpMask.clear(); ValueSet::dispose(); }
-    virtual void    Select() SAL_OVERRIDE;
+    virtual void Select() SAL_OVERRIDE;
     virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
     virtual void GetFocus() SAL_OVERRIDE;
     virtual Size GetOptimalSize() const SAL_OVERRIDE
@@ -486,7 +485,7 @@ SvxBmpMask::SvxBmpMask(SfxBindings *pBindinx, SfxChildWindow *pCW, vcl::Window*
 
 SvxBmpMask::~SvxBmpMask()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxBmpMask::dispose()
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 2ed20dfb2d9a..df4dd3eb3677 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -88,7 +88,7 @@ SvxContourDlg::SvxContourDlg(SfxBindings* _pBindings, SfxChildWindow* pCW,
 
 SvxContourDlg::~SvxContourDlg()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxContourDlg::dispose()
@@ -294,7 +294,7 @@ SvxSuperContourDlg::SvxSuperContourDlg(SfxBindings *_pBindings, SfxChildWindow *
 
 SvxSuperContourDlg::~SvxSuperContourDlg()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxSuperContourDlg::dispose()
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index e9d4ffae61ca..e3c60fe43226 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -691,7 +691,7 @@ IMPL_LINK_NOARG(SvxShowCharSet, VscrollHdl)
 
 SvxShowCharSet::~SvxShowCharSet()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxShowCharSet::dispose()
diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx
index 514e3dec682e..d767d4707285 100644
--- a/svx/source/dialog/checklbx.cxx
+++ b/svx/source/dialog/checklbx.cxx
@@ -50,7 +50,7 @@ void SvxCheckListBox::SetNormalStaticImage(const Image& rNormalStaticImage)
 
 SvxCheckListBox::~SvxCheckListBox()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxCheckListBox::dispose()
diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx
index e8fc165edc79..2b553223463a 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -67,7 +67,7 @@ CompressGraphicsDialog::CompressGraphicsDialog( vcl::Window* pParent, Graphic& r
 
 CompressGraphicsDialog::~CompressGraphicsDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void CompressGraphicsDialog::dispose()
diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx
index 2b636c289956..3db87d5b7564 100644
--- a/svx/source/dialog/connctrl.cxx
+++ b/svx/source/dialog/connctrl.cxx
@@ -57,7 +57,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxXConnectionPreview(
 
 SvxXConnectionPreview::~SvxXConnectionPreview()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxXConnectionPreview::dispose()
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 81551a1ab095..ddb685271b89 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -112,7 +112,7 @@ SvxRedlinTable::SvxRedlinTable(SvSimpleTableContainer& rParent, WinBits nBits)
 
 SvxRedlinTable::~SvxRedlinTable()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxRedlinTable::dispose()
@@ -418,7 +418,7 @@ void SvxTPView::DeactivatePage()
 
 SvxTPView::~SvxTPView()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxTPView::dispose()
@@ -604,7 +604,7 @@ SvxTPFilter::SvxTPFilter( vcl::Window * pParent)
 
 SvxTPFilter::~SvxTPFilter()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxTPFilter::dispose()
@@ -1113,7 +1113,7 @@ SvxAcceptChgCtr::SvxAcceptChgCtr(vcl::Window* pParent, VclBuilderContainer* pTop
 
 SvxAcceptChgCtr::~SvxAcceptChgCtr()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxAcceptChgCtr::dispose()
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index 8cf27409c106..519dfc058802 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -69,7 +69,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvx3DPreviewControl(vc
 
 Svx3DPreviewControl::~Svx3DPreviewControl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void Svx3DPreviewControl::dispose()
@@ -1007,7 +1007,7 @@ void SvxLightCtl3D::Init()
 
 SvxLightCtl3D::~SvxLightCtl3D()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxLightCtl3D::dispose()
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 46890c6996b9..87d7061d3edd 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -106,7 +106,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxRectCtl(vcl::Window
 
 SvxRectCtl::~SvxRectCtl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxRectCtl::dispose()
@@ -847,7 +847,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxPixelCtl(vcl::Windo
 
 SvxPixelCtl::~SvxPixelCtl( )
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxPixelCtl::dispose()
@@ -1837,7 +1837,7 @@ SvxPreviewBase::SvxPreviewBase(vcl::Window* pParent)
 
 SvxPreviewBase::~SvxPreviewBase()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxPreviewBase::dispose()
@@ -1998,7 +1998,7 @@ Size SvxXLinePreview::GetOptimalSize() const
 
 SvxXLinePreview::~SvxXLinePreview()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxXLinePreview::dispose()
@@ -2110,7 +2110,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxXRectPreview(vcl::W
 
 SvxXRectPreview::~SvxXRectPreview()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxXRectPreview::dispose()
@@ -2171,7 +2171,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxXShadowPreview (vcl
 
 SvxXShadowPreview::~SvxXShadowPreview()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxXShadowPreview::dispose()
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 9de79a90c576..82db09a466b0 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -539,7 +539,7 @@ PluginProgressWindow::PluginProgressWindow(      vcl::Window*
 
 PluginProgressWindow::~PluginProgressWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void PluginProgressWindow::dispose()
@@ -668,7 +668,7 @@ SaveDialog::SaveDialog(vcl::Window* pParent, RecoveryCore* pCore)
 
 SaveDialog::~SaveDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SaveDialog::dispose()
@@ -711,7 +711,7 @@ SaveProgressDialog::SaveProgressDialog(vcl::Window* pParent, RecoveryCore* pCore
 
 SaveProgressDialog::~SaveProgressDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SaveProgressDialog::dispose()
@@ -927,7 +927,7 @@ RecoveryDialog::RecoveryDialog(vcl::Window* pParent, RecoveryCore* pCore)
 
 RecoveryDialog::~RecoveryDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void RecoveryDialog::dispose()
@@ -1270,7 +1270,7 @@ BrokenRecoveryDialog::BrokenRecoveryDialog(vcl::Window*       pParent        ,
 
 BrokenRecoveryDialog::~BrokenRecoveryDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void BrokenRecoveryDialog::dispose()
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 66ad4cf9f123..a6333155e94e 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -502,7 +502,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxFontPrevWindow(vcl:
 
 SvxFontPrevWindow::~SvxFontPrevWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxFontPrevWindow::dispose()
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 3ddca61f7196..2f392b1bd335 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -287,7 +287,7 @@ SvxFontWorkDialog::SvxFontWorkDialog(SfxBindings *pBindinx,
 
 SvxFontWorkDialog::~SvxFontWorkDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxFontWorkDialog::dispose()
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index d2d6d8ac57d4..236f046a8c69 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -84,7 +84,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeGraphCtrl(vcl::Window
 
 GraphCtrl::~GraphCtrl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void GraphCtrl::dispose()
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 65ea63526eaf..704c0dcc2ba2 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -203,7 +203,7 @@ SvxHFPage::SvxHFPage( vcl::Window* pParent, const SfxItemSet& rSet, sal_uInt16 n
 
 SvxHFPage::~SvxHFPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxHFPage::dispose()
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 2e545e0914bf..67a1a13f7642 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -217,7 +217,7 @@ SvxIMapDlg::SvxIMapDlg(SfxBindings *_pBindings, SfxChildWindow *pCW, vcl::Window
 
 SvxIMapDlg::~SvxIMapDlg()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxIMapDlg::dispose()
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index 17e6017e9823..06f7ed005389 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -72,7 +72,7 @@ IMapWindow::IMapWindow( vcl::Window* pParent, WinBits nBits, const Reference< XF
 
 IMapWindow::~IMapWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void IMapWindow::dispose()
diff --git a/svx/source/dialog/linkwarn.cxx b/svx/source/dialog/linkwarn.cxx
index 8aeab4bf4748..26879f23f7fe 100644
--- a/svx/source/dialog/linkwarn.cxx
+++ b/svx/source/dialog/linkwarn.cxx
@@ -43,7 +43,7 @@ SvxLinkWarningDialog::SvxLinkWarningDialog( vcl::Window* pParent, const OUString
 
 SvxLinkWarningDialog::~SvxLinkWarningDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxLinkWarningDialog::dispose()
diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx
index 3ba702b06e05..e2ed6e0a1016 100644
--- a/svx/source/dialog/measctrl.cxx
+++ b/svx/source/dialog/measctrl.cxx
@@ -78,7 +78,7 @@ Size SvxXMeasurePreview::GetOptimalSize() const
 
 SvxXMeasurePreview::~SvxXMeasurePreview()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxXMeasurePreview::dispose()
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index 58c0f4a22d09..48317dd5b455 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -173,7 +173,7 @@ SvxGridTabPage::SvxGridTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet
 
 SvxGridTabPage::~SvxGridTabPage()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxGridTabPage::dispose()
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index 6b6c245a335f..d1e4c5c04232 100644
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -90,7 +90,7 @@ SvxPageWindow::SvxPageWindow(vcl::Window* pParent)
 
 SvxPageWindow::~SvxPageWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxPageWindow::dispose()
diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx
index 84e56e032d4a..25b01d703dfa 100644
--- a/svx/source/dialog/passwd.cxx
+++ b/svx/source/dialog/passwd.cxx
@@ -99,7 +99,7 @@ SvxPasswordDialog::SvxPasswordDialog(vcl::Window* pParent, bool bAllowEmptyPassw
 
 SvxPasswordDialog::~SvxPasswordDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxPasswordDialog::dispose()
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 2ebbbeca831e..43e0c8b9ffbf 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -263,7 +263,7 @@ SvxRubyDialog::SvxRubyDialog(SfxBindings *pBind, SfxChildWindow *pCW,
 
 SvxRubyDialog::~SvxRubyDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxRubyDialog::dispose()
@@ -790,7 +790,7 @@ RubyPreview::RubyPreview(vcl::Window *pParent)
 
 RubyPreview::~RubyPreview()
 {
-    dispose();
+    disposeOnce();
 }
 
 void RubyPreview::dispose()
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 24a5d33f3f43..7e2c7092fcb7 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -345,7 +345,7 @@ SvxSearchDialog::SvxSearchDialog( vcl::Window* pParent, SfxChildWindow* pChildWi
 
 SvxSearchDialog::~SvxSearchDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxSearchDialog::dispose()
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 32f306540137..7ac8567c4e8f 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -423,7 +423,7 @@ void SvxNumValueSet::init(sal_uInt16 nType)
 
 SvxNumValueSet::~SvxNumValueSet()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxNumValueSet::dispose()
@@ -493,7 +493,7 @@ void SvxBmpNumValueSet::init()
 
 SvxBmpNumValueSet::~SvxBmpNumValueSet()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxBmpNumValueSet::dispose()
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index b2bfffdda52c..120b5ac3ec52 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -341,7 +341,7 @@ SvxRuler::SvxRuler(
 
 SvxRuler::~SvxRuler()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxRuler::dispose()
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index 2eb940b2036e..1b43822bd566 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -59,7 +59,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxTextEncodingBox(vcl
 
 SvxTextEncodingBox::~SvxTextEncodingBox()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxTextEncodingBox::dispose()
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index cf1237616383..f413b14e58f7 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -325,7 +325,7 @@ Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* p
 
 Svx3DWin::~Svx3DWin()
 {
-    dispose();
+    disposeOnce();
 }
 
 void Svx3DWin::dispose()
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index e1ed4afcb96e..2b6577afe14c 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -134,7 +134,7 @@ FmGridHeader::FmGridHeader( BrowseBox* pParent, WinBits nWinBits)
 
 FmGridHeader::~FmGridHeader()
 {
-    dispose();
+    disposeOnce();
 }
 
 void FmGridHeader::dispose()
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 21ba11a36f03..58313a4645cc 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -404,7 +404,7 @@ DbGridControl::NavigationBar::NavigationBar(vcl::Window* pParent, WinBits nStyle
 
 DbGridControl::NavigationBar::~NavigationBar()
 {
-    dispose();
+    disposeOnce();
 }
 
 void DbGridControl::NavigationBar::dispose()
@@ -951,7 +951,7 @@ void DbGridControl::Init()
 
 DbGridControl::~DbGridControl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void DbGridControl::dispose()
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 06d105eaafda..a24f04d15b0c 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -142,7 +142,7 @@ namespace svxform
 
     DataTreeListBox::~DataTreeListBox()
     {
-        dispose();
+        disposeOnce();
     }
 
     void DataTreeListBox::dispose()
@@ -377,7 +377,7 @@ namespace svxform
 
     XFormsPage::~XFormsPage()
     {
-        dispose();
+        disposeOnce();
     }
 
     void XFormsPage::dispose()
@@ -1421,7 +1421,7 @@ namespace svxform
 
     DataNavigatorWindow::~DataNavigatorWindow()
     {
-        dispose();
+        disposeOnce();
     }
 
     void DataNavigatorWindow::dispose()
@@ -2173,7 +2173,7 @@ namespace svxform
 
     DataNavigator::~DataNavigator()
     {
-        dispose();
+        disposeOnce();
     }
 
     void DataNavigator::dispose()
@@ -2301,7 +2301,7 @@ namespace svxform
 
     AddDataItemDialog::~AddDataItemDialog()
     {
-        dispose();
+        disposeOnce();
     }
 
     void AddDataItemDialog::dispose()
@@ -2819,7 +2819,7 @@ namespace svxform
 
     AddConditionDialog::~AddConditionDialog()
     {
-        dispose();
+        disposeOnce();
     }
 
     void AddConditionDialog::dispose()
@@ -2943,7 +2943,7 @@ namespace svxform
 
     NamespaceItemDialog::~NamespaceItemDialog()
     {
-        dispose();
+        disposeOnce();
     }
 
     void NamespaceItemDialog::dispose()
@@ -3097,7 +3097,7 @@ namespace svxform
 
     ManageNamespaceDialog::~ManageNamespaceDialog()
     {
-        dispose();
+        disposeOnce();
     }
 
     void ManageNamespaceDialog::dispose()
@@ -3158,7 +3158,7 @@ namespace svxform
 
     AddSubmissionDialog::~AddSubmissionDialog()
     {
-        dispose();
+        disposeOnce();
     }
 
     void AddSubmissionDialog::dispose()
@@ -3377,7 +3377,7 @@ namespace svxform
 
     AddModelDialog::~AddModelDialog()
     {
-        dispose();
+        disposeOnce();
     }
 
     void AddModelDialog::dispose()
@@ -3408,7 +3408,7 @@ namespace svxform
 
     AddInstanceDialog::~AddInstanceDialog()
     {
-        dispose();
+        disposeOnce();
     }
 
     void AddInstanceDialog::dispose()
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index ec5bd20a506f..a3d7e3a2b632 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1150,7 +1150,7 @@ FmFilterNavigator::FmFilterNavigator( vcl::Window* pParent )
 
 FmFilterNavigator::~FmFilterNavigator()
 {
-    dispose();
+    disposeOnce();
 }
 
 void FmFilterNavigator::dispose()
@@ -1867,7 +1867,7 @@ FmFilterNavigatorWin::FmFilterNavigatorWin( SfxBindings* _pBindings, SfxChildWin
 
 FmFilterNavigatorWin::~FmFilterNavigatorWin()
 {
-    dispose();
+    disposeOnce();
 }
 
 void FmFilterNavigatorWin::dispose()
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index caef3efe94be..b61dde5086aa 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -252,7 +252,7 @@ void FmPropBrw::Resize()
 
 FmPropBrw::~FmPropBrw()
 {
-    dispose();
+    disposeOnce();
 }
 
 void FmPropBrw::dispose()
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index e69a7b55590b..5084c607f161 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -514,7 +514,7 @@ namespace svxform
 
     NavigatorFrame::~NavigatorFrame()
     {
-        dispose();
+        disposeOnce();
     }
 
     void NavigatorFrame::dispose()
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 7fd263069ede..b022b22cc9e8 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -162,7 +162,7 @@ namespace svxform
 
     NavigatorTree::~NavigatorTree()
     {
-        dispose();
+        disposeOnce();
     }
 
     void NavigatorTree::dispose()
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 942f95a46f15..0887b430ff1a 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -115,7 +115,7 @@ FmFieldWinListBox::FmFieldWinListBox( FmFieldWin* pParent )
 
 FmFieldWinListBox::~FmFieldWinListBox()
 {
-    dispose();
+    disposeOnce();
 }
 
 void FmFieldWinListBox::dispose()
@@ -198,7 +198,7 @@ FmFieldWin::FmFieldWin(SfxBindings* _pBindings, SfxChildWindow* _pMgr, vcl::Wind
 
 FmFieldWin::~FmFieldWin()
 {
-    dispose();
+    disposeOnce();
 }
 
 void FmFieldWin::dispose()
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index 55c8009f42db..6d18452dfd39 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -146,7 +146,7 @@ GalleryBrowser1::GalleryBrowser1(
 
 GalleryBrowser1::~GalleryBrowser1()
 {
-    dispose();
+    disposeOnce();
 }
 
 void GalleryBrowser1::dispose()
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 3aae480832b1..6e3a3309208c 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -474,7 +474,7 @@ GalleryBrowser2::GalleryBrowser2( vcl::Window* pParent, Gallery* pGallery ) :
 
 GalleryBrowser2::~GalleryBrowser2()
 {
-    dispose();
+    disposeOnce();
 }
 
 void GalleryBrowser2::dispose()
diff --git a/svx/source/sidebar/EmptyPanel.cxx b/svx/source/sidebar/EmptyPanel.cxx
index e1639bfb273c..16c8169391b8 100644
--- a/svx/source/sidebar/EmptyPanel.cxx
+++ b/svx/source/sidebar/EmptyPanel.cxx
@@ -48,7 +48,7 @@ EmptyPanel::EmptyPanel (vcl::Window* pParent)
 
 EmptyPanel::~EmptyPanel()
 {
-    dispose();
+    disposeOnce();
 }
 
 void EmptyPanel::dispose()
diff --git a/svx/source/sidebar/PanelLayout.cxx b/svx/source/sidebar/PanelLayout.cxx
index 52247256a9b8..9a1f11fffa54 100644
--- a/svx/source/sidebar/PanelLayout.cxx
+++ b/svx/source/sidebar/PanelLayout.cxx
@@ -26,7 +26,7 @@ PanelLayout::PanelLayout(vcl::Window* pParent, const OString& rID, const OUStrin
 
 PanelLayout::~PanelLayout()
 {
-    dispose();
+    disposeOnce();
 }
 
 void PanelLayout::dispose()
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index 5a66785f4735..0063d0587cfa 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -115,7 +115,7 @@ AreaPropertyPanel::AreaPropertyPanel(
 
 AreaPropertyPanel::~AreaPropertyPanel()
 {
-    dispose();
+    disposeOnce();
 }
 
 void AreaPropertyPanel::dispose()
diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
index 2ba22301f9bb..880bb21a3c71 100644
--- a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
+++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
@@ -110,7 +110,7 @@ AreaTransparencyGradientControl::AreaTransparencyGradientControl (
 
 AreaTransparencyGradientControl::~AreaTransparencyGradientControl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void AreaTransparencyGradientControl::dispose()
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
index 98e26fba3d35..8ac484d80d51 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
@@ -68,7 +68,7 @@ GraphicPropertyPanel::GraphicPropertyPanel(
 
 GraphicPropertyPanel::~GraphicPropertyPanel()
 {
-    dispose();
+    disposeOnce();
 }
 
 void GraphicPropertyPanel::dispose()
diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.cxx b/svx/source/sidebar/insert/InsertPropertyPanel.cxx
index 08f2dad99387..da3dc6efdfac 100644
--- a/svx/source/sidebar/insert/InsertPropertyPanel.cxx
+++ b/svx/source/sidebar/insert/InsertPropertyPanel.cxx
@@ -77,7 +77,7 @@ InsertPropertyPanel::InsertPropertyPanel (
 
 InsertPropertyPanel::~InsertPropertyPanel()
 {
-    dispose();
+    disposeOnce();
 }
 
 void InsertPropertyPanel::dispose()
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index f2c7a94bb309..5ff67dec84f8 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -194,7 +194,7 @@ LinePropertyPanel::LinePropertyPanel(
 
 LinePropertyPanel::~LinePropertyPanel()
 {
-    dispose();
+    disposeOnce();
 }
 
 void LinePropertyPanel::dispose()
diff --git a/svx/source/sidebar/line/LineWidthControl.cxx b/svx/source/sidebar/line/LineWidthControl.cxx
index 4e394f8d8709..00c9271bee4e 100644
--- a/svx/source/sidebar/line/LineWidthControl.cxx
+++ b/svx/source/sidebar/line/LineWidthControl.cxx
@@ -66,7 +66,7 @@ LineWidthControl::LineWidthControl (
 
 LineWidthControl::~LineWidthControl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void LineWidthControl::dispose()
diff --git a/svx/source/sidebar/line/LineWidthValueSet.cxx b/svx/source/sidebar/line/LineWidthValueSet.cxx
index c9e7ecd2b627..c57196f293cb 100644
--- a/svx/source/sidebar/line/LineWidthValueSet.cxx
+++ b/svx/source/sidebar/line/LineWidthValueSet.cxx
@@ -41,7 +41,7 @@ LineWidthValueSet::LineWidthValueSet (
 
 LineWidthValueSet::~LineWidthValueSet()
 {
-    dispose();
+    disposeOnce();
 }
 
 void LineWidthValueSet::dispose()
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
index ccb0b24974f4..29f93b25ddc2 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
@@ -94,7 +94,7 @@ ParaLineSpacingControl::ParaLineSpacingControl(sal_uInt16 nId)
 
 ParaLineSpacingControl::~ParaLineSpacingControl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ParaLineSpacingControl::dispose()
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 0c9759bf690e..b84a068c427f 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -748,7 +748,7 @@ ParaPropertyPanel::ParaPropertyPanel(vcl::Window* pParent,
 
 ParaPropertyPanel::~ParaPropertyPanel()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ParaPropertyPanel::dispose()
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 24dfebd71b85..cfb5939d25c3 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -117,7 +117,7 @@ PosSizePropertyPanel::PosSizePropertyPanel(
 
 PosSizePropertyPanel::~PosSizePropertyPanel()
 {
-    dispose();
+    disposeOnce();
 }
 
 void PosSizePropertyPanel::dispose()
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
index c029a8faa8bc..8ec03f6726d8 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
@@ -73,7 +73,7 @@ TextCharacterSpacingControl::TextCharacterSpacingControl (
 
 TextCharacterSpacingControl::~TextCharacterSpacingControl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void TextCharacterSpacingControl::dispose()
diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx
index 667bb91d3d04..b9b8c265ce04 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -116,7 +116,7 @@ TextPropertyPanel::TextPropertyPanel ( vcl::Window* pParent, const css::uno::Ref
 
 TextPropertyPanel::~TextPropertyPanel()
 {
-    dispose();
+    disposeOnce();
 }
 
 void TextPropertyPanel::dispose()
diff --git a/svx/source/sidebar/text/TextUnderlineControl.cxx b/svx/source/sidebar/text/TextUnderlineControl.cxx
index bb1caeda96a8..f3cb5630b424 100644
--- a/svx/source/sidebar/text/TextUnderlineControl.cxx
+++ b/svx/source/sidebar/text/TextUnderlineControl.cxx
@@ -67,7 +67,7 @@ TextUnderlineControl::TextUnderlineControl (
 
 TextUnderlineControl::~TextUnderlineControl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void TextUnderlineControl::dispose()
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 42a990477c5c..ad948fa7f079 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -169,7 +169,7 @@ public:
     :   Edit(pParent, nBits),
         pBrowse(pBrowse_)
     {}
-    virtual ~ImpItemEdit() { dispose(); }
+    virtual ~ImpItemEdit() { disposeOnce(); }
     virtual void dispose() SAL_OVERRIDE { pBrowse.clear(); Edit::dispose(); }
     virtual void KeyInput(const KeyEvent& rEvt) SAL_OVERRIDE;
 };
@@ -213,7 +213,7 @@ _SdrItemBrowserControl::_SdrItemBrowserControl(vcl::Window* pParent, WinBits nBi
 
 _SdrItemBrowserControl::~_SdrItemBrowserControl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void _SdrItemBrowserControl::dispose()
@@ -1055,7 +1055,7 @@ _SdrItemBrowserWindow::_SdrItemBrowserWindow(vcl::Window* pParent, WinBits nBits
 
 _SdrItemBrowserWindow::~_SdrItemBrowserWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void _SdrItemBrowserWindow::dispose()
diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx
index 4e7c2db0f274..e11ed8438a6a 100644
--- a/svx/source/tbxctrls/bulletsnumbering.cxx
+++ b/svx/source/tbxctrls/bulletsnumbering.cxx
@@ -137,7 +137,7 @@ NumberingPopup::NumberingPopup( NumberingToolBoxControl& rController,
 
 NumberingPopup::~NumberingPopup()
 {
-    dispose();
+    disposeOnce();
 }
 
 void NumberingPopup::dispose()
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index a5e87774e807..6a631dc8d609 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -244,7 +244,7 @@ SvxColorDockingWindow::SvxColorDockingWindow
 
 SvxColorDockingWindow::~SvxColorDockingWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxColorDockingWindow::dispose()
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index 4366ac12c74e..141725466bdd 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -106,7 +106,7 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow(
 
 ExtrusionDirectionWindow::~ExtrusionDirectionWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ExtrusionDirectionWindow::dispose()
@@ -311,7 +311,7 @@ ExtrusionDepthDialog::ExtrusionDepthDialog( vcl::Window* pParent, double fDepth,
 
 ExtrusionDepthDialog::~ExtrusionDepthDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ExtrusionDepthDialog::dispose()
@@ -602,7 +602,7 @@ ExtrusionLightingWindow::ExtrusionLightingWindow(svt::ToolboxController& rContro
 
 ExtrusionLightingWindow::~ExtrusionLightingWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ExtrusionLightingWindow::dispose()
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index 775fc0184b0e..bd0ca3900705 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -562,7 +562,7 @@ FillControl::FillControl(vcl::Window* pParent,WinBits nStyle)
 
 FillControl::~FillControl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void FillControl::dispose()
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index c36e58220267..a045c1f76da8 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -96,7 +96,7 @@ FontWorkGalleryDialog::FontWorkGalleryDialog( SdrView* pSdrView, vcl::Window* pP
 
 FontWorkGalleryDialog::~FontWorkGalleryDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void FontWorkGalleryDialog::dispose()
@@ -721,7 +721,7 @@ FontworkCharacterSpacingDialog::FontworkCharacterSpacingDialog( vcl::Window* pPa
 
 FontworkCharacterSpacingDialog::~FontworkCharacterSpacingDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void FontworkCharacterSpacingDialog::dispose()
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index e03c344a5c0f..312807445c57 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -296,7 +296,7 @@ ImplGrafControl::ImplGrafControl(
 
 ImplGrafControl::~ImplGrafControl()
 {
-   dispose();
+    disposeOnce();
 }
 
 void ImplGrafControl::dispose()
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index 49a8337875ed..bd82e70658b7 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -157,7 +157,7 @@ TableWindow::TableWindow( sal_uInt16 nSlotId, const OUString& rCmd, const OUStri
 
 TableWindow::~TableWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void TableWindow::dispose()
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index 1f500a711886..99ca4bce73b5 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -100,7 +100,7 @@ SvxPopupWindowListBox::SvxPopupWindowListBox(sal_uInt16 nSlotId, const OUString&
 
 SvxPopupWindowListBox::~SvxPopupWindowListBox()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxPopupWindowListBox::dispose()
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 8128f3ec05bb..d6e5fe44d196 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -329,7 +329,7 @@ SfxPopupWindow* SvxLineEndWindow::Clone() const
 
 SvxLineEndWindow::~SvxLineEndWindow()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxLineEndWindow::dispose()
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 79f1edfc703b..8769b4ca73cd 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -278,7 +278,7 @@ protected:
     virtual void    DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
 public:
     SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, vcl::Window* pParentWindow );
-    virtual ~SvxLineWindow_Impl() { dispose(); }
+    virtual ~SvxLineWindow_Impl() { disposeOnce(); }
     virtual void dispose() SAL_OVERRIDE { m_aLineStyleLb.disposeAndClear(); SfxPopupWindow::dispose(); }
     virtual SfxPopupWindow* Clone() const SAL_OVERRIDE;
 };
@@ -332,7 +332,7 @@ SvxStyleBox_Impl::SvxStyleBox_Impl(vcl::Window* pParent,
 
 SvxStyleBox_Impl::~SvxStyleBox_Impl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxStyleBox_Impl::dispose()
@@ -884,7 +884,7 @@ SvxFontNameBox_Impl::SvxFontNameBox_Impl( vcl::Window* pParent, const Reference<
 
 SvxFontNameBox_Impl::~SvxFontNameBox_Impl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxFontNameBox_Impl::dispose()
@@ -1244,7 +1244,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&            rCommand,
 
 SvxColorWindow_Impl::~SvxColorWindow_Impl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxColorWindow_Impl::dispose()
@@ -1525,7 +1525,7 @@ SvxFrameWindow_Impl::SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFram
 
 SvxFrameWindow_Impl::~SvxFrameWindow_Impl()
 {
-    dispose();
+    disposeOnce();
 }
 
 void SvxFrameWindow_Impl::dispose()
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index 7a461ef72dc2..8aea398c65cf 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -62,7 +62,7 @@ DictionaryList::DictionaryList(SvSimpleTableContainer& rParent, WinBits nBits)
 
 DictionaryList::~DictionaryList()
 {
-    dispose();
+    disposeOnce();
 }
 
 void DictionaryList::dispose()
@@ -555,7 +555,7 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( vcl::Window* pParent )
 
 ChineseDictionaryDialog::~ChineseDictionaryDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ChineseDictionaryDialog::dispose()
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
index 6c0f0401e1ec..1c301c58943c 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
@@ -63,7 +63,7 @@ ChineseTranslationDialog::ChineseTranslationDialog( vcl::Window* pParent )
 
 ChineseTranslationDialog::~ChineseTranslationDialog()
 {
-    dispose();
+    disposeOnce();
 }
 
 void ChineseTranslationDialog::dispose()
diff --git a/svx/workben/pixelctl.cxx b/svx/workben/pixelctl.cxx
index 731e6dc843a1..c1105c3aa48c 100644
--- a/svx/workben/pixelctl.cxx
+++ b/svx/workben/pixelctl.cxx
@@ -83,7 +83,7 @@ class MyWin : public WorkWindow
 
 public:
                 MyWin( vcl::Window* pParent, WinBits nWinStyle );
-    virtual      ~MyWin() { dispose(); }
+    virtual      ~MyWin() { disposeOnce(); }
     virtual void dispose() SAL_OVERRIDE;
     void        MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
     void        MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;