summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-10-23 06:21:25 +0100
committerMichael Meeks <michael.meeks@collabora.com>2015-10-26 10:39:36 +0000
commitff3e81600c2e4512ea3992b4abd3ab23b5c8a110 (patch)
tree21b34e76b1f00785b5d453ca35d60cfbc15db79f /svx
parent1877228ae8e7cc298cf4e45d061ee54774aa1d08 (diff)
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>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx3
1 files changed, 2 insertions, 1 deletions
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 )