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

[Caolán McNamara (via logerrit)]

 vcl/source/control/tabctrl.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 6f7e48c00fc879158576c36c4bfcfdc0440f201d
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Feb 11 10:19:01 2021 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Feb 11 12:40:20 2021 +0100

    Related: tdf#139667 allow TabControl tabs to always show tooltips
    
    If one is set, then just show it. The removed restrictions seem to have
    been added in...
    
    commit 85702858a81c72b40f0e7e3ce05e677ffb996da9
    Date:   Tue Dec 16 16:42:03 2008 +0000
    
        CWS-TOOLING: integrate CWS alf01
    
    fix: #158798# show tooltip if only a image is shown
    
    where #158798# is old private bugtracker
    
    and referenced public #i95201# add: images for tab items
    
    has no mention of the restrictions
    
    Change-Id: Ia11952700fb212397bf0c0228666a1545817ce8d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110757
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index c4cb34ef5fae..571926faaca2 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -1415,8 +1415,7 @@ void TabControl::RequestHelp( const HelpEvent& rHEvt )
         {
             ImplTabItem* pItem = ImplGetItem( nItemId );
             const OUString& rHelpText = pItem->maHelpText;
-            // show tooltip if not text but image is set and helptext is available
-            if ( !rHelpText.isEmpty() && pItem->maText.isEmpty() && !!pItem->maTabImage )
+            if (!rHelpText.isEmpty())
             {
                 tools::Rectangle aItemRect = ImplGetTabRect( GetPagePos( nItemId ) );
                 Point aPt = OutputToScreenPixel( aItemRect.TopLeft() );