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 /dbaccess/source/ui/querydesign | |
| 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 'dbaccess/source/ui/querydesign')
4 files changed, 10 insertions, 10 deletions
diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx index de5b30488a57..d9c0734c8483 100644 --- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx +++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx @@ -66,8 +66,8 @@ OJoinDesignView::~OJoinDesignView() void OJoinDesignView::dispose() { - m_pScrollWindow.clear(); - m_pTableView.clear(); + m_pScrollWindow.disposeAndClear(); + m_pTableView.disposeAndClear(); ODataView::dispose(); } diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index ad15132b72ef..70adb519d022 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -96,7 +96,7 @@ void OScrollWindowHelper::dispose() { m_aHScrollBar.disposeAndClear(); m_aVScrollBar.disposeAndClear(); - m_pCornerWindow.clear(); + m_pCornerWindow.disposeAndClear(); m_pTableView.clear(); vcl::Window::dispose(); } diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 87ea89bda2a0..368f5c4738fb 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -158,12 +158,12 @@ OSelectionBrowseBox::~OSelectionBrowseBox() void OSelectionBrowseBox::dispose() { - m_pTextCell.clear(); - m_pVisibleCell.clear(); - m_pFieldCell.clear(); - m_pTableCell.clear(); - m_pOrderCell.clear(); - m_pFunctionCell.clear(); + m_pTextCell.disposeAndClear(); + m_pVisibleCell.disposeAndClear(); + m_pFieldCell.disposeAndClear(); + m_pTableCell.disposeAndClear(); + m_pOrderCell.disposeAndClear(); + m_pFunctionCell.disposeAndClear(); ::svt::EditBrowseBox::dispose(); } diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx index 71c037c80e80..e9c63e0f4de7 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx @@ -139,7 +139,7 @@ throw (uno::RuntimeException, std::exception) svt::ToolboxController::dispose(); SolarMutexGuard aSolarMutexGuard; - m_pLimitBox.clear(); + m_pLimitBox.disposeAndClear(); } /// XStatusListener |