[Libreoffice-commits] core.git: toolkit/source

[Libreoffice Gerrit user]

 toolkit/source/helper/unowrapper.cxx |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 5d5e0da5c314773129d8153363e2892fc359a744
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Oct 12 14:35:59 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Oct 12 17:47:08 2018 +0200

    tdf#118572 dispose instead of LazyDeletor
    
    Change-Id: Ib52a1d6ffee0354cc7749f2535a05821d73149c5
    Reviewed-on: https://gerrit.libreoffice.org/61716
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx
index f0e2c2dc0e66..f838fa57694b 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@@ -288,11 +288,7 @@ void UnoWrapper::WindowDestroyed( vcl::Window* pWindow )
 
         VclPtr< vcl::Window > pNextTopChild = pTopWindowChild->GetWindow( GetWindowType::NextTopWindowSibling );
 
-        //the window still could be on the stack, so we have to
-        // use lazy delete ( it will automatically
-        // disconnect from the currently destroyed parent window )
-        pTopWindowChild->doLazyDelete();
-
+        pTopWindowChild.disposeAndClear();
         pTopWindowChild = pNextTopChild;
     }
 }