[Libreoffice-commits] core.git: framework/source

Samuel Mehrbrodt s.mehrbrodt at gmail.com
Wed Sep 24 13:30:48 PDT 2014


 framework/source/uielement/generictoolbarcontroller.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 1fb8724f9834dbc07b741eeed31b31347bc0c2a1
Author: Samuel Mehrbrodt <s.mehrbrodt at gmail.com>
Date:   Sat Sep 6 14:51:55 2014 +0200

    fdo#83558 Don't change toolbar tooltip on state change
    
    Also removed EraseAllMnemonicChars since that method is called later by SetItemText
    
    Change-Id: I10139d437290ccfed6a8a15e8e5ce501e15c2560
    Reviewed-on: https://gerrit.libreoffice.org/11306
    Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt at gmail.com>
    Tested-by: Samuel Mehrbrodt <s.mehrbrodt at gmail.com>

diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index 38f8e23..c3a836b 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -243,9 +243,7 @@ throw ( RuntimeException, std::exception )
                     aTmp += aStrValue.copy( 4 );
                     aStrValue = aTmp;
                 }
-                OUString aText( MnemonicGenerator::EraseAllMnemonicChars( aStrValue ) );
-                m_pToolbar->SetItemText( m_nID, aText );
-                m_pToolbar->SetQuickHelpText( m_nID, aText );
+                m_pToolbar->SetItemText( m_nID, aStrValue );
             }
 
             if ( m_bMadeInvisible )


More information about the Libreoffice-commits mailing list