diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-06-17 15:12:30 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-06-23 13:21:06 +0000 |
| commit | 575629963e370e05c0ca90d58838094a5b4d11ff (patch) | |
| tree | 003e2ce71e7f7522d47d51446a205990c8d7e145 | |
| parent | df36fb6208123b0d61911c4714d1ab39c4e8285a (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>
Reviewed-on: https://gerrit.libreoffice.org/16428
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
| -rw-r--r-- | vcl/source/window/toolbox.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index f79fa80637b8..20ab55da96ed 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -5610,7 +5610,7 @@ 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; |