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

[Jan Holesovsky]

 vcl/source/window/toolbox.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 020aecf5d916b0c24941337f9c21834d88f4e5cd
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Jun 23 15:09:16 2015 +0200

    tdf#92088: Fix an overlook in the refactor.
    
    This was causing 'if you click in the "default style" combobox in writers
    standard bar and press tab and press tab the next two combo boxes go "blue",
    happens in gtk2, gtk3 and gen.' reported by Caolan.
    
    Change-Id: I0d97a181a605088a0b8bb8043771eb56280521e0

diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index d136965..d038d2c 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -5612,10 +5612,8 @@ void ToolBox::ImplShowFocus()
         ImplToolItem* pItem = ImplGetItem( mnHighItemId );
         if( pItem->mpWindow && !pItem->mpWindow->IsDisposed() )
         {
-            WindowImpl *pItemImpl = pItem->mpWindow->ImplGetWindowImpl();
-            vcl::Window *pWin = pItemImpl->mpBorderWindow ?
-                pItemImpl->mpBorderWindow : pItem->mpWindow;
-            pItemImpl->mbDrawSelectionBackground = true;
+            vcl::Window *pWin = pItem->mpWindow->ImplGetWindowImpl()->mpBorderWindow ? pItem->mpWindow->ImplGetWindowImpl()->mpBorderWindow : pItem->mpWindow;
+            pWin->ImplGetWindowImpl()->mbDrawSelectionBackground = true;
             pWin->Invalidate();
         }
     }