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 /sfx2/source/toolbox | |
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 'sfx2/source/toolbox')
-rw-r--r-- | sfx2/source/toolbox/tbxitem.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 6afaec6536eb..c1df7877299e 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -209,7 +209,7 @@ IMPL_LINK( SfxToolBoxControl_Impl, WindowEventListener, VclSimpleEvent*, pEvent if (( pWindow == mpFloatingWindow ) && ( mpPopupWindow != nullptr )) { - mpPopupWindow.clear(); + mpPopupWindow.disposeAndClear(); } } @@ -291,8 +291,8 @@ void SAL_CALL SfxToolBoxControl::dispose() throw (::com::sun::star::uno::Runtime pImpl->mxUIElement = 0; // Delete my popup windows - pImpl->mpFloatingWindow.clear(); - pImpl->mpPopupWindow.clear(); + pImpl->mpFloatingWindow.disposeAndClear(); + pImpl->mpPopupWindow.disposeAndClear(); } @@ -862,7 +862,7 @@ IMPL_LINK_NOARG(SfxToolBoxControl, PopupModeEndHdl) { // Replace floating window with popup window and destroy // floating window instance. - pImpl->mpFloatingWindow.clear(); + pImpl->mpFloatingWindow.disposeAndClear(); pImpl->mpFloatingWindow = pImpl->mpPopupWindow; pImpl->mpPopupWindow.clear(); // We also need to know when the user tries to use the |