[Libreoffice-commits] core.git: vcl/source

[Michael Meeks]

 vcl/source/edit/vclmedit.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit ca37fcec558414ff44fb61358406ad08fe6ea5bd
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Thu Apr 30 11:35:55 2015 +0100

    TextWindow: handle LoseFocus during dispose.
    
    Change-Id: I7a7d9cc7948ee08211cbfaa3df8197c1ede148b7

diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index a631380..faf72fb 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -738,7 +738,9 @@ TextWindow::~TextWindow()
 void TextWindow::dispose()
 {
     delete mpExtTextView;
+    mpExtTextView = NULL;
     delete mpExtTextEngine;
+    mpExtTextEngine = NULL;
     Window::dispose();
 }
 
@@ -927,7 +929,7 @@ void TextWindow::LoseFocus()
 {
     Window::LoseFocus();
 
-    if ( mbFocusSelectionHide && !mbActivePopup )
+    if ( mbFocusSelectionHide && !mbActivePopup && mpExtTextView )
         mpExtTextView->SetPaintSelection( false );
 }