From 76197b88727b15cab5c1d4021b23a9a6b13626de Mon Sep 17 00:00:00 2001
From: Jan Holesovsky <kendy@suse.cz>
Date: Mon, 25 Jun 2012 13:06:23 +0200
Subject: Revert "aero menubar: Make the text in menu black."

This reverts commit 9164d135db46be9de56ef60f4b95bbd933fdb57e.
---
 vcl/source/window/menu.cxx | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'vcl/source')

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 2bf8202079f6..935d5a9ec9ac 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2669,17 +2669,11 @@ void Menu::ImplPaint( Window* pWin, sal_uInt16 nBorder, long nStartY, MenuItemDa
                         // draw selected item
                         MenubarValue aControlValue;
                         aControlValue.maTopDockingAreaHeight = ImplGetTopDockingAreaHeight( pWin );
-
-                        // transparent menubar needs a trick to write nice text, do it via NWF
-                        OUString aText;
-                        if ( bIsMenuBar && ImplGetSVData()->maNWFData.mbTransparentMenubar )
-                            aText = pData->aText;
-
                         pWin->DrawNativeControl( CTRL_MENUBAR, PART_MENU_ITEM,
                                 aRect,
                                 CTRL_STATE_ENABLED | ( bHighlight? CTRL_STATE_SELECTED: 0 ),
                                 aControlValue,
-                                aText );
+                                OUString() );
 
                         pWin->Pop();
                     }
@@ -2809,8 +2803,7 @@ void Menu::ImplPaint( Window* pWin, sal_uInt16 nBorder, long nStartY, MenuItemDa
                 }
 
                 // Text:
-                if ( ( ( pData->eType == MENUITEM_STRING ) || ( pData->eType == MENUITEM_STRINGIMAGE ) ) &&
-                     !(bIsMenuBar && ImplGetSVData()->maNWFData.mbTransparentMenubar) )
+                if ( ( pData->eType == MENUITEM_STRING ) || ( pData->eType == MENUITEM_STRINGIMAGE ) )
                 {
                     aTmpPos.X() = aPos.X() + nTextPos;
                     aTmpPos.Y() = aPos.Y();
-- 
cgit