[Libreoffice] [Patch] [PUSHED] [REVIEW REQUEST] Hover over icons produces the wrong behavior

[Tor Lillqvist]

Your patch(es) fixed the problem on Windows, too, as far as I could see. Pushed to master. Thanks!

For 3-4 and 3-4-0, I think we should do only this hunk:

--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -3494,7 +3494,8 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_Bool bHighlight, sal_Bool bPain
     MetricVector* pVector = bLayout ? &mpData->m_pLayoutData->m_aUnicodeBoundRects : NULL;
     String* pDisplayText = bLayout ? &mpData->m_pLayoutData->m_aDisplayText : NULL;
     
-    bHighlight = bHighlight && pItem->mbEnabled;
+    if(!pItem->mbEnabled)
+        bHighlight = 0;
 
     // Falls Rechteck ausserhalb des sichbaren Bereichs liegt
     if ( pItem->maRect.IsEmpty() )


Will verify that just this fixes the problem (testing only on Windows), and then if I get approvals, push to 3-4 and 3-4-0 branches.

--tml