diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-09-04 10:44:14 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-09-05 14:36:54 +0200 |
| commit | dcc05d40c6fdb41a4193072d6b72456d75269ba3 (patch) | |
| tree | 9baedfbbcdaaaae2cb956c32c0493361232074ae | |
| parent | b5f9c2351b5ca73acf02906a73d7d90cd1fcdf61 (diff) | |
this assert is too strong
Change-Id: I130996a78695b38eb200a2b22a68e0aca575e3af
| -rw-r--r-- | vcl/source/window/menu.cxx | 4 |
1 files changed, 1 insertions, 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() && |