[Libreoffice-commits] .: Branch 'libreoffice-3-4-0' - vcl/source

[Fridrich Strba]

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

New commits:
commit 6114c3610011f98ac07c9ac71e16a607b1c188d7
Author: Lucas Baudin <xapantu at gmail.com>
Date:   Fri May 20 13:01:11 2011 +0300

    Fix a bug about presssed button state (fdo#36613)
    
    Signed-off-by: Tor Lillqvist <tlillqvist at novell.com>
    Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>

diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 0897047..a8e1cfb 100644
--- 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() )