[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - vcl/source

[Libreoffice Gerrit user]

 vcl/source/window/winproc.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 564aee79143b62889e5b201b97982db9386671da
Author:     Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Tue Oct 23 19:42:54 2018 +0000
Commit:     Michael Stahl <michael.st...@cib.de>
CommitDate: Fri Oct 26 20:51:46 2018 +0200

    tdf#120807 check for valid ImplGetWindowImpl()
    
    Change-Id: Ia1135d11990abc303849bd1b6a549c82008c79de
    Reviewed-on: https://gerrit.libreoffice.org/62260
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>
    (cherry picked from commit db0051744330d82986e8f2629a027bc4a5dc1b4a)
    Reviewed-on: https://gerrit.libreoffice.org/62278
    Reviewed-by: Michael Stahl <michael.st...@cib.de>

diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 77e11cb58097..45b01a01f8fa 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1076,7 +1076,7 @@ static bool ImplHandleKey( vcl::Window* pWindow, 
MouseNotifyEvent nSVEvent,
     }
 
     // #105591# send keyinput to parent if we are a floating window and the 
key was not processed yet
-    if( !bRet && pWindow->ImplGetWindowImpl()->mbFloatWin && 
pWindow->GetParent() && (pWindow->ImplGetWindowImpl()->mpFrame != 
pWindow->GetParent()->ImplGetWindowImpl()->mpFrame) )
+    if( !bRet && pWindow->ImplGetWindowImpl() && 
pWindow->ImplGetWindowImpl()->mbFloatWin && pWindow->GetParent() && 
(pWindow->ImplGetWindowImpl()->mpFrame != 
pWindow->GetParent()->ImplGetWindowImpl()->mpFrame) )
     {
         pChild = pWindow->GetParent();
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits