vcl/source/window/menu.cxx | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-)
New commits: commit c0d50457e88e17a4a0b160f40e92bcfa154f780f Author: Julien Nabet <serval2...@yahoo.fr> Date: Sat Sep 7 20:14:18 2013 +0200 CID#1078725: Dereference null return value + Some simplification Change-Id: Ia4db65f3c6d4e712060753e15acbe160d4fe3ede Reviewed-on: https://gerrit.libreoffice.org/5862 Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index a62f87a..8f24ac4 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -2010,18 +2010,13 @@ OUString Menu::ImplGetHelpText( sal_uInt16 nItemId ) const if ( pData && pData->aHelpText.isEmpty() && (( !pData->aHelpId.isEmpty() ) || ( !pData->aCommandStr.isEmpty() ))) { - if ( pData->aHelpText.isEmpty() && - (( !pData->aHelpId.isEmpty() ) || ( !pData->aCommandStr.isEmpty() ))) + Help* pHelp = Application::GetHelp(); + if ( pHelp ) { - Help* pHelp = Application::GetHelp(); - if ( pHelp ) - { - if (!pData->aCommandStr.isEmpty()) - pData->aHelpText = pHelp->GetHelpText( pData->aCommandStr, NULL ); - - if( pData->aHelpText.isEmpty() && !pData->aHelpId.isEmpty() ) - pData->aHelpText = pHelp->GetHelpText( OStringToOUString( pData->aHelpId, RTL_TEXTENCODING_UTF8 ), NULL ); - } + if (!pData->aCommandStr.isEmpty()) + pData->aHelpText = pHelp->GetHelpText( pData->aCommandStr, NULL ); + if (pData->aHelpText.isEmpty() && !pData->aHelpId.isEmpty()) + pData->aHelpText = pHelp->GetHelpText( OStringToOUString( pData->aHelpId, RTL_TEXTENCODING_UTF8 ), NULL ); } }
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits