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 /svtools/source | |
parent | c0a802b59e1edddeb0b621e15137f5058299efd7 (diff) |
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 'svtools/source')
40 files changed, 50 insertions, 50 deletions
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index 6c09611863f6..dd6df462b05e 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -138,7 +138,7 @@ BrowseBox::BrowseBox( vcl::Window* pParent, const ResId& rId, BrowserMode nMode BrowseBox::~BrowseBox() { - dispose(); + disposeOnce(); } void BrowseBox::dispose() diff --git a/svtools/source/brwbox/brwhead.cxx b/svtools/source/brwbox/brwhead.cxx index 6cfbf57c9134..0c723a31e32a 100644 --- a/svtools/source/brwbox/brwhead.cxx +++ b/svtools/source/brwbox/brwhead.cxx @@ -38,7 +38,7 @@ BrowserHeader::BrowserHeader( BrowseBox* pParent, WinBits nWinBits ) BrowserHeader::~BrowserHeader() { - dispose(); + disposeOnce(); } void BrowserHeader::dispose() diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx index 682595a00b7c..41635c240e57 100644 --- a/svtools/source/brwbox/datwin.cxx +++ b/svtools/source/brwbox/datwin.cxx @@ -227,7 +227,7 @@ BrowserDataWin::BrowserDataWin( BrowseBox* pParent ) BrowserDataWin::~BrowserDataWin() { - dispose(); + disposeOnce(); } void BrowserDataWin::dispose() @@ -732,7 +732,7 @@ void BrowserDataWin::Invalidate( const Rectangle& rRect, sal_uInt16 nFlags ) BrowserScrollBar::~BrowserScrollBar() { - dispose(); + disposeOnce(); } void BrowserScrollBar::dispose() diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx index 9e008600925e..395f35109d8b 100644 --- a/svtools/source/brwbox/ebbcontrols.cxx +++ b/svtools/source/brwbox/ebbcontrols.cxx @@ -249,7 +249,7 @@ namespace svt CheckBoxControl::~CheckBoxControl() { - dispose(); + disposeOnce(); } void CheckBoxControl::dispose() diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index c376113b6d53..9e53109f487e 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -183,7 +183,7 @@ namespace svt EditBrowseBox::~EditBrowseBox() { - dispose(); + disposeOnce(); } void EditBrowseBox::dispose() diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx index 434920ae55f9..7a2be8f0890f 100644 --- a/svtools/source/contnr/DocumentInfoPreview.cxx +++ b/svtools/source/contnr/DocumentInfoPreview.cxx @@ -56,7 +56,7 @@ ODocumentInfoPreview::ODocumentInfoPreview(vcl::Window * pParent, WinBits nBits) ODocumentInfoPreview::~ODocumentInfoPreview() { - dispose(); + disposeOnce(); } void ODocumentInfoPreview::dispose() diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 23a3172a8a49..ef2e2daf93a4 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -635,7 +635,7 @@ ViewTabListBox_Impl::ViewTabListBox_Impl( vcl::Window* pParentWin, ViewTabListBox_Impl::~ViewTabListBox_Impl() { - dispose(); + disposeOnce(); } void ViewTabListBox_Impl::dispose() @@ -1096,7 +1096,7 @@ SvtFileView::SvtFileView( vcl::Window* pParent, WinBits nBits, SvtFileView::~SvtFileView() { - dispose(); + disposeOnce(); } void SvtFileView::dispose() @@ -2336,7 +2336,7 @@ QueryDeleteDlg_Impl::QueryDeleteDlg_Impl(vcl::Window* pParent, const OUString& r QueryDeleteDlg_Impl::~QueryDeleteDlg_Impl() { - dispose(); + disposeOnce(); } void QueryDeleteDlg_Impl::dispose() diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 1afc9e3120f1..021757701065 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -3279,7 +3279,7 @@ IcnViewEdit_Impl::IcnViewEdit_Impl( SvtIconChoiceCtrl* pParent, const Point& rPo IcnViewEdit_Impl::~IcnViewEdit_Impl() { - dispose(); + disposeOnce(); } void IcnViewEdit_Impl::dispose() diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index 9c4465ba355a..45290d60f3b2 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -88,7 +88,7 @@ SvtIconChoiceCtrl::SvtIconChoiceCtrl( vcl::Window* pParent, WinBits nWinStyle ) SvtIconChoiceCtrl::~SvtIconChoiceCtrl() { - dispose(); + disposeOnce(); } void SvtIconChoiceCtrl::dispose() diff --git a/svtools/source/contnr/simptabl.cxx b/svtools/source/contnr/simptabl.cxx index 61e9bd2a70f7..3b1eb004e9c9 100644 --- a/svtools/source/contnr/simptabl.cxx +++ b/svtools/source/contnr/simptabl.cxx @@ -33,7 +33,7 @@ SvSimpleTableContainer::SvSimpleTableContainer(vcl::Window* pParent, WinBits nBi SvSimpleTableContainer::~SvSimpleTableContainer() { - dispose(); + disposeOnce(); } void SvSimpleTableContainer::dispose() @@ -123,7 +123,7 @@ SvSimpleTable::SvSimpleTable(SvSimpleTableContainer& rParent, WinBits nBits): SvSimpleTable::~SvSimpleTable() { - dispose(); + disposeOnce(); } void SvSimpleTable::dispose() diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index afb886d1993c..6d9aa706adff 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -110,7 +110,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvTabListBox(vcl::Wind SvTabListBox::~SvTabListBox() { - dispose(); + disposeOnce(); } void SvTabListBox::dispose() @@ -526,7 +526,7 @@ SvHeaderTabListBox::SvHeaderTabListBox( vcl::Window* pParent, WinBits nWinStyle SvHeaderTabListBox::~SvHeaderTabListBox() { - dispose(); + disposeOnce(); } void SvHeaderTabListBox::dispose() diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index 25551159f227..b4861c3daa20 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -1541,7 +1541,7 @@ OUString SvTreeListBox::SearchEntryTextWithHeadTitle( SvTreeListEntry* pEntry ) SvTreeListBox::~SvTreeListBox() { - dispose(); + disposeOnce(); } void SvTreeListBox::dispose() diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index 86271a9444fc..50ebc4e71bf6 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -257,7 +257,7 @@ Calendar::Calendar( vcl::Window* pParent, WinBits nWinStyle ) : Calendar::~Calendar() { - dispose(); + disposeOnce(); } void Calendar::dispose() @@ -2224,7 +2224,7 @@ ImplCFieldFloatWin::ImplCFieldFloatWin( vcl::Window* pParent ) : ImplCFieldFloatWin::~ImplCFieldFloatWin() { - dispose(); + disposeOnce(); } void ImplCFieldFloatWin::dispose() @@ -2383,7 +2383,7 @@ CalendarField::CalendarField(vcl::Window* pParent, WinBits nWinStyle) CalendarField::~CalendarField() { - dispose(); + disposeOnce(); } void CalendarField::dispose() diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 80e22ae558e1..0c49ef8a338b 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -118,7 +118,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeColorListBox(vcl::Wind ColorListBox::~ColorListBox() { - dispose(); + disposeOnce(); } void ColorListBox::dispose() @@ -749,7 +749,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLineListBox(vcl::Windo LineListBox::~LineListBox() { - dispose(); + disposeOnce(); } void LineListBox::dispose() @@ -952,7 +952,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeFontNameBox(vcl::Windo FontNameBox::~FontNameBox() { - dispose(); + disposeOnce(); } void FontNameBox::dispose() diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx index 14512372092b..164ab86b1aa4 100644 --- a/svtools/source/control/filectrl.cxx +++ b/svtools/source/control/filectrl.cxx @@ -86,7 +86,7 @@ WinBits FileControl::ImplInitStyle( WinBits nStyle ) FileControl::~FileControl() { - dispose(); + disposeOnce(); } void FileControl::dispose() diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index 656436e533b5..3ecbae060fdb 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -1022,7 +1022,7 @@ void FormattedField::UseInputStringForFormatting( bool bUseInputStr /* = true */ DoubleNumericField::~DoubleNumericField() { - dispose(); + disposeOnce(); } void DoubleNumericField::dispose() diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index 87e019d5612f..2d045d863339 100644 --- a/svtools/source/control/headbar.cxx +++ b/svtools/source/control/headbar.cxx @@ -114,7 +114,7 @@ HeaderBar::HeaderBar( vcl::Window* pParent, WinBits nWinStyle ) : HeaderBar::~HeaderBar() { - dispose(); + disposeOnce(); } void HeaderBar::dispose() diff --git a/svtools/source/control/hyperlabel.cxx b/svtools/source/control/hyperlabel.cxx index 2929bccc96b3..fa826230e2ec 100644 --- a/svtools/source/control/hyperlabel.cxx +++ b/svtools/source/control/hyperlabel.cxx @@ -155,7 +155,7 @@ namespace svt HyperLabel::~HyperLabel( ) { - dispose(); + disposeOnce(); } void HyperLabel::dispose() diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 7f39ff6a30fb..370a1f97eaab 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -906,7 +906,7 @@ void SvtURLBox::Init(bool bSetDefaultHelpID) SvtURLBox::~SvtURLBox() { - dispose(); + disposeOnce(); } void SvtURLBox::dispose() diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx index 6a5e20bdd6c2..2d4a0cf33bc8 100644 --- a/svtools/source/control/roadmap.cxx +++ b/svtools/source/control/roadmap.cxx @@ -203,7 +203,7 @@ namespace svt ORoadmap::~ORoadmap( ) { - dispose(); + disposeOnce(); } void ORoadmap::dispose() diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 482d3d36db71..230d10e0f743 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -326,7 +326,7 @@ Ruler::Ruler( vcl::Window* pParent, WinBits nWinStyle ) : Ruler::~Ruler() { - dispose(); + disposeOnce(); } void Ruler::dispose() diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx index cc063c96cecf..7c5739adf08e 100644 --- a/svtools/source/control/scrwin.cxx +++ b/svtools/source/control/scrwin.cxx @@ -53,7 +53,7 @@ ScrollableWindow::ScrollableWindow( vcl::Window* pParent, WinBits nBits, ScrollableWindow::~ScrollableWindow() { - dispose(); + disposeOnce(); } void ScrollableWindow::dispose() diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index f39c1b748b58..8fd29e4eea15 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -378,7 +378,7 @@ TabBar::TabBar( vcl::Window* pParent, WinBits nWinStyle ) : TabBar::~TabBar() { - dispose(); + disposeOnce(); } void TabBar::dispose() diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index 5f83f15061fd..ab3fc1f065f9 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -459,7 +459,7 @@ void ToolbarMenu::implInit(const Reference< XFrame >& rFrame) ToolbarMenu::~ToolbarMenu() { - dispose(); + disposeOnce(); } void ToolbarMenu::dispose() diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index 1a409702164f..67b2464f08c0 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -125,7 +125,7 @@ ValueSet::ValueSet( vcl::Window* pParent, const ResId& rResId, bool bDisableTran ValueSet::~ValueSet() { - dispose(); + disposeOnce(); } void ValueSet::dispose() diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx index 0539d5bdb21b..7d4267bdf530 100644 --- a/svtools/source/dialogs/PlaceEditDialog.cxx +++ b/svtools/source/dialogs/PlaceEditDialog.cxx @@ -81,7 +81,7 @@ PlaceEditDialog::PlaceEditDialog(vcl::Window* pParent, const std::shared_ptr<Pla PlaceEditDialog::~PlaceEditDialog() { - dispose(); + disposeOnce(); } void PlaceEditDialog::dispose() diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 65cc4af04b2c..b71113a9ca32 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -733,7 +733,7 @@ void AssignmentPersistentData::ImplCommit() AddressBookSourceDialog::~AddressBookSourceDialog() { - dispose(); + disposeOnce(); } void AddressBookSourceDialog::dispose() diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx index 77d6fcffca1f..42b78542ca87 100644 --- a/svtools/source/dialogs/prnsetup.cxx +++ b/svtools/source/dialogs/prnsetup.cxx @@ -245,7 +245,7 @@ PrinterSetupDialog::PrinterSetupDialog(vcl::Window* pParent) PrinterSetupDialog::~PrinterSetupDialog() { - dispose(); + disposeOnce(); } void PrinterSetupDialog::dispose() diff --git a/svtools/source/dialogs/restartdialog.cxx b/svtools/source/dialogs/restartdialog.cxx index 282553b606c5..1e99d16c3d36 100644 --- a/svtools/source/dialogs/restartdialog.cxx +++ b/svtools/source/dialogs/restartdialog.cxx @@ -47,7 +47,7 @@ public: btnYes_->SetClickHdl(LINK(this, RestartDialog, hdlYes)); btnNo_->SetClickHdl(LINK(this, RestartDialog, hdlNo)); } - virtual ~RestartDialog() { dispose(); } + virtual ~RestartDialog() { disposeOnce(); } virtual void dispose() SAL_OVERRIDE { reason_.clear(); diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx index 1c398cf4767c..411c9b06b582 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/svtools/source/dialogs/roadmapwizard.cxx @@ -149,7 +149,7 @@ namespace svt RoadmapWizard::~RoadmapWizard() { - dispose(); + disposeOnce(); } void RoadmapWizard::dispose() diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index e0cf0f994310..47e81789afaf 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -49,7 +49,7 @@ namespace svt OWizardPage::~OWizardPage() { - dispose(); + disposeOnce(); } void OWizardPage::dispose() @@ -202,7 +202,7 @@ namespace svt OWizardMachine::~OWizardMachine() { - dispose(); + disposeOnce(); } void OWizardMachine::dispose() diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx index 890cbc491d06..a2b0d97e7e84 100644 --- a/svtools/source/dialogs/wizdlg.cxx +++ b/svtools/source/dialogs/wizdlg.cxx @@ -363,7 +363,7 @@ WizardDialog::WizardDialog( vcl::Window* pParent, const OUString& rID, const OUS WizardDialog::~WizardDialog() { - dispose(); + disposeOnce(); } void WizardDialog::dispose() diff --git a/svtools/source/filter/GraphicExportOptionsDialog.cxx b/svtools/source/filter/GraphicExportOptionsDialog.cxx index da1f2d31a97b..8277304d537c 100644 --- a/svtools/source/filter/GraphicExportOptionsDialog.cxx +++ b/svtools/source/filter/GraphicExportOptionsDialog.cxx @@ -45,7 +45,7 @@ GraphicExportOptionsDialog::GraphicExportOptionsDialog(vcl::Window* pWindow, con GraphicExportOptionsDialog::~GraphicExportOptionsDialog() { - dispose(); + disposeOnce(); } void GraphicExportOptionsDialog::dispose() diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx index 93019937a509..e2107353c7a4 100644 --- a/svtools/source/filter/exportdialog.cxx +++ b/svtools/source/filter/exportdialog.cxx @@ -979,7 +979,7 @@ void ExportDialog::updateControls() ExportDialog::~ExportDialog() { - dispose(); + disposeOnce(); } void ExportDialog::dispose() diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx index d6b0485b04e4..e8b51c546dde 100644 --- a/svtools/source/table/tablecontrol.cxx +++ b/svtools/source/table/tablecontrol.cxx @@ -64,7 +64,7 @@ namespace svt { namespace table TableControl::~TableControl() { - dispose(); + disposeOnce(); } void TableControl::dispose() diff --git a/svtools/source/table/tabledatawindow.cxx b/svtools/source/table/tabledatawindow.cxx index b71c5821d02c..2b819033d610 100644 --- a/svtools/source/table/tabledatawindow.cxx +++ b/svtools/source/table/tabledatawindow.cxx @@ -51,7 +51,7 @@ namespace svt { namespace table TableDataWindow::~TableDataWindow() { - dispose(); + disposeOnce(); } void TableDataWindow::dispose() diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx index 33bf1df1d3f5..1cb90ccf4973 100644 --- a/svtools/source/toolpanel/paneltabbar.cxx +++ b/svtools/source/toolpanel/paneltabbar.cxx @@ -998,7 +998,7 @@ namespace svt PanelTabBar::~PanelTabBar() { - dispose(); + disposeOnce(); } void PanelTabBar::dispose() diff --git a/svtools/source/toolpanel/toolpaneldeck.cxx b/svtools/source/toolpanel/toolpaneldeck.cxx index c5a733c5efcd..e816e0d9e2dc 100644 --- a/svtools/source/toolpanel/toolpaneldeck.cxx +++ b/svtools/source/toolpanel/toolpaneldeck.cxx @@ -354,7 +354,7 @@ namespace svt ToolPanelDeck::~ToolPanelDeck() { - dispose(); + disposeOnce(); } void ToolPanelDeck::dispose() diff --git a/svtools/source/toolpanel/toolpaneldrawer.cxx b/svtools/source/toolpanel/toolpaneldrawer.cxx index 475117ddb941..32e9f85c09f6 100644 --- a/svtools/source/toolpanel/toolpaneldrawer.cxx +++ b/svtools/source/toolpanel/toolpaneldrawer.cxx @@ -89,7 +89,7 @@ namespace svt ToolPanelDrawer::~ToolPanelDrawer() { - dispose(); + disposeOnce(); } void ToolPanelDrawer::dispose() diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index c575890de7fc..8feb8d357329 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -1491,7 +1491,7 @@ UnoTreeListBoxImpl::UnoTreeListBoxImpl( TreeControlPeer* pPeer, vcl::Window* pPa UnoTreeListBoxImpl::~UnoTreeListBoxImpl() { - dispose(); + disposeOnce(); } void UnoTreeListBoxImpl::dispose() |