summaryrefslogtreecommitdiff
path: root/vcl/source/edit/vclmedit.cxx
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-04-30 11:35:55 +0100
committerMichael Meeks <michael.meeks@collabora.com>2015-04-30 11:39:48 +0100
commitca37fcec558414ff44fb61358406ad08fe6ea5bd (patch)
treedf5e64bcb018637f691cc8af99791dbcacc71db8 /vcl/source/edit/vclmedit.cxx
parent10cddaaeabdc7ec3596dcc5e54c187edd520048f (diff)
TextWindow: handle LoseFocus during dispose.
Change-Id: I7a7d9cc7948ee08211cbfaa3df8197c1ede148b7
Diffstat (limited to 'vcl/source/edit/vclmedit.cxx')
-rw-r--r--vcl/source/edit/vclmedit.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index a6313801be94..faf72fb04a67 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 );
}