core.git: vcl/source

[Xisco Fauli (via logerrit)]

 vcl/source/window/menu.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 8b7dfd32f417652087e3d880bcbf88bc2b4d2676
Author:     Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Sat Jan 18 10:04:33 2025 +0100
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Sat Jan 18 12:02:54 2025 +0100

    vcl: Dereferencing NULL pointer 'pData'
    
    After
    commit a108fce773d46441e30dcc14abe29751410ae4ed
    Author: Michael Weghorn <m.wegh...@posteo.de>
    Date:   Fri Jan 17 14:18:30 2025 +0100
    
        tdf#163186 qt: Show menu item tooltips
    
    C: 
/cygwin/home/tdf/lode/jenkins/workspace/lo_tb_master_win_analyze/vcl/source/window/menu.cxx(1144):
 error C2220: the following warning is treated as an error
    C:     Change-Id: I62e8462fcff83817f876489a10bd010e246a1d01
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180430
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index f7032281f7b2..75936aed46ca 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1137,10 +1137,12 @@ void Menu::SetTipHelpText( sal_uInt16 nItemId, const 
OUString& rStr )
     MenuItemData* pData = pItemList->GetData( nItemId );
 
     if ( pData )
+    {
         pData->aTipHelpText = rStr;
 
-    if (ImplGetSalMenu() && pData->pSalMenuItem)
-        ImplGetSalMenu()->SetItemTooltip(pData->pSalMenuItem.get(), rStr);
+        if (ImplGetSalMenu() && pData->pSalMenuItem)
+            ImplGetSalMenu()->SetItemTooltip(pData->pSalMenuItem.get(), rStr);
+    }
 }
 
 OUString Menu::GetTipHelpText( sal_uInt16 nItemId ) const