diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-06-17 15:12:30 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-06-18 08:41:08 +0000 |
| commit | 0aa10c0b3d5794cd5b701b57de2387eee12076b6 (patch) | |
| tree | dc65d38c1fd10b68ea420ae19960f39360f076a3 | |
| parent | cbe149d66de3050ff3005a5e0b9827f310e5866d (diff) | |
tdf#92088 - don't invalidate disposed toolbar items.
Change-Id: Ie90906f1ed8dc205850df3a48688f66b7a72a4f4
Reviewed-on: https://gerrit.libreoffice.org/16343
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
| -rw-r--r-- | vcl/source/window/toolbox.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 33f3276cfb12..c003b9ada646 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -5609,10 +5609,12 @@ void ToolBox::ImplShowFocus() if( mnHighItemId && HasFocus() ) { ImplToolItem* pItem = ImplGetItem( mnHighItemId ); - if( pItem->mpWindow ) + if( pItem->mpWindow && !pItem->mpWindow->IsDisposed() ) { - vcl::Window *pWin = pItem->mpWindow->ImplGetWindowImpl()->mpBorderWindow ? pItem->mpWindow->ImplGetWindowImpl()->mpBorderWindow : pItem->mpWindow; - pWin->ImplGetWindowImpl()->mbDrawSelectionBackground = true; + WindowImpl *pItemImpl = pItem->mpWindow->ImplGetWindowImpl(); + vcl::Window *pWin = pItemImpl->mpBorderWindow ? + pItemImpl->mpBorderWindow : pItem->mpWindow; + pItemImpl->mbDrawSelectionBackground = true; pWin->Invalidate(); } } |