[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - vcl/source

[Noel Grandin (via logerrit)]

 vcl/source/window/window.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3c7172bf9cfec0a8dfb103d3ab9df927407cf6ff
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Jul 1 14:53:00 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Jul 2 14:39:48 2021 +0200

    tdf#142923 Deleting comment in Writer leaves visual artifact behind
    
    regression from
        commit 9abedad72c73ad83b66f3f8d261efdc5ce889683
        Date:   Sun Mar 28 10:28:45 2021 +0200
        Drop Window::IsDisposed
    
    Change-Id: Ib804a1b42ea6be97b69184c76e67636f5b082974
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118224
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit 29b0fa1e9cf84657abe0722d5d92d4741c9b7974)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118265

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 5c9d7c431437..b399091bd201 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3391,7 +3391,7 @@ void Window::ImplCallDeactivateListeners( vcl::Window *pNew )
     {
         VclPtr<vcl::Window> xWindow(this);
         CallEventListeners( VclEventId::WindowDeactivate, pNew );
-        if( xWindow->isDisposed() )
+        if( !xWindow->mpWindowImpl )
             return;
 
         // #100759#, avoid walking the wrong frame's hierarchy
@@ -3409,7 +3409,7 @@ void Window::ImplCallActivateListeners( vcl::Window *pOld )
 
     VclPtr<vcl::Window> xWindow(this);
     CallEventListeners( VclEventId::WindowActivate, pOld );
-    if( xWindow->isDisposed() )
+    if( !xWindow->mpWindowImpl )
         return;
 
     if ( ImplGetParent() )