(openoffice) branch AOO42X updated: Revert changes to menu button

[jim]

This is an automated email from the ASF dual-hosted git repository.

jimjag pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/AOO42X by this push:
     new 0c620f18d9 Revert changes to menu button
0c620f18d9 is described below

commit 0c620f18d9daf7818d41b86dc8477846bf2d1308
Author: mseidel <msei...@apache.org>
AuthorDate: Wed Mar 9 17:09:39 2022 +0100

    Revert changes to menu button
    
    (cherry picked from commit 323a7b1d0184c1f13b360b02635f65e11294182c)
---
 main/vcl/source/window/toolbox.cxx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/main/vcl/source/window/toolbox.cxx 
b/main/vcl/source/window/toolbox.cxx
index 315cddf3ac..23fe53642b 100644
--- a/main/vcl/source/window/toolbox.cxx
+++ b/main/vcl/source/window/toolbox.cxx
@@ -3278,7 +3278,6 @@ void ToolBox::ImplDrawMenubutton( ToolBox *pThis, 
sal_Bool bHighlight )
             g.SetEndColor( 
pThis->GetSettings().GetStyleSettings().GetShadowColor() );
 
             pThis->DrawGradient( aInnerRect, g );
-            pThis->DrawRect( aInnerRect );
         }
 
         Rectangle aRect( aInnerRect );
@@ -3670,7 +3669,7 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_Bool 
bHighlight, sal_Bool bPain
         {
             // left align also to leave space for drop down arrow
             // and when drawing text+image
-            // just center in y, except for vertical (i.e. rotated text)
+            // just center in y, except for vertical (ie rotated text)
             if( mbHorz || !bText )
                 nImageOffY += (nBtnHeight-aImageSize.Height())/2;
         }
@@ -5562,7 +5561,7 @@ void ToolBox::LoseFocus()
 
 // -----------------------------------------------------------------------
 
-// performs the action associated with an item, i.e. simulates clicking the 
item
+// performs the action associated with an item, ie simulates clicking the item
 void ToolBox::TriggerItem( sal_uInt16 nItemId, sal_Bool bShift, sal_Bool bCtrl 
)
 {
     mnHighItemId = nItemId;