[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/source

[Michael Meeks]

 vcl/source/window/brdwin.cxx |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

New commits:
commit c63fbe170276d65aa97a29ba2f53fce63272b428
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Thu Jul 9 14:17:30 2015 +0100

    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 at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/16896
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 33db8bd..97dbc5b 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()