Kaydet (Commit) 5c147fc5 authored tarafından Xisco Fauli's avatar Xisco Fauli Kaydeden (comit) Caolán McNamara

tdf#120703 (PVS): Recurring check.

V571 The '!aDelData.isDeleted()' condition was already verified in line 359.

Change-Id: Ie66aa65c024e30d34a4b0766ddad3fa24ce98644
Reviewed-on: https://gerrit.libreoffice.org/62163
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 4347b597
......@@ -356,19 +356,18 @@ void Menu::Select()
ImplMenuDelData aDelData( this );
ImplCallEventListeners( VclEventId::MenuSelect, GetItemPos( GetCurItemId() ) );
if ( !aDelData.isDeleted() && !aSelectHdl.Call( this ) )
{
if( !aDelData.isDeleted() )
{
Menu* pStartMenu = ImplGetStartMenu();
if ( pStartMenu && ( pStartMenu != this ) )
{
pStartMenu->nSelectedId = nSelectedId;
pStartMenu->sSelectedIdent = sSelectedIdent;
pStartMenu->aSelectHdl.Call( this );
}
}
}
if (aDelData.isDeleted())
return;
if (aSelectHdl.Call(this))
return;
if (aDelData.isDeleted())
return;
Menu* pStartMenu = ImplGetStartMenu();
if (!pStartMenu || (pStartMenu == this))
return;
pStartMenu->nSelectedId = nSelectedId;
pStartMenu->sSelectedIdent = sSelectedIdent;
pStartMenu->aSelectHdl.Call( this );
}
#if defined(MACOSX)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment