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

[Julien Nabet]

 vcl/unx/kde4/KDESalFrame.cxx |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 91c8b357ee2a27e50da0e99386e53d351e55cfda
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Mon Mar 18 22:03:52 2013 +0100

    Cppcheck: Variables reassigned before the old one has been use
    
    See http://nabble.documentfoundation.org/cppcheck-Variables-reassigned-before-the-old-one-has-been-used-vcl-kde4-part-td4044235.html
    
    Change-Id: I9ce272c4116395a95a09e5633acfeaa5b1edbe12

diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index 6f3fe53..6039daa 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -298,11 +298,8 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
         QPalette qMenuCG = pMenuBar->palette();
 
         // Menu text and background color, theme specific
-        Color aMenuFore = toColor( qMenuCG.color( QPalette::WindowText ) );
-        Color aMenuBack = toColor( qMenuCG.color( QPalette::Window ) );
-
-        aMenuFore = toColor( qMenuCG.color( QPalette::ButtonText ) );
-        aMenuBack = toColor( qMenuCG.color( QPalette::Button ) );
+        Color aMenuFore = toColor( qMenuCG.color( QPalette::ButtonText ) );
+        Color aMenuBack = toColor( qMenuCG.color( QPalette::Button ) );
 
         style.SetMenuTextColor( aMenuFore );
         style.SetMenuBarTextColor( aMenuFore );