[Libreoffice-commits] core.git: vcl/source

[Michael Meeks]

 vcl/source/window/toolbox.cxx |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 0aa10c0b3d5794cd5b701b57de2387eee12076b6
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>

diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 33f3276..c003b9a 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();
         }
     }