diff options
author | Noel Grandin <noel@peralex.com> | 2015-03-10 09:07:06 +0200 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 10:55:36 +0100 |
commit | d7a84ce8406096b455d81f50cd50ca2e877adc06 (patch) | |
tree | b1dd2b5a4860cf2c9664e2ff3087b8dbb9db7576 /cui/source | |
parent | Audit and correct misc. clears -> disposeAndClears. (diff) | |
download | core-d7a84ce8406096b455d81f50cd50ca2e877adc06.tar.gz core-d7a84ce8406096b455d81f50cd50ca2e877adc06.zip |
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
Diffstat (limited to 'cui/source')
100 files changed, 193 insertions, 193 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 82e314ed58bf..93a1d2aaa3b2 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -674,7 +674,7 @@ void SfxAccCfgTabListBox_Impl::InitEntry(SvTreeListEntry* pEntry, SfxAccCfgTabListBox_Impl::~SfxAccCfgTabListBox_Impl() { - dispose(); + disposeOnce(); } void SfxAccCfgTabListBox_Impl::dispose() @@ -811,7 +811,7 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( vcl::Window* pParent, const SfxAcceleratorConfigPage::~SfxAcceleratorConfigPage() { - dispose(); + disposeOnce(); } void SfxAcceleratorConfigPage::dispose() diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 3d0462fb7300..434dc201ef95 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1397,7 +1397,7 @@ SvxMenuEntriesListBox::SvxMenuEntriesListBox(vcl::Window* pParent, SvxConfigPage SvxMenuEntriesListBox::~SvxMenuEntriesListBox() { - dispose(); + disposeOnce(); } void SvxMenuEntriesListBox::dispose() @@ -1555,7 +1555,7 @@ SvxConfigPage::SvxConfigPage(vcl::Window *pParent, const SfxItemSet& rSet) SvxConfigPage::~SvxConfigPage() { - dispose(); + disposeOnce(); } void SvxConfigPage::dispose() @@ -2245,7 +2245,7 @@ SvxMenuConfigPage::SvxMenuConfigPage(vcl::Window *pParent, const SfxItemSet& rSe SvxMenuConfigPage::~SvxMenuConfigPage() { - dispose(); + disposeOnce(); } // Populates the Menu combo box @@ -2696,7 +2696,7 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog( SvxMainMenuOrganizerDialog::~SvxMainMenuOrganizerDialog() { - dispose(); + disposeOnce(); } void SvxMainMenuOrganizerDialog::dispose() @@ -2966,7 +2966,7 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(vcl::Window *pParent, const SfxItemSe SvxToolbarConfigPage::~SvxToolbarConfigPage() { - dispose(); + disposeOnce(); } void SvxToolbarConfigPage::dispose() @@ -4574,7 +4574,7 @@ SvxToolbarEntriesListBox::SvxToolbarEntriesListBox(vcl::Window* pParent, SvxTool SvxToolbarEntriesListBox::~SvxToolbarEntriesListBox() { - dispose(); + disposeOnce(); } void SvxToolbarEntriesListBox::dispose() @@ -4768,7 +4768,7 @@ SvxNewToolbarDialog::SvxNewToolbarDialog(vcl::Window* pWindow, const OUString& r SvxNewToolbarDialog::~SvxNewToolbarDialog() { - dispose(); + disposeOnce(); } void SvxNewToolbarDialog::dispose() @@ -4981,7 +4981,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( vcl::Window *pWindow, SvxIconSelectorDialog::~SvxIconSelectorDialog() { - dispose(); + disposeOnce(); } void SvxIconSelectorDialog::dispose() @@ -5453,7 +5453,7 @@ SvxIconChangeDialog::SvxIconChangeDialog( SvxIconChangeDialog::~SvxIconChangeDialog() { - dispose(); + disposeOnce(); } void SvxIconChangeDialog::dispose() diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 0f399fda43f5..875b71b57fe3 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -276,7 +276,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSfxConfigFunctionListB SfxConfigFunctionListBox::~SfxConfigFunctionListBox() { - dispose(); + disposeOnce(); } void SfxConfigFunctionListBox::dispose() @@ -429,7 +429,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSfxConfigGroupListBox( SfxConfigGroupListBox::~SfxConfigGroupListBox() { - dispose(); + disposeOnce(); } void SfxConfigGroupListBox::dispose() diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx index 3ab1816f37d5..20e00dedd7a1 100644 --- a/cui/source/customize/eventdlg.cxx +++ b/cui/source/customize/eventdlg.cxx @@ -103,7 +103,7 @@ void SvxEventConfigPage::LateInit( const uno::Reference< frame::XFrame >& _rxFra SvxEventConfigPage::~SvxEventConfigPage() { - dispose(); + disposeOnce(); } void SvxEventConfigPage::dispose() diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 656a2414ddd1..76b3c8ab95e3 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -141,7 +141,7 @@ MacroEventListBox::MacroEventListBox( vcl::Window* pParent, WinBits nStyle ) MacroEventListBox::~MacroEventListBox() { - dispose(); + disposeOnce(); } void MacroEventListBox::dispose() @@ -238,7 +238,7 @@ _SvxMacroTabPage::_SvxMacroTabPage(vcl::Window* pParent, const OString& rID, _SvxMacroTabPage::~_SvxMacroTabPage() { - dispose(); + disposeOnce(); } void _SvxMacroTabPage::dispose() @@ -890,7 +890,7 @@ AssignComponentDialog::AssignComponentDialog( vcl::Window * pParent, const OUStr AssignComponentDialog::~AssignComponentDialog() { - dispose(); + disposeOnce(); } void AssignComponentDialog::dispose() diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 3aefef32d24b..0256b62e099a 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -99,7 +99,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxConfigFunctionListB SvxConfigFunctionListBox::~SvxConfigFunctionListBox() { - dispose(); + disposeOnce(); } void SvxConfigFunctionListBox::dispose() @@ -233,7 +233,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxConfigGroupListBox( SvxConfigGroupListBox::~SvxConfigGroupListBox() { - dispose(); + disposeOnce(); } void SvxConfigGroupListBox::dispose() @@ -921,7 +921,7 @@ SvxScriptSelectorDialog::SvxScriptSelectorDialog( SvxScriptSelectorDialog::~SvxScriptSelectorDialog() { - dispose(); + disposeOnce(); } void SvxScriptSelectorDialog::dispose() diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index ac8aca049c02..b960bc17b3af 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -246,7 +246,7 @@ SpellDialog::SpellDialog(SpellDialogChildWindow* pChildWindow, SpellDialog::~SpellDialog() { - dispose(); + disposeOnce(); } void SpellDialog::dispose() diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index f146e698e49f..cfbdd3ca64e4 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -100,7 +100,7 @@ AboutDialog::AboutDialog(vcl::Window* pParent) AboutDialog::~AboutDialog() { - dispose(); + disposeOnce(); } void AboutDialog::dispose() diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index ad1f3e0d8f81..4cb968d3c6de 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -360,7 +360,7 @@ ColorFieldControl::ColorFieldControl( vcl::Window* pParent, const WinBits& nStyl ColorFieldControl::~ColorFieldControl() { - dispose(); + disposeOnce(); } void ColorFieldControl::dispose() @@ -753,7 +753,7 @@ ColorSliderControl::ColorSliderControl( vcl::Window* pParent, const WinBits& nSt ColorSliderControl::~ColorSliderControl() { - dispose(); + disposeOnce(); } void ColorSliderControl::dispose() @@ -973,7 +973,7 @@ class ColorPickerDialog : public ModalDialog { public: ColorPickerDialog( vcl::Window* pParent, sal_Int32 nColor, sal_Int16 nMode ); - virtual ~ColorPickerDialog() { dispose(); } + virtual ~ColorPickerDialog() { disposeOnce(); } virtual void dispose() SAL_OVERRIDE; void update_color( sal_uInt16 n = UPDATE_ALL ); diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 44f03fed1481..9b95589e3bdb 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -102,7 +102,7 @@ SvxCharacterMap::SvxCharacterMap( vcl::Window* pParent, bool bOne_, const SfxIte SvxCharacterMap::~SvxCharacterMap() { - dispose(); + disposeOnce(); } void SvxCharacterMap::dispose() diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 7e3a767a3bdd..38a0f161f4bc 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -160,7 +160,7 @@ FmSearchDialog::FmSearchDialog(vcl::Window* pParent, const OUString& sInitialTex FmSearchDialog::~FmSearchDialog() { - dispose(); + disposeOnce(); } void FmSearchDialog::dispose() diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 87e8a6ae6921..b0640f8d8efb 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -217,7 +217,7 @@ SearchProgress::SearchProgress( vcl::Window* pParent, const INetURLObject& rStar SearchProgress::~SearchProgress() { - dispose(); + disposeOnce(); } void SearchProgress::dispose() @@ -360,7 +360,7 @@ TakeProgress::TakeProgress(vcl::Window* pWindow) TakeProgress::~TakeProgress() { - dispose(); + disposeOnce(); } void TakeProgress::dispose() @@ -471,7 +471,7 @@ ActualizeProgress::ActualizeProgress(vcl::Window* pWindow, GalleryTheme* pThm) ActualizeProgress::~ActualizeProgress() { - dispose(); + disposeOnce(); } void ActualizeProgress::dispose() @@ -551,7 +551,7 @@ TitleDialog::TitleDialog(vcl::Window* pParent, const OUString& rOldTitle) TitleDialog::~TitleDialog() { - dispose(); + disposeOnce(); } void TitleDialog::dispose() @@ -583,7 +583,7 @@ GalleryIdDialog::GalleryIdDialog( vcl::Window* pParent, GalleryTheme* _pThm ) GalleryIdDialog::~GalleryIdDialog() { - dispose(); + disposeOnce(); } void GalleryIdDialog::dispose() @@ -677,7 +677,7 @@ TPGalleryThemeGeneral::TPGalleryThemeGeneral(vcl::Window* pParent, const SfxItem TPGalleryThemeGeneral::~TPGalleryThemeGeneral() { - dispose(); + disposeOnce(); } void TPGalleryThemeGeneral::dispose() @@ -831,7 +831,7 @@ void TPGalleryThemeProperties::StartSearchFiles( const OUString& _rFolderURL, sh TPGalleryThemeProperties::~TPGalleryThemeProperties() { - dispose(); + disposeOnce(); } void TPGalleryThemeProperties::dispose() diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index 6fd0cf74a4c7..9e84ce37c102 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -155,7 +155,7 @@ GraphicFilterDialog::GraphicFilterDialog(vcl::Window* pParent, GraphicFilterDialog::~GraphicFilterDialog() { - dispose(); + disposeOnce(); } void GraphicFilterDialog::dispose() @@ -216,7 +216,7 @@ GraphicFilterMosaic::GraphicFilterMosaic( vcl::Window* pParent, const Graphic& r GraphicFilterMosaic::~GraphicFilterMosaic() { - dispose(); + disposeOnce(); } void GraphicFilterMosaic::dispose() @@ -280,7 +280,7 @@ GraphicFilterSmooth::GraphicFilterSmooth( vcl::Window* pParent, const Graphic& r GraphicFilterSmooth::~GraphicFilterSmooth() { - dispose(); + disposeOnce(); } void GraphicFilterSmooth::dispose() @@ -338,7 +338,7 @@ GraphicFilterSolarize::GraphicFilterSolarize( vcl::Window* pParent, const Graphi GraphicFilterSolarize::~GraphicFilterSolarize() { - dispose(); + disposeOnce(); } void GraphicFilterSolarize::dispose() @@ -400,7 +400,7 @@ GraphicFilterSepia::GraphicFilterSepia( vcl::Window* pParent, const Graphic& rGr GraphicFilterSepia::~GraphicFilterSepia() { - dispose(); + disposeOnce(); } void GraphicFilterSepia::dispose() @@ -453,7 +453,7 @@ GraphicFilterPoster::GraphicFilterPoster(vcl::Window* pParent, const Graphic& rG GraphicFilterPoster::~GraphicFilterPoster() { - dispose(); + disposeOnce(); } void GraphicFilterPoster::dispose() @@ -526,7 +526,7 @@ GraphicFilterEmboss::GraphicFilterEmboss(vcl::Window* pParent, GraphicFilterEmboss::~GraphicFilterEmboss() { - dispose(); + disposeOnce(); } void GraphicFilterEmboss::dispose() diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index 99f8dadd6d60..ab3f23fb086f 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -157,7 +157,7 @@ SvxHpLinkDlg::SvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings) SvxHpLinkDlg::~SvxHpLinkDlg () { - dispose(); + disposeOnce(); } void SvxHpLinkDlg::dispose() diff --git a/cui/source/dialogs/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx index d86558bccdba..98e059a2109a 100644 --- a/cui/source/dialogs/cuiimapwnd.cxx +++ b/cui/source/dialogs/cuiimapwnd.cxx @@ -75,7 +75,7 @@ URLDlg::URLDlg( vcl::Window* pWindow, const OUString& rURL, const OUString& rAlt URLDlg::~URLDlg() { - dispose(); + disposeOnce(); } void URLDlg::dispose() diff --git a/cui/source/dialogs/cuitbxform.cxx b/cui/source/dialogs/cuitbxform.cxx index 1670025e3195..b54de7fe8e31 100644 --- a/cui/source/dialogs/cuitbxform.cxx +++ b/cui/source/dialogs/cuitbxform.cxx @@ -43,7 +43,7 @@ FmInputRecordNoDialog::FmInputRecordNoDialog(vcl::Window * pParent) FmInputRecordNoDialog::~FmInputRecordNoDialog() { - dispose(); + disposeOnce(); } void FmInputRecordNoDialog::dispose() diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx index 3aa778fac86f..7745404b4ae5 100644 --- a/cui/source/dialogs/dlgname.cxx +++ b/cui/source/dialogs/dlgname.cxx @@ -47,7 +47,7 @@ SvxNameDialog::SvxNameDialog( vcl::Window* pWindow, const OUString& rName, const SvxNameDialog::~SvxNameDialog() { - dispose(); + disposeOnce(); } void SvxNameDialog::dispose() @@ -88,7 +88,7 @@ SvxObjectNameDialog::SvxObjectNameDialog( SvxObjectNameDialog::~SvxObjectNameDialog() { - dispose(); + disposeOnce(); } void SvxObjectNameDialog::dispose() @@ -133,7 +133,7 @@ SvxObjectTitleDescDialog::SvxObjectTitleDescDialog( SvxObjectTitleDescDialog::~SvxObjectTitleDescDialog() { - dispose(); + disposeOnce(); } void SvxObjectTitleDescDialog::dispose() @@ -175,7 +175,7 @@ SvxMessDialog::SvxMessDialog( vcl::Window* pWindow, const OUString& rText, const SvxMessDialog::~SvxMessDialog() { - dispose(); + disposeOnce(); } void SvxMessDialog::dispose() diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 273bffaa70f9..0652c8b0f3a0 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -338,7 +338,7 @@ namespace svx SuggestionSet::~SuggestionSet() { - dispose(); + disposeOnce(); } void SuggestionSet::dispose() @@ -395,7 +395,7 @@ namespace svx SuggestionDisplay::~SuggestionDisplay() { - dispose(); + disposeOnce(); } void SuggestionDisplay::dispose() @@ -607,7 +607,7 @@ namespace svx HangulHanjaConversionDialog::~HangulHanjaConversionDialog() { - dispose(); + disposeOnce(); } void HangulHanjaConversionDialog::dispose() @@ -1163,7 +1163,7 @@ namespace svx HangulHanjaOptionsDialog::~HangulHanjaOptionsDialog() { - dispose(); + disposeOnce(); } void HangulHanjaOptionsDialog::dispose() @@ -1239,7 +1239,7 @@ namespace svx HangulHanjaNewDictDialog::~HangulHanjaNewDictDialog() { - dispose(); + disposeOnce(); } void HangulHanjaNewDictDialog::dispose() @@ -1426,7 +1426,7 @@ namespace svx SuggestionEdit::~SuggestionEdit() { - dispose(); + disposeOnce(); } void SuggestionEdit::dispose() @@ -1845,7 +1845,7 @@ namespace svx HangulHanjaEditDictDialog::~HangulHanjaEditDictDialog() { - dispose(); + disposeOnce(); } void HangulHanjaEditDictDialog::dispose() diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index a02ff7d2eccd..f08098b2a74f 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -129,7 +129,7 @@ SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( vcl::Window *pParent, IconChoiceDia SvxHyperlinkNewDocTp::~SvxHyperlinkNewDocTp () { - dispose(); + disposeOnce(); } void SvxHyperlinkNewDocTp::dispose() diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index 0a3f26922171..df6f179a9e26 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -73,7 +73,7 @@ SvxHyperlinkDocTp::SvxHyperlinkDocTp ( vcl::Window *pParent, IconChoiceDialog* p SvxHyperlinkDocTp::~SvxHyperlinkDocTp() { - dispose(); + disposeOnce(); } void SvxHyperlinkDocTp::dispose() diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index 61760d772156..7077dbd4df4d 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -83,7 +83,7 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( vcl::Window *pParent, SvxHyperlinkInternetTp::~SvxHyperlinkInternetTp() { - dispose(); + disposeOnce(); } void SvxHyperlinkInternetTp::dispose() diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index 6e1da44b6fe4..160e56d9f7c7 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -68,7 +68,7 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( vcl::Window *pParent, IconChoiceDialog* SvxHyperlinkMailTp::~SvxHyperlinkMailTp() { - dispose(); + disposeOnce(); } void SvxHyperlinkMailTp::dispose() diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index bfe9c67a1d60..80b8690d5713 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -74,7 +74,7 @@ SvxHlmarkTreeLBox::SvxHlmarkTreeLBox(vcl::Window* pParent, WinBits nStyle) SvxHlmarkTreeLBox::~SvxHlmarkTreeLBox() { - dispose(); + disposeOnce(); } void SvxHlmarkTreeLBox::dispose() @@ -161,7 +161,7 @@ SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd( SvxHyperlinkTabPageBase *pParent ) SvxHlinkDlgMarkWnd::~SvxHlinkDlgMarkWnd() { - dispose(); + disposeOnce(); } void SvxHlinkDlgMarkWnd::dispose() diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 6d5d3a9c5ef3..072dedd1baa3 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -107,7 +107,7 @@ SvxHyperlinkTabPageBase::SvxHyperlinkTabPageBase ( vcl::Window *pParent, SvxHyperlinkTabPageBase::~SvxHyperlinkTabPageBase() { - dispose(); + disposeOnce(); } void SvxHyperlinkTabPageBase::dispose() diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index 8c4ea99822f4..e124a435fefc 100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx @@ -514,7 +514,7 @@ SvxHyphenWordDialog::SvxHyphenWordDialog( SvxHyphenWordDialog::~SvxHyphenWordDialog() { - dispose(); + disposeOnce(); } void SvxHyphenWordDialog::dispose() diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 712d78fa969f..cb809619e0f7 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -54,7 +54,7 @@ IconChoicePage::IconChoicePage( vcl::Window *pParent, const OString& rID, IconChoicePage::~IconChoicePage() { - dispose(); + disposeOnce(); } void IconChoicePage::dispose() @@ -215,7 +215,7 @@ IconChoiceDialog::IconChoiceDialog ( vcl::Window* pParent, const OUString& rID, IconChoiceDialog ::~IconChoiceDialog () { - dispose(); + disposeOnce(); } void IconChoiceDialog::dispose() diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index db3bf1fef153..0b24ea2a535c 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -193,7 +193,7 @@ SvInsertOleDlg::SvInsertOleDlg SvInsertOleDlg::~SvInsertOleDlg() { - dispose(); + disposeOnce(); } void SvInsertOleDlg::dispose() @@ -413,7 +413,7 @@ SvInsertPlugInDialog::SvInsertPlugInDialog(vcl::Window* pParent, SvInsertPlugInDialog::~SvInsertPlugInDialog() { - dispose(); + disposeOnce(); } void SvInsertPlugInDialog::dispose() @@ -517,7 +517,7 @@ SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( vcl::Window *pParent SfxInsertFloatingFrameDialog::~SfxInsertFloatingFrameDialog() { - dispose(); + disposeOnce(); } void SfxInsertFloatingFrameDialog::dispose() diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index 75e85733940b..2451ad9e518d 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -47,7 +47,7 @@ SvxInsRowColDlg::SvxInsRowColDlg(vcl::Window* pParent, bool bCol, const OString& SvxInsRowColDlg::~SvxInsRowColDlg() { - dispose(); + disposeOnce(); } void SvxInsRowColDlg::dispose() diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 68a9c19b375b..e9811ab59977 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -145,7 +145,7 @@ SvBaseLinksDlg::SvBaseLinksDlg( vcl::Window * pParent, LinkManager* pMgr, bool b SvBaseLinksDlg::~SvBaseLinksDlg() { - dispose(); + disposeOnce(); } void SvBaseLinksDlg::dispose() diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index 72979c4464f6..72f627b3d8b9 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -224,7 +224,7 @@ SvxPathSelectDialog::SvxPathSelectDialog(vcl::Window* pParent) SvxMultiPathDialog::~SvxMultiPathDialog() { - dispose(); + disposeOnce(); } void SvxMultiPathDialog::dispose() @@ -247,7 +247,7 @@ void SvxMultiPathDialog::dispose() SvxPathSelectDialog::~SvxPathSelectDialog() { - dispose(); + disposeOnce(); } void SvxPathSelectDialog::dispose() diff --git a/cui/source/dialogs/newtabledlg.cxx b/cui/source/dialogs/newtabledlg.cxx index 3c2cba513fef..d6593687d8fd 100644 --- a/cui/source/dialogs/newtabledlg.cxx +++ b/cui/source/dialogs/newtabledlg.cxx @@ -30,7 +30,7 @@ SvxNewTableDialog::SvxNewTableDialog( vcl::Window* pParent ) SvxNewTableDialog::~SvxNewTableDialog() { - dispose(); + disposeOnce(); } void SvxNewTableDialog::dispose() diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index ad4e26bfc711..5d161aef4972 100644 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -153,7 +153,7 @@ PasswordToOpenModifyDialog::PasswordToOpenModifyDialog( PasswordToOpenModifyDialog::~PasswordToOpenModifyDialog() { - dispose(); + disposeOnce(); } void PasswordToOpenModifyDialog::dispose() diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx index f7ae8397c63b..ff6263a2587e 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -54,7 +54,7 @@ SvPasteObjectDialog::SvPasteObjectDialog( vcl::Window* pParent ) SvPasteObjectDialog::~SvPasteObjectDialog() { - dispose(); + disposeOnce(); } void SvPasteObjectDialog::dispose() diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index 175d889a1e71..c1e43e1939c4 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -124,7 +124,7 @@ SvxPostItDialog::SvxPostItDialog(vcl::Window* pParent, const SfxItemSet& rCoreSe SvxPostItDialog::~SvxPostItDialog() { - dispose(); + disposeOnce(); } void SvxPostItDialog::dispose() diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index a5db7a283c0b..0d01e9042d4e 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -101,7 +101,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSFTreeListBox(vcl::Win SFTreeListBox::~SFTreeListBox() { - dispose(); + disposeOnce(); } void SFTreeListBox::dispose() @@ -445,7 +445,7 @@ CuiInputDialog::CuiInputDialog(vcl::Window * pParent, sal_uInt16 nMode ) CuiInputDialog::~CuiInputDialog() { - dispose(); + disposeOnce(); } void CuiInputDialog::dispose() @@ -504,7 +504,7 @@ SvxScriptOrgDialog::SvxScriptOrgDialog( vcl::Window* pParent, const OUString& la SvxScriptOrgDialog::~SvxScriptOrgDialog() { - dispose(); + disposeOnce(); } void SvxScriptOrgDialog::dispose() diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx index a58c9417bffa..4c86ac4da191 100644 --- a/cui/source/dialogs/showcols.cxx +++ b/cui/source/dialogs/showcols.cxx @@ -41,7 +41,7 @@ FmShowColsDialog::FmShowColsDialog(vcl::Window* pParent) FmShowColsDialog::~FmShowColsDialog() { - dispose(); + disposeOnce(); } void FmShowColsDialog::dispose() diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx index 171ea3a1bdc9..c412265abdbb 100644 --- a/cui/source/dialogs/splitcelldlg.cxx +++ b/cui/source/dialogs/splitcelldlg.cxx @@ -55,7 +55,7 @@ SvxSplitTableDlg::SvxSplitTableDlg( vcl::Window *pParent, bool bIsTableVertical, SvxSplitTableDlg::~SvxSplitTableDlg() { - dispose(); + disposeOnce(); } void SvxSplitTableDlg::dispose() diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index 4d1541347c71..44976012dad2 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -64,7 +64,7 @@ SvxSearchFormatDialog::SvxSearchFormatDialog(vcl::Window* pParent, const SfxItem SvxSearchFormatDialog::~SvxSearchFormatDialog() { - dispose(); + disposeOnce(); } void SvxSearchFormatDialog::dispose() @@ -180,7 +180,7 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog(vcl::Window* pParent, SvxSearchAttributeDialog::~SvxSearchAttributeDialog() { - dispose(); + disposeOnce(); } void SvxSearchAttributeDialog::dispose() @@ -261,7 +261,7 @@ SvxSearchSimilarityDialog::SvxSearchSimilarityDialog SvxSearchSimilarityDialog::~SvxSearchSimilarityDialog() { - dispose(); + disposeOnce(); } void SvxSearchSimilarityDialog::dispose() diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 8a47ac55a292..953bbc7b0e69 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -68,7 +68,7 @@ LookUpComboBox::LookUpComboBox(vcl::Window *pParent) LookUpComboBox::~LookUpComboBox() { - dispose(); + disposeOnce(); } void LookUpComboBox::dispose() @@ -109,7 +109,7 @@ ReplaceEdit::ReplaceEdit(vcl::Window *pParent) ReplaceEdit::~ReplaceEdit() { - dispose(); + disposeOnce(); } void ReplaceEdit::dispose() @@ -193,7 +193,7 @@ void ThesaurusAlternativesCtrl::init(SvxThesaurusDialog *pDialog) ThesaurusAlternativesCtrl::~ThesaurusAlternativesCtrl() { - dispose(); + disposeOnce(); } void ThesaurusAlternativesCtrl::dispose() @@ -540,7 +540,7 @@ SvxThesaurusDialog::SvxThesaurusDialog( SvxThesaurusDialog::~SvxThesaurusDialog() { - dispose(); + disposeOnce(); } void SvxThesaurusDialog::dispose() diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index 451de5506da4..9dc2a8b606d0 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -290,7 +290,7 @@ SvxZoomDialog::SvxZoomDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet ) SvxZoomDialog::~SvxZoomDialog() { - dispose(); + disposeOnce(); } void SvxZoomDialog::dispose() diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx index d8137095b829..7ce171170875 100644 --- a/cui/source/options/certpath.cxx +++ b/cui/source/options/certpath.cxx @@ -144,7 +144,7 @@ OUString CertPathDialog::getDirectory() const CertPathDialog::~CertPathDialog() { - dispose(); + disposeOnce(); } void CertPathDialog::dispose() diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index ecb996322bee..a8ae9c686c9d 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -327,7 +327,7 @@ namespace offapp ConnectionPoolOptionsPage::~ConnectionPoolOptionsPage() { - dispose(); + disposeOnce(); } void ConnectionPoolOptionsPage::dispose() diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx index a911a1eaceee..805c8da68f70 100644 --- a/cui/source/options/cuisrchdlg.cxx +++ b/cui/source/options/cuisrchdlg.cxx @@ -62,7 +62,7 @@ SvxJSearchOptionsDialog::SvxJSearchOptionsDialog(vcl::Window *pParent, SvxJSearchOptionsDialog::~SvxJSearchOptionsDialog() { - dispose(); + disposeOnce(); } void SvxJSearchOptionsDialog::dispose() diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index d9822ac51f10..e719b47ca093 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -163,7 +163,7 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( vcl::Window* pParent, cons DbRegistrationOptionsPage::~DbRegistrationOptionsPage() { - dispose(); + disposeOnce(); } void DbRegistrationOptionsPage::dispose() diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx index 74e87425b1e5..7fbe47732ec7 100644 --- a/cui/source/options/doclinkdialog.cxx +++ b/cui/source/options/doclinkdialog.cxx @@ -72,7 +72,7 @@ namespace svx ODocumentLinkDialog::~ODocumentLinkDialog() { - dispose(); + disposeOnce(); } void ODocumentLinkDialog::dispose() diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index a19a8898e124..ae6a02c5fe54 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -138,7 +138,7 @@ SvTreeListEntry* SvxFontSubstTabPage::CreateEntry(OUString& rFont1, OUString& rF SvxFontSubstTabPage::~SvxFontSubstTabPage() { - dispose(); + disposeOnce(); } void SvxFontSubstTabPage::dispose() diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index 02d818438286..2e8be40b8109 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -166,7 +166,7 @@ CuiAboutConfigTabPage::CuiAboutConfigTabPage( vcl::Window* pParent/*, const SfxI CuiAboutConfigTabPage::~CuiAboutConfigTabPage() { - dispose(); + disposeOnce(); } void CuiAboutConfigTabPage::dispose() @@ -494,7 +494,7 @@ CuiAboutConfigValueDialog::CuiAboutConfigValueDialog( vcl::Window* pWindow, CuiAboutConfigValueDialog::~CuiAboutConfigValueDialog() { - dispose(); + disposeOnce(); } void CuiAboutConfigValueDialog::dispose() diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx index 61354e138c6b..d6b78b86555c 100644 --- a/cui/source/options/optaccessibility.cxx +++ b/cui/source/options/optaccessibility.cxx @@ -58,7 +58,7 @@ SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage(vcl::Window* pPar SvxAccessibilityOptionsTabPage::~SvxAccessibilityOptionsTabPage() { - dispose(); + disposeOnce(); } void SvxAccessibilityOptionsTabPage::dispose() diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 49b501572ce9..fb2dc014918a 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -151,7 +151,7 @@ SvxAsianLayoutPage::SvxAsianLayoutPage( vcl::Window* pParent, const SfxItemSet& SvxAsianLayoutPage::~SvxAsianLayoutPage() { - dispose(); + disposeOnce(); } void SvxAsianLayoutPage::dispose() diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx index 1be35826d5d5..fdc362a0c14c 100644 --- a/cui/source/options/optbasic.cxx +++ b/cui/source/options/optbasic.cxx @@ -47,7 +47,7 @@ SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage( vcl::Window* pParent, const SfxI SvxBasicIDEOptionsPage::~SvxBasicIDEOptionsPage() { - dispose(); + disposeOnce(); } void SvxBasicIDEOptionsPage::dispose() diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index 7cb85b4fe9f1..9ca96f9b10a9 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -83,7 +83,7 @@ SvxDefaultColorOptPage::SvxDefaultColorOptPage(vcl::Window* pParent, const SfxIt SvxDefaultColorOptPage::~SvxDefaultColorOptPage() { - dispose(); + disposeOnce(); } void SvxDefaultColorOptPage::dispose() diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 08d7d9059b61..bce0bfbb96ca 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -174,7 +174,7 @@ class ColorConfigWindow_Impl { public: ColorConfigWindow_Impl(vcl::Window* pParent); - virtual ~ColorConfigWindow_Impl() { dispose(); } + virtual ~ColorConfigWindow_Impl() { disposeOnce(); } virtual void dispose() SAL_OVERRIDE; public: @@ -915,7 +915,7 @@ void ColorConfigCtrl_Impl::InitHeaderBar(const OUString &rOn, const OUString &rU ColorConfigCtrl_Impl::~ColorConfigCtrl_Impl() { - dispose(); + disposeOnce(); } void ColorConfigCtrl_Impl::dispose() @@ -1067,7 +1067,7 @@ SvxColorOptionsTabPage::SvxColorOptionsTabPage( SvxColorOptionsTabPage::~SvxColorOptionsTabPage() { - dispose(); + disposeOnce(); } void SvxColorOptionsTabPage::dispose() diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx index 40203d831f41..ab25dfd141e9 100644 --- a/cui/source/options/optctl.cxx +++ b/cui/source/options/optctl.cxx @@ -59,7 +59,7 @@ SvxCTLOptionsPage::SvxCTLOptionsPage( vcl::Window* pParent, const SfxItemSet& rS SvxCTLOptionsPage::~SvxCTLOptionsPage() { - dispose(); + disposeOnce(); } void SvxCTLOptionsPage::dispose() diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index d48e9a5fa348..02390097a49a 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -119,7 +119,7 @@ SvxNewDictionaryDialog::SvxNewDictionaryDialog( vcl::Window* pParent, SvxNewDictionaryDialog::~SvxNewDictionaryDialog() { - dispose(); + disposeOnce(); } void SvxNewDictionaryDialog::dispose() @@ -346,7 +346,7 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog( SvxEditDictionaryDialog::~SvxEditDictionaryDialog() { - dispose(); + disposeOnce(); } void SvxEditDictionaryDialog::dispose() diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 65953a886a0a..29b1eacfe9d3 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -56,7 +56,7 @@ OfaMSFilterTabPage::OfaMSFilterTabPage(vcl::Window* pParent, const SfxItemSet& r OfaMSFilterTabPage::~OfaMSFilterTabPage() { - dispose(); + disposeOnce(); } void OfaMSFilterTabPage::dispose() @@ -178,7 +178,7 @@ OfaMSFilterTabPage2::OfaMSFilterTabPage2( vcl::Window* pParent, const SfxItemSet OfaMSFilterTabPage2::~OfaMSFilterTabPage2() { - dispose(); + disposeOnce(); } void OfaMSFilterTabPage2::dispose() diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index dabfc6b8fdb1..ceb7c2f35bda 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -309,7 +309,7 @@ OfaMiscTabPage::OfaMiscTabPage(vcl::Window* pParent, const SfxItemSet& rSet) OfaMiscTabPage::~OfaMiscTabPage() { - dispose(); + disposeOnce(); } void OfaMiscTabPage::dispose() @@ -703,7 +703,7 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const SfxItemSet& rSet) OfaViewTabPage::~OfaViewTabPage() { - dispose(); + disposeOnce(); } void OfaViewTabPage::dispose() @@ -1248,7 +1248,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(vcl::Window* pParent, const SfxItemSet& OfaLanguagesTabPage::~OfaLanguagesTabPage() { - dispose(); + disposeOnce(); } void OfaLanguagesTabPage::dispose() diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index 9d6afd387479..5986df31380e 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -221,7 +221,7 @@ SvxGeneralTabPage::SvxGeneralTabPage(vcl::Window* pParent, const SfxItemSet& rCo SvxGeneralTabPage::~SvxGeneralTabPage() { - dispose(); + disposeOnce(); } void SvxGeneralTabPage::dispose() diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index 34d7fff2d462..8860af692b7d 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -86,7 +86,7 @@ SfxTabPage( pParent, "OptHtmlPage" , "cui/ui/opthtmlpage.ui", &rSet ) OfaHtmlTabPage::~OfaHtmlTabPage() { - dispose(); + disposeOnce(); } void OfaHtmlTabPage::dispose() diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 490b41c2ae4b..f92b13c3a105 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -217,7 +217,7 @@ SvxProxyTabPage::SvxProxyTabPage(vcl::Window* pParent, const SfxItemSet& rSet) SvxProxyTabPage::~SvxProxyTabPage() { - dispose(); + disposeOnce(); } void SvxProxyTabPage::dispose() @@ -649,7 +649,7 @@ SvxSecurityTabPage::SvxSecurityTabPage(vcl::Window* pParent, const SfxItemSet& r SvxSecurityTabPage::~SvxSecurityTabPage() { - dispose(); + disposeOnce(); } void SvxSecurityTabPage::dispose() @@ -1011,7 +1011,7 @@ SvxEMailTabPage::SvxEMailTabPage(vcl::Window* pParent, const SfxItemSet& rSet) SvxEMailTabPage::~SvxEMailTabPage() { - dispose(); + disposeOnce(); } void SvxEMailTabPage::dispose() diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 7cd9977e3913..7a2334a5b8b9 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -202,7 +202,7 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( vcl::Window* pParent, const SfxItemSet& SvxJavaOptionsPage::~SvxJavaOptionsPage() { - dispose(); + disposeOnce(); } void SvxJavaOptionsPage::dispose() @@ -823,7 +823,7 @@ SvxJavaParameterDlg::SvxJavaParameterDlg( vcl::Window* pParent ) : SvxJavaParameterDlg::~SvxJavaParameterDlg() { - dispose(); + disposeOnce(); } void SvxJavaParameterDlg::dispose() @@ -962,7 +962,7 @@ SvxJavaClassPathDlg::SvxJavaClassPathDlg(vcl::Window* pParent) SvxJavaClassPathDlg::~SvxJavaClassPathDlg() { - dispose(); + disposeOnce(); } void SvxJavaClassPathDlg::dispose() diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx index 263405d1322e..4b1696fbeb54 100644 --- a/cui/source/options/optjsearch.cxx +++ b/cui/source/options/optjsearch.cxx @@ -57,7 +57,7 @@ SvxJSearchOptionsPage::SvxJSearchOptionsPage( vcl::Window* pParent, const SfxIte SvxJSearchOptionsPage::~SvxJSearchOptionsPage() { - dispose(); + disposeOnce(); } void SvxJSearchOptionsPage::dispose() diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 9c357e682d8d..53b3051bb07c 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -364,7 +364,7 @@ public: get(m_pBreakNF, "wordlength"); } } - virtual ~OptionsBreakSet() { dispose(); } + virtual ~OptionsBreakSet() { disposeOnce(); } virtual void dispose() SAL_OVERRIDE { m_pBeforeFrame.clear(); @@ -1131,7 +1131,7 @@ SvxLinguTabPage::SvxLinguTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) SvxLinguTabPage::~SvxLinguTabPage() { - dispose(); + disposeOnce(); } void SvxLinguTabPage::dispose() @@ -1918,7 +1918,7 @@ SvxEditModulesDlg::SvxEditModulesDlg(vcl::Window* pParent, SvxLinguData_Impl& rD SvxEditModulesDlg::~SvxEditModulesDlg() { - dispose(); + disposeOnce(); } void SvxEditModulesDlg::dispose() diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index 79a86d9d6f69..0dc00ee33168 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -143,7 +143,7 @@ OfaMemoryOptionsPage::OfaMemoryOptionsPage(vcl::Window* pParent, const SfxItemSe OfaMemoryOptionsPage::~OfaMemoryOptionsPage() { - dispose(); + disposeOnce(); } void OfaMemoryOptionsPage::dispose() diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx index bd8c7846002b..4454823969f7 100644 --- a/cui/source/options/optopencl.cxx +++ b/cui/source/options/optopencl.cxx @@ -119,7 +119,7 @@ void SvxOpenCLTabPage::dispose() SvxOpenCLTabPage::~SvxOpenCLTabPage() { - dispose(); + disposeOnce(); } void SvxOpenCLTabPage::dispose() @@ -232,7 +232,7 @@ public: DECL_LINK(EditModifiedHdl, Edit*); ListEntryDialog(vcl::Window* pParent, const OpenCLConfig::ImplMatcher& rEntry, const OString& rTag); - virtual ~ListEntryDialog() { dispose(); } + virtual ~ListEntryDialog() { disposeOnce(); } virtual void dispose() SAL_OVERRIDE { mpOS.clear(); diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 39e94a02efe5..8b1e967136d4 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -247,7 +247,7 @@ SvxPathTabPage::SvxPathTabPage(vcl::Window* pParent, const SfxItemSet& rSet) SvxPathTabPage::~SvxPathTabPage() { - dispose(); + disposeOnce(); } void SvxPathTabPage::dispose() diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index 8da1a6cbf11f..a8a9280b7dd3 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -199,7 +199,7 @@ SfxSaveTabPage::SfxSaveTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet SfxSaveTabPage::~SfxSaveTabPage() { - dispose(); + disposeOnce(); } void SvxSaveTabPage::dispose() diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 30eb7188e71f..536e444c85e5 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -84,7 +84,7 @@ SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage(vcl::Window* pParent, const SfxIt SvxOnlineUpdateTabPage::~SvxOnlineUpdateTabPage() { - dispose(); + disposeOnce(); } void SvxOnlineUpdateTabPage::dispose() diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index e6d73e4dd044..a232cea5e516 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -94,7 +94,7 @@ SelectPersonaDialog::SelectPersonaDialog( vcl::Window *pParent ) SelectPersonaDialog::~SelectPersonaDialog() { - dispose(); + disposeOnce(); } void SelectPersonaDialog::dispose() @@ -312,7 +312,7 @@ SvxPersonalizationTabPage::SvxPersonalizationTabPage( vcl::Window *pParent, cons SvxPersonalizationTabPage::~SvxPersonalizationTabPage() { - dispose(); + disposeOnce(); } void SvxPersonalizationTabPage::dispose() diff --git a/cui/source/options/securityoptions.cxx b/cui/source/options/securityoptions.cxx index 5071769e2c40..aea7fd280645 100644 --- a/cui/source/options/securityoptions.cxx +++ b/cui/source/options/securityoptions.cxx @@ -74,7 +74,7 @@ SecurityOptionsDialog::SecurityOptionsDialog(vcl::Window* pParent, SvtSecurityOp SecurityOptionsDialog::~SecurityOptionsDialog() { - dispose(); + disposeOnce(); } void SecurityOptionsDialog::dispose() diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index e45cbc823974..6262d24f2f9e 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -552,7 +552,7 @@ OfaTreeOptionsDialog::OfaTreeOptionsDialog( vcl::Window* pParent, const OUString OfaTreeOptionsDialog::~OfaTreeOptionsDialog() { - dispose(); + disposeOnce(); } void OfaTreeOptionsDialog::dispose() @@ -2168,7 +2168,7 @@ ExtensionsTabPage::ExtensionsTabPage( ExtensionsTabPage::~ExtensionsTabPage() { - dispose(); + disposeOnce(); } void ExtensionsTabPage::dispose() diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index d114fe9eace5..f6d6cd5e9e40 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -142,7 +142,7 @@ WebConnectionInfoDialog::WebConnectionInfoDialog(vcl::Window* pParent) WebConnectionInfoDialog::~WebConnectionInfoDialog() { - dispose(); + disposeOnce(); } void WebConnectionInfoDialog::dispose() diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index ada97c51da63..9c0f52d6789b 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -250,7 +250,7 @@ AlignmentTabPage::AlignmentTabPage( vcl::Window* pParent, const SfxItemSet& rCor AlignmentTabPage::~AlignmentTabPage() { - dispose(); + disposeOnce(); } void AlignmentTabPage::dispose() diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 346fc8b342e9..49bf4d58e367 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -139,7 +139,7 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(vcl::Window* pParent, const SfxItemSet* _pSet ) OfaAutoCorrDlg::~OfaAutoCorrDlg() { - dispose(); + disposeOnce(); } void OfaAutoCorrDlg::dispose() @@ -206,7 +206,7 @@ OfaAutocorrOptionsPage::OfaAutocorrOptionsPage(vcl::Window* pParent, const SfxIt OfaAutocorrOptionsPage::~OfaAutocorrOptionsPage() { - dispose(); + disposeOnce(); } void OfaAutocorrOptionsPage::dispose() @@ -312,7 +312,7 @@ public: { get(m_pPrcntMF, "margin"); } - virtual ~OfaAutoFmtPrcntSet() { dispose(); } + virtual ~OfaAutoFmtPrcntSet() { disposeOnce(); } virtual void dispose() SAL_OVERRIDE { m_pPrcntMF.clear(); ModalDialog::dispose(); } MetricField& GetPrcntFld() @@ -495,7 +495,7 @@ SvTreeListEntry* OfaSwAutoFmtOptionsPage::CreateEntry(OUString& rTxt, sal_uInt16 OfaSwAutoFmtOptionsPage::~OfaSwAutoFmtOptionsPage() { - dispose(); + disposeOnce(); } void OfaSwAutoFmtOptionsPage::dispose() @@ -934,7 +934,7 @@ void OfaAutocorrReplacePage::Resize() OfaAutocorrReplacePage::~OfaAutocorrReplacePage() { - dispose(); + disposeOnce(); } void OfaAutocorrReplacePage::dispose() @@ -1452,7 +1452,7 @@ OfaAutocorrExceptPage::OfaAutocorrExceptPage(vcl::Window* pParent, const SfxItem OfaAutocorrExceptPage::~OfaAutocorrExceptPage() { - dispose(); + disposeOnce(); } void OfaAutocorrExceptPage::dispose() @@ -1885,7 +1885,7 @@ OfaQuoteTabPage::OfaQuoteTabPage(vcl::Window* pParent, const SfxItemSet& rSet) OfaQuoteTabPage::~OfaQuoteTabPage() { - dispose(); + disposeOnce(); } void OfaQuoteTabPage::dispose() @@ -2231,7 +2231,7 @@ OfaAutoCompleteTabPage::OfaAutoCompleteTabPage(vcl::Window* pParent, OfaAutoCompleteTabPage::~OfaAutoCompleteTabPage() { - dispose(); + disposeOnce(); } void OfaAutoCompleteTabPage::dispose() @@ -2424,7 +2424,7 @@ void OfaAutoCompleteTabPage::CopyToClipboard() const OfaAutoCompleteTabPage::AutoCompleteMultiListBox::~AutoCompleteMultiListBox() { - dispose(); + disposeOnce(); } void OfaAutoCompleteTabPage::AutoCompleteMultiListBox::dispose() @@ -2496,7 +2496,7 @@ OfaSmartTagOptionsTabPage::OfaSmartTagOptionsTabPage( vcl::Window* pParent, OfaSmartTagOptionsTabPage::~OfaSmartTagOptionsTabPage() { - dispose(); + disposeOnce(); } void OfaSmartTagOptionsTabPage::dispose() diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 0771bcd816f3..13d7a2d8a883 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -231,7 +231,7 @@ void BackgroundPreviewImpl::setBmp(bool bBmp) BackgroundPreviewImpl::~BackgroundPreviewImpl() { - dispose(); + disposeOnce(); } void BackgroundPreviewImpl::dispose() @@ -429,7 +429,7 @@ SvxBackgroundTabPage::SvxBackgroundTabPage(vcl::Window* pParent, const SfxItemSe SvxBackgroundTabPage::~SvxBackgroundTabPage() { - dispose(); + disposeOnce(); } void SvxBackgroundTabPage::dispose() diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 40788336ab58..8fbd975a026f 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -336,7 +336,7 @@ SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent, const SfxItemSet& rCore SvxBorderTabPage::~SvxBorderTabPage() { - dispose(); + disposeOnce(); } void SvxBorderTabPage::dispose() diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 37c96344822f..7e86557c1d1b 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -185,7 +185,7 @@ SvxCharBasePage::SvxCharBasePage(vcl::Window* pParent, const OString& rID, const SvxCharBasePage::~SvxCharBasePage() { - dispose(); + disposeOnce(); } void SvxCharBasePage::dispose() @@ -379,7 +379,7 @@ SvxCharNamePage::SvxCharNamePage( vcl::Window* pParent, const SfxItemSet& rInSet SvxCharNamePage::~SvxCharNamePage() { - dispose(); + disposeOnce(); } void SvxCharNamePage::dispose() @@ -1378,7 +1378,7 @@ SvxCharEffectsPage::SvxCharEffectsPage( vcl::Window* pParent, const SfxItemSet& SvxCharEffectsPage::~SvxCharEffectsPage() { - dispose(); + disposeOnce(); } void SvxCharEffectsPage::dispose() @@ -2651,7 +2651,7 @@ SvxCharPositionPage::SvxCharPositionPage( vcl::Window* pParent, const SfxItemSet SvxCharPositionPage::~SvxCharPositionPage() { - dispose(); + disposeOnce(); } void SvxCharPositionPage::dispose() @@ -3410,7 +3410,7 @@ SvxCharTwoLinesPage::SvxCharTwoLinesPage(vcl::Window* pParent, const SfxItemSet& SvxCharTwoLinesPage::~SvxCharTwoLinesPage() { - dispose(); + disposeOnce(); } void SvxCharTwoLinesPage::dispose() diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index de8cce55975f..fdde38596d96 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -133,7 +133,7 @@ SvxConnectionPage::SvxConnectionPage( vcl::Window* pWindow, const SfxItemSet& rI SvxConnectionPage::~SvxConnectionPage() { - dispose(); + disposeOnce(); } void SvxConnectionPage::dispose() diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx index c82c33f0fab7..3a001d109cd4 100644 --- a/cui/source/tabpages/dstribut.cxx +++ b/cui/source/tabpages/dstribut.cxx @@ -43,7 +43,7 @@ SvxDistributeDialog::SvxDistributeDialog(vcl::Window* pParent, SvxDistributeDialog::~SvxDistributeDialog() { - dispose(); + disposeOnce(); } void SvxDistributeDialog::dispose() @@ -81,7 +81,7 @@ SvxDistributePage::SvxDistributePage(vcl::Window* pWindow, SvxDistributePage::~SvxDistributePage() { - dispose(); + disposeOnce(); } void SvxDistributePage::dispose() diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index a1294a536cc8..4687eff73055 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -127,7 +127,7 @@ SvxGrfCropPage::SvxGrfCropPage ( vcl::Window *pParent, const SfxItemSet &rSet ) SvxGrfCropPage::~SvxGrfCropPage() { - dispose(); + disposeOnce(); } void SvxGrfCropPage::dispose() diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index 1f9c31d46e3e..b2ffa267d3c0 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -140,7 +140,7 @@ SvxCaptionTabPage::SvxCaptionTabPage(vcl::Window* pParent, const SfxItemSet& rIn SvxCaptionTabPage::~SvxCaptionTabPage() { - dispose(); + disposeOnce(); } void SvxCaptionTabPage::dispose() diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 4bc1917a8fde..17a3930edaed 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -143,7 +143,7 @@ _SfxMacroTabPage::_SfxMacroTabPage(vcl::Window* pParent, const SfxItemSet& rAttr _SfxMacroTabPage::~_SfxMacroTabPage() { - dispose(); + disposeOnce(); } void _SfxMacroTabPage::dispose() diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index ee178dcf9ce1..05f690c2b3b4 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -150,7 +150,7 @@ SvxMeasurePage::SvxMeasurePage( vcl::Window* pWindow, const SfxItemSet& rInAttrs SvxMeasurePage::~SvxMeasurePage() { - dispose(); + disposeOnce(); } void SvxMeasurePage::dispose() diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 9b8b85bb56f7..15edecd1dc9a 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -282,7 +282,7 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage(vcl::Window* pParent, SvxNumberFormatTabPage::~SvxNumberFormatTabPage() { - dispose(); + disposeOnce(); } diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 3c0c619859e0..640ba9cb29a0 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -219,7 +219,7 @@ SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(vcl::Window* pParent, SvxSingleNumPickTabPage::~SvxSingleNumPickTabPage() { - dispose(); + disposeOnce(); } void SvxSingleNumPickTabPage::dispose() @@ -389,7 +389,7 @@ SvxBulletPickTabPage::SvxBulletPickTabPage(vcl::Window* pParent, SvxBulletPickTabPage::~SvxBulletPickTabPage() { - dispose(); + disposeOnce(); } void SvxBulletPickTabPage::dispose() @@ -595,7 +595,7 @@ SvxNumPickTabPage::SvxNumPickTabPage(vcl::Window* pParent, SvxNumPickTabPage::~SvxNumPickTabPage() { - dispose(); + disposeOnce(); } void SvxNumPickTabPage::dispose() @@ -845,7 +845,7 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(vcl::Window* pParent, SvxBitmapPickTabPage::~SvxBitmapPickTabPage() { - dispose(); + disposeOnce(); } void SvxBitmapPickTabPage::dispose() @@ -1162,7 +1162,7 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(vcl::Window* pParent, SvxNumOptionsTabPage::~SvxNumOptionsTabPage() { - dispose(); + disposeOnce(); } void SvxNumOptionsTabPage::dispose() @@ -2764,7 +2764,7 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(vcl::Window* pParent, SvxNumPositionTabPage::~SvxNumPositionTabPage() { - dispose(); + disposeOnce(); } void SvxNumPositionTabPage::dispose() diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index fb67d8b445d7..520332ada3e7 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -366,7 +366,7 @@ SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rAttr SvxPageDescPage::~SvxPageDescPage() { - dispose(); + disposeOnce(); } void SvxPageDescPage::dispose() diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index d8ecedeb5220..7bff769be6e8 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -656,7 +656,7 @@ SvxStdParagraphTabPage::SvxStdParagraphTabPage( vcl::Window* pParent, const Sfx SvxStdParagraphTabPage::~SvxStdParagraphTabPage() { - dispose(); + disposeOnce(); } void SvxStdParagraphTabPage::dispose() @@ -1041,7 +1041,7 @@ SvxParaAlignTabPage::SvxParaAlignTabPage( vcl::Window* pParent, const SfxItemSet SvxParaAlignTabPage::~SvxParaAlignTabPage() { - dispose(); + disposeOnce(); } void SvxParaAlignTabPage::dispose() @@ -1945,7 +1945,7 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage( vcl::Window* pParent, const SfxI SvxExtParagraphTabPage::~SvxExtParagraphTabPage() { - dispose(); + disposeOnce(); } void SvxExtParagraphTabPage::dispose() @@ -2181,7 +2181,7 @@ SvxAsianTabPage::SvxAsianTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) SvxAsianTabPage::~SvxAsianTabPage() { - dispose(); + disposeOnce(); } void SvxAsianTabPage::dispose() diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index d9c26b4bcbfd..bbe6bcbb4fff 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -590,7 +590,7 @@ SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(vcl::Window* pParent, const SfxItemSet& SvxSwPosSizeTabPage::~SvxSwPosSizeTabPage() { - dispose(); + disposeOnce(); } void SvxSwPosSizeTabPage::dispose() diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 3820ea8d32e8..56591202b702 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -50,10 +50,10 @@ public: , nTabStyle(0) { } - virtual ~TabWin_Impl() { dispose(); } + virtual ~TabWin_Impl() { disposeOnce(); } virtual void dispose() SAL_OVERRIDE { mpPage.clear(); vcl::Window::dispose(); } - virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; void SetTabulatorTabPage(SvxTabulatorTabPage* pPage) { mpPage = pPage; } void SetTabStyle(sal_uInt16 nStyle) {nTabStyle = nStyle; } @@ -189,7 +189,7 @@ SvxTabulatorTabPage::SvxTabulatorTabPage( vcl::Window* pParent, const SfxItemSet SvxTabulatorTabPage::~SvxTabulatorTabPage() { - dispose(); + disposeOnce(); } void SvxTabulatorTabPage::dispose() diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index 45d48ecdaf35..05bc698b3caa 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -124,7 +124,7 @@ SvxTextAnimationPage::SvxTextAnimationPage( vcl::Window* pWindow, const SfxItemS SvxTextAnimationPage::~SvxTextAnimationPage() { - dispose(); + disposeOnce(); } void SvxTextAnimationPage::dispose() diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index de0eeab1be24..6345e4593ed1 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -98,7 +98,7 @@ SvxTextAttrPage::SvxTextAttrPage(vcl::Window* pWindow, const SfxItemSet& rInAttr SvxTextAttrPage::~SvxTextAttrPage() { - dispose(); + disposeOnce(); } void SvxTextAttrPage::dispose() diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 9f13a52d928b..7c2090ded426 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -120,7 +120,7 @@ IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransGradientHdl_Impl) SvxTransparenceTabPage::~SvxTransparenceTabPage() { - dispose(); + disposeOnce(); } void SvxTransparenceTabPage::dispose() @@ -797,7 +797,7 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs SvxAreaTabPage::~SvxAreaTabPage() { - dispose(); + disposeOnce(); } void SvxAreaTabPage::dispose() diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 59e1b8b03e22..5fb5b018282f 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -122,7 +122,7 @@ SvxBitmapTabPage::SvxBitmapTabPage( vcl::Window* pParent, const SfxItemSet& rIn SvxBitmapTabPage::~SvxBitmapTabPage() { - dispose(); + disposeOnce(); } void SvxBitmapTabPage::dispose() diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index b9c73e424f26..4b83e77a5963 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -397,7 +397,7 @@ SvxColorTabPage::SvxColorTabPage(vcl::Window* pParent, const SfxItemSet& rInAttr SvxColorTabPage::~SvxColorTabPage() { - dispose(); + disposeOnce(); } void SvxColorTabPage::dispose() diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 4713c93e2097..064c02375e9c 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -141,7 +141,7 @@ SvxGradientTabPage::SvxGradientTabPage SvxGradientTabPage::~SvxGradientTabPage() { - dispose(); + disposeOnce(); } void SvxGradientTabPage::dispose() diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 2022fed19ea5..1a2f42be788f 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -139,7 +139,7 @@ SvxHatchTabPage::SvxHatchTabPage SvxHatchTabPage::~SvxHatchTabPage() { - dispose(); + disposeOnce(); } void SvxHatchTabPage::dispose() diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 8bc7abd4d22d..26e5c4422911 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -230,7 +230,7 @@ void SvxLineTabPage::ShowSymbolControls(bool bOn) SvxLineTabPage::~SvxLineTabPage() { - dispose(); + disposeOnce(); } void SvxLineTabPage::dispose() diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 0d84db38fa2e..df5c92108561 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -156,7 +156,7 @@ SvxLineDefTabPage::SvxLineDefTabPage SvxLineDefTabPage::~SvxLineDefTabPage() { - dispose(); + disposeOnce(); } void SvxLineDefTabPage::dispose() diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 4163b575a8f0..6d36cfed0ad0 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -107,7 +107,7 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage SvxLineEndDefTabPage::~SvxLineEndDefTabPage() { - dispose(); + disposeOnce(); } void SvxLineEndDefTabPage::dispose() diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 6b3f38eb19f9..945f8f0a424d 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -167,7 +167,7 @@ SvxShadowTabPage::SvxShadowTabPage( vcl::Window* pParent, const SfxItemSet& rInA SvxShadowTabPage::~SvxShadowTabPage() { - dispose(); + disposeOnce(); } void SvxShadowTabPage::dispose() diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 31a5bbb974c3..e820692cee8f 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -199,7 +199,7 @@ SvxAngleTabPage::SvxAngleTabPage(vcl::Window* pParent, const SfxItemSet& rInAttr SvxAngleTabPage::~SvxAngleTabPage() { - dispose(); + disposeOnce(); } void SvxAngleTabPage::dispose() @@ -441,7 +441,7 @@ SvxSlantTabPage::SvxSlantTabPage(vcl::Window* pParent, const SfxItemSet& rInAttr SvxSlantTabPage::~SvxSlantTabPage() { - dispose(); + disposeOnce(); } void SvxSlantTabPage::dispose() @@ -670,7 +670,7 @@ SvxPositionSizeTabPage::SvxPositionSizeTabPage(vcl::Window* pParent, const SfxIt SvxPositionSizeTabPage::~SvxPositionSizeTabPage() { - dispose(); + disposeOnce(); } void SvxPositionSizeTabPage::dispose() |