diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 10:44:13 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 10:46:01 +0100 |
| commit | c0a802b59e1edddeb0b621e15137f5058299efd7 (patch) | |
| tree | 48203cffcd51d1d2747bb2384608907d73b69670 /reportdesign | |
| parent | 1c4025babd7037a3292aa530c7d45ab8d6ef6dcb (diff) | |
Audit and correct misc. clears -> disposeAndClears.
Anything that used to be 'delete'd should be disposeAndCleared()
in the new world.
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/dlg/Condition.cxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/dlg/GroupsSorting.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index 2da233a22696..bc60825e71ab 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -330,7 +330,7 @@ void Condition::dispose() m_pMoveDown.clear(); m_pAddCondition.clear(); m_pRemoveCondition.clear(); - m_pColorFloat.clear(); + m_pColorFloat.disposeAndClear(); VclHBox::dispose(); } diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index adbe69d7ad23..2b51436d9ca6 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -230,7 +230,7 @@ void OFieldExpressionControl::dispose() if( m_nDeleteEvent ) Application::RemoveUserEvent( m_nDeleteEvent ); - m_pComboCell.clear(); + m_pComboCell.disposeAndClear(); m_pParent.clear(); ::svt::EditBrowseBox::dispose(); } @@ -1028,7 +1028,7 @@ void OGroupsSortingDialog::dispose() m_pGroupIntervalEd.clear(); m_pKeepTogetherLst.clear(); m_pHelpWindow.clear(); - m_pFieldExpression.clear(); + m_pFieldExpression.disposeAndClear(); FloatingWindow::dispose(); } |