[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - svx/source

[Michael Meeks]

 svx/source/tbxctrls/tbcontrl.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a3a61471b0171a07a2dc38a5bbf1b51681ddb91a
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Fri Oct 23 06:21:25 2015 +0100

    tdf#93487 - protect GetFocus method call post dispose.
    
    Change-Id: Id61e37e4e9ea62c3dba224e55ddfdc71fb0bfc8c
    Reviewed-on: https://gerrit.libreoffice.org/19542
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Tested-by: Stephan Bergmann <sbergman at redhat.com>

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