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

[Caolán McNamara]

 sd/source/ui/sidebar/NavigatorWrapper.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 90d8bf72d9ea8fa678707326a3cc4b84fae154a1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu May 7 14:18:44 2015 +0100

    VclPtr: clicking on another sidebar button when navigator open crashes
    
    Change-Id: Iafcc7246a1149a25f6d6fdfb09cf3e85227580db

diff --git a/sd/source/ui/sidebar/NavigatorWrapper.cxx b/sd/source/ui/sidebar/NavigatorWrapper.cxx
index 972a737..bd3a13a 100644
--- a/sd/source/ui/sidebar/NavigatorWrapper.cxx
+++ b/sd/source/ui/sidebar/NavigatorWrapper.cxx
@@ -77,7 +77,10 @@ void NavigatorWrapper::UpdateNavigator()
 
 void NavigatorWrapper::GetFocus()
 {
-    maNavigator->GrabFocus();
+    if (maNavigator)
+        maNavigator->GrabFocus();
+    else
+        Control::GetFocus();
 }
 
 } } // end of namespace sd::sidebar