diff options
Diffstat (limited to 'svx')
| -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 6f66d5cd4226..314b95fc3efa 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -595,7 +595,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 ce7d8777273b..e850661720fb 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1943,7 +1943,8 @@ vcl::Window* SvxLineWindow_Impl::GetPreferredKeyInputWindow() void SvxLineWindow_Impl::GetFocus() { - m_aLineStyleLb->GrabFocus(); + if ( m_aLineStyleLb ) + m_aLineStyleLb->GrabFocus(); } void SvxLineWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) |