diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-05-25 15:55:42 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-05-25 16:11:16 +0100 |
| commit | d743c4052c91651f661943310b0a1293590e6d7f (patch) | |
| tree | 2c4df1f7db4fdc5715509dd35ca551223aae01e0 | |
| parent | 94f4d28eb4d0a2cb73581f1483f18bb072c81b4a (diff) | |
Resolves: fdo#79161 sidebar crash on deactivating
Change-Id: I0d559bd8c16243fdc398f6bff0aa915a83a29dff
(cherry picked from commit f3c9e8471a83e6ceb9258d3a4ab7d3354adcfb3a)
| -rw-r--r-- | sfx2/source/sidebar/SidebarDockingWindow.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx index 1fb9f0a1a029..9c0d52e151eb 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(); } |