commit a140e0d0bab3bd09fe19711fc99e411fcc2675d7
author Michael Meeks <michael.meeks@collabora.com> Tue Mar 17 17:45:07 2015 +0000
committer Michael Meeks <michael.meeks@collabora.com> Fri Apr 10 11:44:14 2015 +0100
tree 3304d6fcd4b652b3c9e9f23e777885eb4537a0e6
parent 15178933b18bc3980890c1cd5a3f0e8ec3d5c744

fix explicit delete.

Change-Id: I6d12eb32e9c8fcb403473c41b3a6eb2f29fe8639

sfx2/source/toolbox/tbxitem.cxx

diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index e993174..c849ac7 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -274,9 +274,9 @@ void SAL_CALL SfxToolBoxControl::dispose() throw (::com::sun::star::uno::Runtime

    // Remove and destroy our item window at our toolbox
    SolarMutexGuard aGuard;
    vcl::Window* pWindow = pImpl->pBox->GetItemWindow( pImpl->nTbxId );
    VclPtr< vcl::Window > pWindow = pImpl->pBox->GetItemWindow( pImpl->nTbxId );
    pImpl->pBox->SetItemWindow( pImpl->nTbxId, 0 );
    delete pWindow;
    pWindow.disposeAndClear();

    // Dispose an open sub toolbar. It's possible that we have an open
    // sub toolbar while we get disposed. Therefore we have to dispose