From dcc05d40c6fdb41a4193072d6b72456d75269ba3 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Wed, 4 Sep 2013 10:44:14 +0200 Subject: this assert is too strong Change-Id: I130996a78695b38eb200a2b22a68e0aca575e3af --- vcl/source/window/menu.cxx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 69625d613be2..a62f87aff75f 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -2007,9 +2007,7 @@ OUString Menu::ImplGetHelpText( sal_uInt16 nItemId ) const { MenuItemData* pData = pItemList->GetData( nItemId ); - assert ( pData ); - - if ( pData->aHelpText.isEmpty() && + if ( pData && pData->aHelpText.isEmpty() && (( !pData->aHelpId.isEmpty() ) || ( !pData->aCommandStr.isEmpty() ))) { if ( pData->aHelpText.isEmpty() && -- cgit v1.2.3