svn commit: r1603803 - in /openoffice/branches/AOO410: ./ main/ main/sfx2/source/sidebar/SidebarDockingWindow.cxx

[orw]

Author: orw
Date: Thu Jun 19 09:57:52 2014
New Revision: 1603803

URL: http://svn.apache.org/r1603803
Log:
124891: <SidebarDockingWindow::GetFocus()> - check, if sidebar controller is 
available before accessing it.

        cherry-picked from trunk


Modified:
    openoffice/branches/AOO410/   (props changed)
    openoffice/branches/AOO410/main/   (props changed)
    openoffice/branches/AOO410/main/sfx2/source/sidebar/SidebarDockingWindow.cxx

Propchange: openoffice/branches/AOO410/
------------------------------------------------------------------------------
  Merged /openoffice/trunk:r1600630

Propchange: openoffice/branches/AOO410/main/
------------------------------------------------------------------------------
  Merged /openoffice/trunk/main:r1600630

Modified: 
openoffice/branches/AOO410/main/sfx2/source/sidebar/SidebarDockingWindow.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sfx2/source/sidebar/SidebarDockingWindow.cxx?rev=1603803&r1=1603802&r2=1603803&view=diff
==============================================================================
--- 
openoffice/branches/AOO410/main/sfx2/source/sidebar/SidebarDockingWindow.cxx 
(original)
+++ 
openoffice/branches/AOO410/main/sfx2/source/sidebar/SidebarDockingWindow.cxx 
Thu Jun 19 09:57:52 2014
@@ -84,7 +84,10 @@ void SidebarDockingWindow::DoDispose (vo
 
 void SidebarDockingWindow::GetFocus()
 {
-    mpSidebarController->GetFocusManager().GrabFocus();
+    if (mpSidebarController.is())
+    {
+        mpSidebarController->GetFocusManager().GrabFocus();
+    }
 }