I stumbled upon a big chunk of code that's commented out in
ToolbarMenu::implPaint not touched since November 2005.
ciao,
Christian
From 39b3296fadc53c740c53145f8562eef9d246c1b1 Mon Sep 17 00:00:00 2001
From: Christian Dywan <christian.dy...@lanedo.com>
Date: Tue, 19 Apr 2011 15:27:29 +0200
Subject: [PATCH] Remove unused chunk of toolbar menu code
---
svtools/source/control/toolbarmenu.cxx | 47 --------------------------------
1 files changed, 0 insertions(+), 47 deletions(-)
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index 56be64e..a8a3e67 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -1570,53 +1570,6 @@ void ToolbarMenu::implPaint( ToolbarMenuEntry* pThisOnly, bool bHighlighted )
DrawCtrlText( aTmpPos, pEntry->maText, 0, pEntry->maText.Len(), nStyle, NULL, NULL ); // pVector, pDisplayText );
}
-/*
- // Accel
- if ( !bLayout && !bIsMenuBar && pData->aAccelKey.GetCode() && !ImplAccelDisabled() )
- {
- XubString aAccText = pData->aAccelKey.GetName();
- aTmpPos.X() = aOutSz.Width() - this->GetTextWidth( aAccText );
- aTmpPos.X() -= 4*nExtra;
-
- aTmpPos.X() -= nOuterSpace;
- aTmpPos.Y() = aPos.Y();
- aTmpPos.Y() += nTextOffsetY;
- this->DrawCtrlText( aTmpPos, aAccText, 0, aAccText.Len(), nTextStyle );
- }
-*/
-
-/*
- // SubMenu?
- if ( !bLayout && !bIsMenuBar && pData->pSubMenu )
- {
- aTmpPos.X() = aOutSz.Width() - nFontHeight + nExtra - nOuterSpace;
- aTmpPos.Y() = aPos.Y();
- aTmpPos.Y() += nExtra/2;
- aTmpPos.Y() += ( pEntry->maSize.Height() / 2 ) - ( nFontHeight/4 );
- if ( pEntry->mnBits & MIB_POPUPSELECT )
- {
- this->SetTextColor( rSettings.GetMenuTextColor() );
- Point aTmpPos2( aPos );
- aTmpPos2.X() = aOutSz.Width() - nFontHeight - nFontHeight/4;
- aDecoView.DrawFrame(
- Rectangle( aTmpPos2, Size( nFontHeight+nFontHeight/4, pEntry->maSize.Height() ) ), FRAME_DRAW_GROUP );
- }
- aDecoView.DrawSymbol(
- Rectangle( aTmpPos, Size( nFontHeight/2, nFontHeight/2 ) ),
- SYMBOL_SPIN_RIGHT, this->GetTextColor(), nSymbolStyle );
-// if ( pEntry->mnBits & MIB_POPUPSELECT )
-// {
-// aTmpPos.Y() += nFontHeight/2 ;
-// this->SetLineColor( rSettings.GetShadowColor() );
-// this->DrawLine( aTmpPos, Point( aTmpPos.X() + nFontHeight/3, aTmpPos.Y() ) );
-// this->SetLineColor( rSettings.GetLightColor() );
-// aTmpPos.Y()++;
-// this->DrawLine( aTmpPos, Point( aTmpPos.X() + nFontHeight/3, aTmpPos.Y() ) );
-// this->SetLineColor();
-// }
- }
-*/
-
if ( pThisOnly && bHighlighted )
{
// This restores the normal menu or menu bar text
--
1.7.1
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice