vcl/source/window/window.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit fcbcbe607ba3c693c79b1e1c390fab3b4643e3d9 Author: Telesto <tele...@surfxs.nl> Date: Fri Feb 16 13:44:38 2018 +0200 tdf#115315 Cursor not in focus with new document Partial revert of 7aae8772aa18744cb1bbd8348272be99cc882c47 ("Clear VclPtr instance reference on removed UserEvents.") Disposing of child controls should not affect focus events of the parent frame. Change-Id: I583311050560a2851cfcc372741b675b52375d06 Reviewed-on: https://gerrit.libreoffice.org/49855 Reviewed-by: Maxim Monastirsky <momonas...@gmail.com> Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Michael Meeks <michael.me...@collabora.com> (cherry picked from commit 11fab5aeaaa72012c63b2c812656a932ef0debf9) Reviewed-on: https://gerrit.libreoffice.org/49869 Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index a3310a5b4976..4a6cab270591 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -486,7 +486,7 @@ void Window::dispose() if ( pSVData->maWinData.mpLastDeacWin == this ) pSVData->maWinData.mpLastDeacWin = nullptr; - if ( mpWindowImpl->mpFrameData ) + if ( mpWindowImpl->mbFrame && mpWindowImpl->mpFrameData ) { if ( mpWindowImpl->mpFrameData->mnFocusId ) Application::RemoveUserEvent( mpWindowImpl->mpFrameData->mnFocusId ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits