diff options
| author | Telesto <telesto@surfxs.nl> | 2018-02-16 13:44:38 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2018-02-16 18:27:44 +0100 |
| commit | 11fab5aeaaa72012c63b2c812656a932ef0debf9 (patch) | |
| tree | 3e381dea9a3b1c912c61061b8a67497f6e5fb240 | |
| parent | 1ce138c74bfa46c7fa5a80f71e977f95591d5f34 (diff) | |
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 <momonasmon@gmail.com>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
| -rw-r--r-- | vcl/source/window/window.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 6a9612f36e8e..388c793c03d7 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -489,7 +489,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 ); |