[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/source

[Michael Meeks]

 vcl/source/window/toolbox.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 575629963e370e05c0ca90d58838094a5b4d11ff
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Wed Jun 17 15:12:30 2015 +0200

    tdf#92088 - don't invalidate disposed toolbar items.
    
    Change-Id: Ie90906f1ed8dc205850df3a48688f66b7a72a4f4
    Reviewed-on: https://gerrit.libreoffice.org/16343
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/16428
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index f79fa80..20ab55d 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;