[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sfx2/source

[Caolán McNamara]

 sfx2/source/sidebar/SidebarDockingWindow.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit d743c4052c91651f661943310b0a1293590e6d7f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun May 25 15:55:42 2014 +0100

    Resolves: fdo#79161 sidebar crash on deactivating
    
    Change-Id: I0d559bd8c16243fdc398f6bff0aa915a83a29dff
    (cherry picked from commit f3c9e8471a83e6ceb9258d3a4ab7d3354adcfb3a)

diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index 1fb9f0a..9c0d52e 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -79,7 +79,10 @@ void SidebarDockingWindow::DoDispose (void)
 
 void SidebarDockingWindow::GetFocus()
 {
-    mpSidebarController->GetFocusManager().GrabFocus();
+    if (mpSidebarController.is())
+        mpSidebarController->GetFocusManager().GrabFocus();
+    else
+        SfxDockingWindow::GetFocus();
 }