diff options
Diffstat (limited to 'sd')
49 files changed, 67 insertions, 60 deletions
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 200e62b432a1..ab64b187142c 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -484,7 +484,7 @@ SdPublishingDlg::SdPublishingDlg(vcl::Window* pWindow, DocumentType eDocType) SdPublishingDlg::~SdPublishingDlg() { - dispose(); + disposeOnce(); } void SdPublishingDlg::dispose() @@ -1634,7 +1634,7 @@ SdDesignNameDlg::SdDesignNameDlg(vcl::Window* pWindow, const OUString& aName) SdDesignNameDlg::~SdDesignNameDlg() { - dispose(); + disposeOnce(); } void SdDesignNameDlg::dispose() diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index 358ce0705cc9..9beb864dec37 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -297,7 +297,7 @@ CustomAnimationCreateTabPage::CustomAnimationCreateTabPage( vcl::Window* pParent CustomAnimationCreateTabPage::~CustomAnimationCreateTabPage() { - dispose(); + disposeOnce(); } void CustomAnimationCreateTabPage::dispose() @@ -544,7 +544,7 @@ CustomAnimationCreateDialog::CustomAnimationCreateDialog( vcl::Window* pParent, CustomAnimationCreateDialog::~CustomAnimationCreateDialog() { - dispose(); + disposeOnce(); } void CustomAnimationCreateDialog::dispose() diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index b493eca77b42..a21d4f67b53e 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -351,7 +351,7 @@ DropdownMenuBox::DropdownMenuBox( vcl::Window* pParent, Edit* pSubControl, Popup DropdownMenuBox::~DropdownMenuBox() { - dispose(); + disposeOnce(); } void DropdownMenuBox::dispose() @@ -1263,7 +1263,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( vcl::Window* pParent CustomAnimationEffectTabPage::~CustomAnimationEffectTabPage() { - dispose(); + disposeOnce(); } void CustomAnimationEffectTabPage::dispose() @@ -1787,7 +1787,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(vcl::Window* pPar CustomAnimationDurationTabPage::~CustomAnimationDurationTabPage() { - dispose(); + disposeOnce(); } void CustomAnimationDurationTabPage::dispose() @@ -2077,7 +2077,7 @@ CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(vcl::Window* pPar CustomAnimationTextAnimTabPage::~CustomAnimationTextAnimTabPage() { - dispose(); + disposeOnce(); } void CustomAnimationTextAnimTabPage::dispose() @@ -2207,7 +2207,7 @@ CustomAnimationDialog::CustomAnimationDialog(vcl::Window* pParent, STLPropertySe CustomAnimationDialog::~CustomAnimationDialog() { - dispose(); + disposeOnce(); } void CustomAnimationDialog::dispose() @@ -2298,7 +2298,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makePropertyControl( vcl:: PropertyControl::~PropertyControl() { - dispose(); + disposeOnce(); } void PropertyControl::dispose() diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index 24bf4e892471..dd4441aeebfb 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -444,7 +444,7 @@ const Image& CustomAnimationList::getImage( sal_uInt16 nId ) CustomAnimationList::~CustomAnimationList() { - dispose(); + disposeOnce(); } void CustomAnimationList::dispose() diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index c83dc7155be2..78e83a0992af 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -225,7 +225,7 @@ CustomAnimationPane::CustomAnimationPane( Window* pParent, ViewShellBase& rBase, CustomAnimationPane::~CustomAnimationPane() { - dispose(); + disposeOnce(); } void CustomAnimationPane::dispose() diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index ce7e18773e43..370ef4964297 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -483,7 +483,7 @@ SlideTransitionPane::SlideTransitionPane( SlideTransitionPane::~SlideTransitionPane() { - dispose(); + disposeOnce(); } void SlideTransitionPane::dispose() diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index f17151d0e6df..7ca80ef9456e 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -118,7 +118,7 @@ AnnotationTextWindow::AnnotationTextWindow( AnnotationWindow* pParent, WinBits n AnnotationTextWindow::~AnnotationTextWindow() { - dispose(); + disposeOnce(); } void AnnotationTextWindow::dispose() @@ -291,7 +291,7 @@ AnnotationWindow::AnnotationWindow( AnnotationManagerImpl& rManager, DrawDocShel AnnotationWindow::~AnnotationWindow() { - dispose(); + disposeOnce(); } void AnnotationWindow::dispose() diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 53a7d6d87714..2b6b00e91ffa 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -257,7 +257,7 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const LayoutToolbarMenu::~LayoutToolbarMenu() { - dispose(); + disposeOnce(); } void LayoutToolbarMenu::dispose() diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx index 5a81ddcf72db..2f79921609e9 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx @@ -76,7 +76,7 @@ SdPhotoAlbumDialog::SdPhotoAlbumDialog(vcl::Window* pWindow, SdDrawDocument* pAc SdPhotoAlbumDialog::~SdPhotoAlbumDialog() { - dispose(); + disposeOnce(); } void SdPhotoAlbumDialog::dispose() diff --git a/sd/source/ui/dlg/RemoteDialog.cxx b/sd/source/ui/dlg/RemoteDialog.cxx index 625cc04cd7f4..62c9d3eaffe7 100644 --- a/sd/source/ui/dlg/RemoteDialog.cxx +++ b/sd/source/ui/dlg/RemoteDialog.cxx @@ -32,7 +32,7 @@ RemoteDialog::RemoteDialog( vcl::Window *pWindow ) RemoteDialog::~RemoteDialog() { - dispose(); + disposeOnce(); } void RemoteDialog::dispose() diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx index 3853a98d0dbe..842ffd1430be 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx @@ -124,7 +124,7 @@ Size ClientBox::GetOptimalSize() const ClientBox::~ClientBox() { - dispose(); + disposeOnce(); } void ClientBox::dispose() diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index e6fb2655a1b4..a5d0109c5887 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -206,7 +206,7 @@ AnimationWindow::AnimationWindow(SfxBindings* pInBindings, SfxChildWindow *pCW, AnimationWindow::~AnimationWindow() { - dispose(); + disposeOnce(); } void AnimationWindow::dispose() diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx index fa6b4e1e17eb..2bd293b12059 100644 --- a/sd/source/ui/dlg/brkdlg.cxx +++ b/sd/source/ui/dlg/brkdlg.cxx @@ -67,7 +67,7 @@ BreakDlg::BreakDlg( BreakDlg::~BreakDlg() { - dispose(); + disposeOnce(); } void BreakDlg::dispose() diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx index 7fcd27804f12..b87f58e0908c 100644 --- a/sd/source/ui/dlg/copydlg.cxx +++ b/sd/source/ui/dlg/copydlg.cxx @@ -84,7 +84,7 @@ CopyDlg::CopyDlg(vcl::Window* pWindow, const SfxItemSet& rInAttrs, CopyDlg::~CopyDlg() { - dispose(); + disposeOnce(); } void CopyDlg::dispose() diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index 95132d4c5e4f..b6c290586403 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -85,7 +85,7 @@ SdCustomShowDlg::SdCustomShowDlg( vcl::Window* pWindow, SdCustomShowDlg::~SdCustomShowDlg() { - dispose(); + disposeOnce(); } void SdCustomShowDlg::dispose() @@ -351,7 +351,7 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg( vcl::Window* pWindow, SdDefineCustomShowDlg::~SdDefineCustomShowDlg() { - dispose(); + disposeOnce(); } void SdDefineCustomShowDlg::dispose() diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index bec74ca9a16f..8e90d3123eba 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -1769,7 +1769,7 @@ IMPL_LINK_NOARG(AssistentDlg, FinishHdl) AssistentDlg::~AssistentDlg() { - dispose(); + disposeOnce(); } void AssistentDlg::dispose() diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx index 331c1afb0ddb..652a2b232c26 100644 --- a/sd/source/ui/dlg/dlgassim.cxx +++ b/sd/source/ui/dlg/dlgassim.cxx @@ -78,7 +78,7 @@ IMPL_LINK_NOARG(SdPageListControl, CheckButtonClickHdl) SdPageListControl::~SdPageListControl() { - dispose(); + disposeOnce(); } void SdPageListControl::dispose() diff --git a/sd/source/ui/dlg/dlgctrls.cxx b/sd/source/ui/dlg/dlgctrls.cxx index 0fc35a678fc2..cb9df95d7261 100644 --- a/sd/source/ui/dlg/dlgctrls.cxx +++ b/sd/source/ui/dlg/dlgctrls.cxx @@ -40,7 +40,7 @@ FadeEffectLB::FadeEffectLB(vcl::Window* pParent, WinBits nStyle) FadeEffectLB::~FadeEffectLB() { - dispose(); + disposeOnce(); } void FadeEffectLB::dispose() diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx index e236cd133048..7927f4d9f54a 100644 --- a/sd/source/ui/dlg/dlgfield.cxx +++ b/sd/source/ui/dlg/dlgfield.cxx @@ -55,7 +55,7 @@ SdModifyFieldDlg::SdModifyFieldDlg( vcl::Window* pWindow, const SvxFieldData* pI SdModifyFieldDlg::~SdModifyFieldDlg() { - dispose(); + disposeOnce(); } void SdModifyFieldDlg::dispose() diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx index b8fb42d9a9c7..2582ca25c534 100644 --- a/sd/source/ui/dlg/dlgolbul.cxx +++ b/sd/source/ui/dlg/dlgolbul.cxx @@ -138,7 +138,7 @@ OutlineBulletDlg::OutlineBulletDlg( OutlineBulletDlg::~OutlineBulletDlg() { - dispose(); + disposeOnce(); } void OutlineBulletDlg::dispose() diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx index 2e590fa9a8cf..aed2a1059f4a 100644 --- a/sd/source/ui/dlg/dlgsnap.cxx +++ b/sd/source/ui/dlg/dlgsnap.cxx @@ -113,7 +113,7 @@ SdSnapLineDlg::SdSnapLineDlg( SdSnapLineDlg::~SdSnapLineDlg() { - dispose(); + disposeOnce(); } void SdSnapLineDlg::dispose() diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx index 2929f46bed55..9669499d1172 100644 --- a/sd/source/ui/dlg/docprev.cxx +++ b/sd/source/ui/dlg/docprev.cxx @@ -83,7 +83,7 @@ SdDocPreviewWin::SdDocPreviewWin( vcl::Window* pParent, const WinBits nStyle ) SdDocPreviewWin::~SdDocPreviewWin() { - dispose(); + disposeOnce(); } void SdDocPreviewWin::dispose() diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index f82e75fc230e..8d81eb14fec4 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -241,7 +241,7 @@ HeaderFooterDialog::HeaderFooterDialog( ViewShell* pViewShell, vcl::Window* pPar HeaderFooterDialog::~HeaderFooterDialog() { - dispose(); + disposeOnce(); } void HeaderFooterDialog::dispose() @@ -462,7 +462,7 @@ HeaderFooterTabPage::HeaderFooterTabPage( vcl::Window* pWindow, SdDrawDocument* HeaderFooterTabPage::~HeaderFooterTabPage() { - dispose(); + disposeOnce(); } void HeaderFooterTabPage::dispose() diff --git a/sd/source/ui/dlg/ins_paste.cxx b/sd/source/ui/dlg/ins_paste.cxx index 833b471d140a..ad9e9821e4e0 100644 --- a/sd/source/ui/dlg/ins_paste.cxx +++ b/sd/source/ui/dlg/ins_paste.cxx @@ -30,7 +30,7 @@ SdInsertPasteDlg::SdInsertPasteDlg(vcl::Window* pWindow) SdInsertPasteDlg::~SdInsertPasteDlg() { - dispose(); + disposeOnce(); } void SdInsertPasteDlg::dispose() diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx index 0d5e29c1c6ce..c77ba67a4c40 100644 --- a/sd/source/ui/dlg/inspagob.cxx +++ b/sd/source/ui/dlg/inspagob.cxx @@ -55,7 +55,7 @@ SdInsertPagesObjsDlg::SdInsertPagesObjsDlg( SdInsertPagesObjsDlg::~SdInsertPagesObjsDlg() { - dispose(); + disposeOnce(); } void SdInsertPagesObjsDlg::dispose() diff --git a/sd/source/ui/dlg/layeroptionsdlg.cxx b/sd/source/ui/dlg/layeroptionsdlg.cxx index 12b3e4d1aa9c..a1e5d7f1a03b 100644 --- a/sd/source/ui/dlg/layeroptionsdlg.cxx +++ b/sd/source/ui/dlg/layeroptionsdlg.cxx @@ -52,7 +52,7 @@ SdInsertLayerDlg::SdInsertLayerDlg( vcl::Window* pWindow, const SfxItemSet& rInA SdInsertLayerDlg::~SdInsertLayerDlg() { - dispose(); + disposeOnce(); } void SdInsertLayerDlg::dispose() diff --git a/sd/source/ui/dlg/masterlayoutdlg.cxx b/sd/source/ui/dlg/masterlayoutdlg.cxx index 898ca5b2e4eb..e1cce5c63ec6 100644 --- a/sd/source/ui/dlg/masterlayoutdlg.cxx +++ b/sd/source/ui/dlg/masterlayoutdlg.cxx @@ -77,7 +77,7 @@ MasterLayoutDialog::MasterLayoutDialog( vcl::Window* pParent, SdDrawDocument* pD MasterLayoutDialog::~MasterLayoutDialog() { - dispose(); + disposeOnce(); } void MasterLayoutDialog::dispose() diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx index 8ea2b1856965..96be9f762ee3 100644 --- a/sd/source/ui/dlg/morphdlg.cxx +++ b/sd/source/ui/dlg/morphdlg.cxx @@ -66,7 +66,7 @@ MorphDlg::MorphDlg( vcl::Window* pParent, const SdrObject* pObj1, const SdrObjec MorphDlg::~MorphDlg() { - dispose(); + disposeOnce(); } void MorphDlg::dispose() diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 60e107404917..157a2f970eef 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -152,7 +152,7 @@ SdNavigatorWin::SdNavigatorWin( SdNavigatorWin::~SdNavigatorWin() { - dispose(); + disposeOnce(); } void SdNavigatorWin::dispose() diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx index 6714cb0ba55e..3f79a0000975 100644 --- a/sd/source/ui/dlg/paragr.cxx +++ b/sd/source/ui/dlg/paragr.cxx @@ -73,7 +73,7 @@ SdParagraphNumTabPage::SdParagraphNumTabPage(vcl::Window* pParent, const SfxItem SdParagraphNumTabPage::~SdParagraphNumTabPage() { - dispose(); + disposeOnce(); } void SdParagraphNumTabPage::dispose() diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx index 72d30c31b6c1..bd635ad96676 100644 --- a/sd/source/ui/dlg/present.cxx +++ b/sd/source/ui/dlg/present.cxx @@ -152,7 +152,7 @@ SdStartPresentationDlg::SdStartPresentationDlg( vcl::Window* pWindow, SdStartPresentationDlg::~SdStartPresentationDlg() { - dispose(); + disposeOnce(); } void SdStartPresentationDlg::dispose() diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index 0d8520b5ad66..42a02cc15734 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -223,7 +223,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, SdPresLayoutTemplateDlg::~SdPresLayoutTemplateDlg() { - dispose(); + disposeOnce(); } void SdPresLayoutTemplateDlg::dispose() diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx index b9cdc6e06ce7..1591070a21ac 100644 --- a/sd/source/ui/dlg/prntopts.cxx +++ b/sd/source/ui/dlg/prntopts.cxx @@ -74,7 +74,7 @@ SdPrintOptions::SdPrintOptions( vcl::Window* pParent, const SfxItemSet& rInAttrs SdPrintOptions::~SdPrintOptions() { - dispose(); + disposeOnce(); } void SdPrintOptions::dispose() diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx index 6c9691affc69..4b424693e1ae 100644 --- a/sd/source/ui/dlg/sdpreslt.cxx +++ b/sd/source/ui/dlg/sdpreslt.cxx @@ -55,7 +55,7 @@ SdPresLayoutDlg::SdPresLayoutDlg(::sd::DrawDocShell* pDocShell, SdPresLayoutDlg::~SdPresLayoutDlg() { - dispose(); + disposeOnce(); } void SdPresLayoutDlg::dispose() diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index e7473b16e39a..02bedafa2cad 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -255,7 +255,7 @@ SdPageObjsTLB::SdPageObjsTLB( vcl::Window* pParentWin, WinBits nStyle ) SdPageObjsTLB::~SdPageObjsTLB() { - dispose(); + disposeOnce(); } void SdPageObjsTLB::dispose() diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index f4ae36271b57..553789b1dd16 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -142,7 +142,7 @@ SdTPAction::SdTPAction(vcl::Window* pWindow, const SfxItemSet& rInAttrs) SdTPAction::~SdTPAction() { - dispose(); + disposeOnce(); } void SdTPAction::dispose() diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index eefac3577a77..6faf6e5efb63 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -122,7 +122,7 @@ SdTpOptionsContents::SdTpOptionsContents( vcl::Window* pParent, const SfxItemSet SdTpOptionsContents::~SdTpOptionsContents() { - dispose(); + disposeOnce(); } void SdTpOptionsContents::dispose() @@ -286,7 +286,7 @@ SdTpOptionsMisc::SdTpOptionsMisc(vcl::Window* pParent, const SfxItemSet& rInAttr SdTpOptionsMisc::~SdTpOptionsMisc() { - dispose(); + disposeOnce(); } void SdTpOptionsMisc::dispose() diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx index 99f86cb9d239..fc5e38d39b7e 100644 --- a/sd/source/ui/dlg/vectdlg.cxx +++ b/sd/source/ui/dlg/vectdlg.cxx @@ -72,7 +72,7 @@ SdVectorizeDlg::SdVectorizeDlg(vcl::Window* pParent, const Bitmap& rBmp, ::sd::D SdVectorizeDlg::~SdVectorizeDlg() { - dispose(); + disposeOnce(); } void SdVectorizeDlg::dispose() diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx index cb77dd3b09a4..c07f096a1558 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx @@ -91,7 +91,7 @@ CurrentMasterPagesSelector::CurrentMasterPagesSelector ( CurrentMasterPagesSelector::~CurrentMasterPagesSelector (void) { - dispose(); + disposeOnce(); } void CurrentMasterPagesSelector::dispose() diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index 800943c702e1..1871c13ad2e6 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -194,7 +194,7 @@ void LayoutMenu::implConstruct( DrawDocShell& rDocumentShell ) LayoutMenu::~LayoutMenu (void) { - dispose(); + disposeOnce(); } void LayoutMenu::dispose() diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index 154f742f05dc..53a1aca61334 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -104,7 +104,7 @@ MasterPagesSelector::MasterPagesSelector ( MasterPagesSelector::~MasterPagesSelector (void) { - dispose(); + disposeOnce(); } void MasterPagesSelector::dispose() diff --git a/sd/source/ui/sidebar/NavigatorWrapper.cxx b/sd/source/ui/sidebar/NavigatorWrapper.cxx index 276d8d8d7e17..ff63abbfa152 100644 --- a/sd/source/ui/sidebar/NavigatorWrapper.cxx +++ b/sd/source/ui/sidebar/NavigatorWrapper.cxx @@ -49,7 +49,7 @@ NavigatorWrapper::NavigatorWrapper ( NavigatorWrapper::~NavigatorWrapper (void) { - dispose(); + disposeOnce(); } void NavigatorWrapper::dispose() diff --git a/sd/source/ui/sidebar/PanelBase.cxx b/sd/source/ui/sidebar/PanelBase.cxx index 3fa745103ab6..7ee2a89f63d0 100644 --- a/sd/source/ui/sidebar/PanelBase.cxx +++ b/sd/source/ui/sidebar/PanelBase.cxx @@ -38,7 +38,7 @@ PanelBase::PanelBase ( PanelBase::~PanelBase (void) { - dispose(); + disposeOnce(); } void PanelBase::dispose() diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx index 002f088746bf..e3b7b2a2297a 100644 --- a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx @@ -66,10 +66,16 @@ RecentMasterPagesSelector::RecentMasterPagesSelector ( { } -RecentMasterPagesSelector::~RecentMasterPagesSelector (void) +RecentMasterPagesSelector::~RecentMasterPagesSelector() +{ + disposeOnce(); +} + +void RecentMasterPagesSelector::dispose() { RecentlyUsedMasterPages::Instance().RemoveEventListener ( LINK(this,RecentMasterPagesSelector,MasterPageListListener)); + MasterPagesSelector::dispose(); } void RecentMasterPagesSelector::LateInit (void) diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx index 0c1c53f67ccd..8f64a4389ffa 100644 --- a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx @@ -35,6 +35,8 @@ public: ViewShellBase& rViewShellBase, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); + virtual ~RecentMasterPagesSelector(); + virtual void dispose() SAL_OVERRIDE; protected: DECL_LINK(MasterPageListListener, void*); virtual void Fill (ItemList& rItemList) SAL_OVERRIDE; @@ -64,7 +66,6 @@ private: ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); - virtual ~RecentMasterPagesSelector (void); virtual void LateInit (void) SAL_OVERRIDE; }; diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 757573419608..2dacb9c54dc6 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -79,7 +79,7 @@ ShowWindow::ShowWindow( const ::rtl::Reference< SlideshowImpl >& xController, vc ShowWindow::~ShowWindow(void) { - dispose(); + disposeOnce(); } void ShowWindow::dispose() diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 3bd57dc51e99..21a919721383 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -1386,7 +1386,7 @@ FocusForwardingWindow::FocusForwardingWindow ( FocusForwardingWindow::~FocusForwardingWindow (void) { - dispose(); + disposeOnce(); } void FocusForwardingWindow::dispose() diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx index f4c1d2282a19..8f55b2248209 100644 --- a/sd/source/ui/view/sdruler.cxx +++ b/sd/source/ui/view/sdruler.cxx @@ -92,7 +92,7 @@ Ruler::Ruler( DrawViewShell& rViewSh, vcl::Window* pParent, ::sd::Window* pWin, Ruler::~Ruler() { - dispose(); + disposeOnce(); } void Ruler::dispose() diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index 5b6523ed3324..4dc3ab6b19f0 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -94,7 +94,7 @@ Window::Window(vcl::Window* pParent) Window::~Window (void) { - dispose(); + disposeOnce(); } void Window::dispose() |