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 /reportdesign/source/ui/dlg | |
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 'reportdesign/source/ui/dlg')
-rw-r--r-- | reportdesign/source/ui/dlg/AddField.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/CondFormat.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/Condition.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/DateTime.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/Formula.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/GroupsSorting.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/Navigator.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/PageNumber.cxx | 2 |
8 files changed, 11 insertions, 11 deletions
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 0a36669aa06a..7fdfaea91b92 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -114,7 +114,7 @@ OAddFieldWindowListBox::OAddFieldWindowListBox( OAddFieldWindow* _pParent ) OAddFieldWindowListBox::~OAddFieldWindowListBox() { - dispose(); + disposeOnce(); } void OAddFieldWindowListBox::dispose() @@ -216,7 +216,7 @@ OAddFieldWindow::OAddFieldWindow(vcl::Window* pParent OAddFieldWindow::~OAddFieldWindow() { - dispose(); + disposeOnce(); } void OAddFieldWindow::dispose() diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx index c537b0a3b3ba..ddd8ea1f8bf7 100644 --- a/reportdesign/source/ui/dlg/CondFormat.cxx +++ b/reportdesign/source/ui/dlg/CondFormat.cxx @@ -130,7 +130,7 @@ namespace rptui ConditionalFormattingDialog::~ConditionalFormattingDialog() { - dispose(); + disposeOnce(); } void ConditionalFormattingDialog::dispose() diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index bc60825e71ab..dacc9ce42c12 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -156,7 +156,7 @@ OColorPopup::OColorPopup(vcl::Window* _pParent,Condition* _pCondition) OColorPopup::~OColorPopup() { - dispose(); + disposeOnce(); } void OColorPopup::dispose() @@ -309,7 +309,7 @@ sal_uInt16 Condition::mapToolbarItemToSlotId(sal_uInt16 nItemId) const Condition::~Condition() { - dispose(); + disposeOnce(); } void Condition::dispose() diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index b768e17be432..caad1e3bf1aa 100644 --- a/reportdesign/source/ui/dlg/DateTime.cxx +++ b/reportdesign/source/ui/dlg/DateTime.cxx @@ -113,7 +113,7 @@ ODateTimeDialog::ODateTimeDialog( vcl::Window* _pParent ODateTimeDialog::~ODateTimeDialog() { - dispose(); + disposeOnce(); } void ODateTimeDialog::dispose() diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index c59d778ba7e0..1c78e8a36337 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -87,7 +87,7 @@ void FormulaDialog::fill() FormulaDialog::~FormulaDialog() { - dispose(); + disposeOnce(); } void FormulaDialog::dispose() diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 2b51436d9ca6..b80b81dbae09 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -214,7 +214,7 @@ OFieldExpressionControl::OFieldExpressionControl(OGroupsSortingDialog* _pParentD OFieldExpressionControl::~OFieldExpressionControl() { - dispose(); + disposeOnce(); } @@ -1010,7 +1010,7 @@ OGroupsSortingDialog::OGroupsSortingDialog(vcl::Window* _pParent, bool _bReadOnl OGroupsSortingDialog::~OGroupsSortingDialog() { - dispose(); + disposeOnce(); } void OGroupsSortingDialog::dispose() diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index bef13a2d5938..fb898fed9060 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -256,7 +256,7 @@ NavigatorTree::NavigatorTree( vcl::Window* pParent,OReportController& _rControll NavigatorTree::~NavigatorTree() { - dispose(); + disposeOnce(); } void NavigatorTree::dispose() diff --git a/reportdesign/source/ui/dlg/PageNumber.cxx b/reportdesign/source/ui/dlg/PageNumber.cxx index 08672e1c50c1..f7a799a53832 100644 --- a/reportdesign/source/ui/dlg/PageNumber.cxx +++ b/reportdesign/source/ui/dlg/PageNumber.cxx @@ -63,7 +63,7 @@ OPageNumberDialog::OPageNumberDialog( vcl::Window* _pParent OPageNumberDialog::~OPageNumberDialog() { - dispose(); + disposeOnce(); } void OPageNumberDialog::dispose() |