summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-10-23 06:21:25 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-10-27 14:55:43 +0000
commita3a61471b0171a07a2dc38a5bbf1b51681ddb91a (patch)
treea20b3fb986e89bceab8e5e11a7e24c7f8639691c /svx
parent942da061cb439f9cce911590427b60c43b3b9029 (diff)
tdf#93487 - protect GetFocus method call post dispose.
Change-Id: Id61e37e4e9ea62c3dba224e55ddfdc71fb0bfc8c Reviewed-on: https://gerrit.libreoffice.org/19542 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.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 5e15ccd61f25..b6e748749921 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 )