From ff3e81600c2e4512ea3992b4abd3ab23b5c8a110 Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@collabora.com>
Date: Fri, 23 Oct 2015 06:21:25 +0100
Subject: tdf#93487 - protect GetFocus method call post dispose.

Change-Id: Id61e37e4e9ea62c3dba224e55ddfdc71fb0bfc8c
Reviewed-on: https://gerrit.libreoffice.org/19541
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
---
 svx/source/tbxctrls/tbcontrl.cxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'svx')

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index c60f81a95e75..0dc30fa42043 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1638,7 +1638,8 @@ vcl::Window* SvxFrameWindow_Impl::GetPreferredKeyInputWindow()
 
 void SvxFrameWindow_Impl::GetFocus()
 {
-    aFrameSet->GrabFocus();
+    if (aFrameSet)
+        aFrameSet->GrabFocus();
 }
 
 void SvxFrameWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt )
-- 
cgit