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

[Michael Meeks]

 vcl/source/control/ilstbox.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d425cc7c73a8ad3d693216742d75b0f7f1bf5f89
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Mon May 11 21:15:13 2015 +0100

    tdf#90990 - listbox focus issue post dispose.
    
    Change-Id: I091662fed0ebe121d023a1bed1eda79e6eb5a09e

diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index a5ef9a9..f1b9c23 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -2241,10 +2241,10 @@ void ImplListBox::SetNoSelection()
 
 void ImplListBox::GetFocus()
 {
-    if (!maLBWindow || maLBWindow->IsDisposed())
-        return;
-
-    maLBWindow->GrabFocus();
+    if (maLBWindow)
+        maLBWindow->GrabFocus();
+    else
+        Control::GetFocus();
 }
 
 vcl::Window* ImplListBox::GetPreferredKeyInputWindow()