[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - framework/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Thu Oct 31 09:43:10 UTC 2019


 framework/source/uielement/generictoolbarcontroller.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit fe10b429c1d587b86f0bc73b1a243d8070b7f539
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Oct 29 20:25:54 2019 +0000
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Thu Oct 31 10:42:34 2019 +0100

    Resolves: tdf#124267 accelerator in tooltip
    
    Change-Id: I5ab6aa00160aca427b260be535707fa55f6f953e
    Reviewed-on: https://gerrit.libreoffice.org/81716
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index 61ddc35a4ffc..6623e3fb1ffd 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -226,7 +226,8 @@ void GenericToolbarController::statusChanged( const FeatureStateEvent& Event )
                     aStrValue = aTmp;
                 }
                 m_pToolbar->SetItemText( m_nID, aStrValue );
-                m_pToolbar->SetQuickHelpText( m_nID, aStrValue );
+                // tdf#124267 strip mnemonic from tooltip
+                m_pToolbar->SetQuickHelpText(m_nID, aStrValue.replaceFirst("~", ""));
             }
 
             if ( m_bMadeInvisible )


More information about the Libreoffice-commits mailing list