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

[Michael Meeks]

 sfx2/source/appl/newhelp.cxx |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit a76dcdfaa6c6d2b1d73fb1c96fe38dd7e452f48a
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Sat May 16 12:59:20 2015 +0100

    tdf#91259 - fix help browser focus issue post dispose.
    
    Change-Id: I0b7758b6780dfbe88aff8f0fc1a93d93b9910d87

diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 4a8ca07..e6c3b2b 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -2719,15 +2719,14 @@ void SfxHelpWindow_Impl::Split()
     InitSizes();
 }
 
-
-
 void SfxHelpWindow_Impl::GetFocus()
 {
-    pTextWin->GrabFocus();
+    if( pTextWin )
+        pTextWin->GrabFocus();
+    else
+        vcl::Window::GetFocus();
 }
 
-
-
 void SfxHelpWindow_Impl::MakeLayout()
 {
     if ( nHeight > 0 && xWindow.is() )