[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/source

Michael Meeks michael.meeks at collabora.com
Sun Aug 30 03:39:02 PDT 2015


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

New commits:
commit 18d447443d160c40d42621644b557eecc42ee765
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Sat Aug 29 23:52:06 2015 +0100

    tdf#93536 - avoid crash when calling ToTop on disposed window.
    
    Change-Id: I677f47f6b60271dc56c9d3d123cf982c00866eb9
    Reviewed-on: https://gerrit.libreoffice.org/18136
    Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>
    Tested-by: Maxim Monastirsky <momonasmon at gmail.com>

diff --git a/vcl/source/window/stacking.cxx b/vcl/source/window/stacking.cxx
index dc0f78e..52d9685 100644
--- a/vcl/source/window/stacking.cxx
+++ b/vcl/source/window/stacking.cxx
@@ -438,6 +438,8 @@ void Window::ImplHideAllOverlaps()
 
 void Window::ToTop( sal_uInt16 nFlags )
 {
+    if (!mpWindowImpl)
+        return;
 
     ImplStartToTop( nFlags );
     ImplFocusToTop( nFlags, IsReallyVisible() );


More information about the Libreoffice-commits mailing list