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 /fpicker | |
| 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 'fpicker')
| -rw-r--r-- | fpicker/source/office/PlacesListBox.cxx | 4 | ||||
| -rw-r--r-- | fpicker/source/office/iodlg.cxx | 6 | ||||
| -rw-r--r-- | fpicker/source/office/iodlgimp.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx index e6099522efcf..e795d539619b 100644 --- a/fpicker/source/office/PlacesListBox.cxx +++ b/fpicker/source/office/PlacesListBox.cxx @@ -43,7 +43,7 @@ PlacesListBox_Impl::PlacesListBox_Impl( PlacesListBox* pParent, const OUString& PlacesListBox_Impl::~PlacesListBox_Impl( ) { - dispose(); + disposeOnce(); } void PlacesListBox_Impl::dispose() @@ -88,7 +88,7 @@ PlacesListBox::PlacesListBox( vcl::Window* pParent, SvtFileDialog* pFileDlg, con PlacesListBox::~PlacesListBox( ) { - dispose(); + disposeOnce(); } void PlacesListBox::dispose() diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 6c275e7b4010..b1c1412eb9cd 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -359,7 +359,7 @@ public: , _pSplitter(NULL) { } - virtual ~CustomContainer() { dispose(); } + virtual ~CustomContainer() { disposeOnce(); } virtual void dispose() SAL_OVERRIDE { _pFileView.clear(); @@ -411,7 +411,7 @@ public: SvtFileDialog::~SvtFileDialog() { - dispose(); + disposeOnce(); } void SvtFileDialog::dispose() @@ -2850,7 +2850,7 @@ QueryFolderNameDialog::QueryFolderNameDialog(vcl::Window* _pParent, QueryFolderNameDialog::~QueryFolderNameDialog() { - dispose(); + disposeOnce(); } void QueryFolderNameDialog::dispose() diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index 4a99899cb292..99cf5b0e8ea6 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -106,7 +106,7 @@ SvtFileDialogURLSelector::SvtFileDialogURLSelector( vcl::Window* _pParent, SvtFi SvtFileDialogURLSelector::~SvtFileDialogURLSelector() { - dispose(); + disposeOnce(); } void SvtFileDialogURLSelector::dispose() |