svx/source/tbxctrls/linectrl.cxx | 3 ++-
svx/source/tbxctrls/tbcontrl.cxx | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 097bf754c09e8b1ba57e3367baa010898611b61b
Author: Maxim Monastirsky <momonas...@gmail.com>
Date: Mon May 2 00:19:50 2016 +0300
tdf#99338 Fix GrabFocus during dispose crashes
Change-Id: I309e1e5f0d28c408c8a95190bf645abf680491b6
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 6b7fc9d..a69693f 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 46538e2..d672e3d 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(
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
