Kaydet (Commit) 57562996 authored tarafından Michael Meeks's avatar Michael Meeks Kaydeden (comit) Jan Holesovsky

tdf#92088 - don't invalidate disposed toolbar items.

Change-Id: Ie90906f1ed8dc205850df3a48688f66b7a72a4f4
Reviewed-on: https://gerrit.libreoffice.org/16343Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
Tested-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/16428Reviewed-by: 's avatarJan Holesovsky <kendy@collabora.com>
Tested-by: 's avatarJan Holesovsky <kendy@collabora.com>
üst df36fb62
...@@ -5610,7 +5610,7 @@ void ToolBox::ImplShowFocus() ...@@ -5610,7 +5610,7 @@ void ToolBox::ImplShowFocus()
if( mnHighItemId && HasFocus() ) if( mnHighItemId && HasFocus() )
{ {
ImplToolItem* pItem = ImplGetItem( mnHighItemId ); 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; vcl::Window *pWin = pItem->mpWindow->ImplGetWindowImpl()->mpBorderWindow ? pItem->mpWindow->ImplGetWindowImpl()->mpBorderWindow : pItem->mpWindow;
pWin->ImplGetWindowImpl()->mbDrawSelectionBackground = true; pWin->ImplGetWindowImpl()->mbDrawSelectionBackground = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment