diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2016-05-02 00:19:50 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2016-05-02 00:22:46 +0300 |
| commit | 097bf754c09e8b1ba57e3367baa010898611b61b (patch) | |
| tree | 316ad53baf2c2d4733c17b9d2805569cac7a1099 /svx/source | |
| parent | 438f2db139dfee1036da3baae85c82c9a14448b5 (diff) | |
tdf#99338 Fix GrabFocus during dispose crashes
Change-Id: I309e1e5f0d28c408c8a95190bf645abf680491b6
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/tbxctrls/linectrl.cxx | 3 | ||||
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 6b7fc9d1ce5d..a69693f0b883 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -581,7 +581,8 @@ void SvxLineEndWindow::GetFocus() SfxPopupWindow::GetFocus(); // Grab the focus to the line ends value set so that it can be controlled // with the keyboard. - aLineEndSet->GrabFocus(); + if ( aLineEndSet ) + aLineEndSet->GrabFocus(); } SvxLineEndToolBoxControl::SvxLineEndToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ) : diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 46538e29f359..d672e3d3eef4 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -2037,7 +2037,8 @@ bool SvxLineWindow_Impl::Close() void SvxLineWindow_Impl::GetFocus() { - m_aLineStyleLb->GrabFocus(); + if ( m_aLineStyleLb ) + m_aLineStyleLb->GrabFocus(); } SfxStyleControllerItem_Impl::SfxStyleControllerItem_Impl( |