diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-07-09 14:17:30 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-07-09 16:23:21 +0000 |
| commit | c63fbe170276d65aa97a29ba2f53fce63272b428 (patch) | |
| tree | 9e25903c9de0f80e7351e6c0835187d0e22f0916 | |
| parent | e5988f2fdb4c4b3bb2beadf26a386cbd2e9d297e (diff) | |
tdf#92055 - make ImplBorderWindow more tolerant of post-dispose events.
Change-Id: I9556c920e6fc8b5595eee6bd00d36669e1684e25
Reviewed-on: https://gerrit.libreoffice.org/16892
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/16896
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | vcl/source/window/brdwin.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index 33db8bd5f2ff..97dbc5be0840 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -1851,27 +1851,32 @@ void ImplBorderWindow::dispose() void ImplBorderWindow::MouseMove( const MouseEvent& rMEvt ) { - mpBorderView->MouseMove( rMEvt ); + if (mpBorderView) + mpBorderView->MouseMove( rMEvt ); } void ImplBorderWindow::MouseButtonDown( const MouseEvent& rMEvt ) { - mpBorderView->MouseButtonDown( rMEvt ); + if (mpBorderView) + mpBorderView->MouseButtonDown( rMEvt ); } void ImplBorderWindow::Tracking( const TrackingEvent& rTEvt ) { - mpBorderView->Tracking( rTEvt ); + if (mpBorderView) + mpBorderView->Tracking( rTEvt ); } void ImplBorderWindow::Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) { - mpBorderView->DrawWindow(rRenderContext, BORDERWINDOW_DRAW_ALL); + if (mpBorderView) + mpBorderView->DrawWindow(rRenderContext, BORDERWINDOW_DRAW_ALL); } void ImplBorderWindow::Draw( const Rectangle&, OutputDevice* pOutDev, const Point& rPos ) { - mpBorderView->DrawWindow(*pOutDev, BORDERWINDOW_DRAW_ALL, &rPos); + if (mpBorderView) + mpBorderView->DrawWindow(*pOutDev, BORDERWINDOW_DRAW_ALL, &rPos); } void ImplBorderWindow::Activate() |