diff options
author | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-10-23 19:42:54 +0000 |
---|---|---|
committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-10-26 21:39:02 +0200 |
commit | 6720da69043a5ca206e9feac8396335e7b0af793 (patch) | |
tree | b333e2d776ee5475b5c412c5ee3aa87d249c6e83 | |
parent | keep pyuno script processing below base uri (diff) | |
download | core-6720da69043a5ca206e9feac8396335e7b0af793.tar.gz core-6720da69043a5ca206e9feac8396335e7b0af793.zip |
tdf#120807 check for valid ImplGetWindowImpl()
Change-Id: Ia1135d11990abc303849bd1b6a549c82008c79de
Reviewed-on: https://gerrit.libreoffice.org/62260
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
(cherry picked from commit db0051744330d82986e8f2629a027bc4a5dc1b4a)
Reviewed-on: https://gerrit.libreoffice.org/62280
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
-rw-r--r-- | vcl/source/window/winproc.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index bf64ef132cc7..f8716f2135b5 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -1072,7 +1072,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(); |