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 /desktop/source/deployment/gui/dp_gui_theextmgr.cxx | |
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 'desktop/source/deployment/gui/dp_gui_theextmgr.cxx')
-rw-r--r-- | desktop/source/deployment/gui/dp_gui_theextmgr.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx index 07168b74a4fd..a031b476ac97 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx @@ -169,7 +169,7 @@ sal_Int16 TheExtensionManager::execute() if ( m_pUpdReqDialog ) { nRet = m_pUpdReqDialog->Execute(); - m_pUpdReqDialog.clear(); + m_pUpdReqDialog.disposeAndClear(); } return nRet; @@ -256,8 +256,8 @@ void TheExtensionManager::terminateDialog() if ( ! dp_misc::office_is_running() ) { const SolarMutexGuard guard; - m_pExtMgrDialog.clear(); - m_pUpdReqDialog.clear(); + m_pExtMgrDialog.disposeAndClear(); + m_pUpdReqDialog.disposeAndClear(); Application::Quit(); } } @@ -421,8 +421,8 @@ void TheExtensionManager::disposing( lang::EventObject const & rEvt ) if ( dp_misc::office_is_running() ) { const SolarMutexGuard guard; - m_pExtMgrDialog.clear(); - m_pUpdReqDialog.clear(); + m_pExtMgrDialog.disposeAndClear(); + m_pUpdReqDialog.disposeAndClear(); } s_ExtMgr.clear(); } |