diff options
author | Thorsten Behrens <tbehrens@novell.com> | 2010-10-09 00:58:40 +0200 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2010-10-09 00:58:40 +0200 |
commit | da70226f13e877d0b82e1e4fa3e38fca60b6db0d (patch) | |
tree | bb35b6e821143e941041adc2ed5349dbb281e4f5 | |
parent | 3a8c74ddc47656d1d7ed3f0c133946d878e01631 (diff) |
framework-menubar-fix.diff: Framework menubar fix
-rw-r--r-- | framework/source/uielement/menubarmerger.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx index 51f87a400a..852e4560dd 100644 --- a/framework/source/uielement/menubarmerger.cxx +++ b/framework/source/uielement/menubarmerger.cxx @@ -101,6 +101,14 @@ ReferencePathInfo MenuBarMerger::FindReferencePath( { sal_uInt32 i( 0 ); const sal_uInt32 nCount( rReferencePath.size() ); + + ReferencePathInfo aResult; + if ( !nCount ) + { + aResult.eResult = RP_MENUITEM_NOT_FOUND; + return aResult; + } + Menu* pCurrMenu( pMenu ); RPResultInfo eResult( RP_OK ); @@ -142,7 +150,6 @@ ReferencePathInfo MenuBarMerger::FindReferencePath( } while (( pCurrMenu != 0 ) && ( i < nCount ) && ( eResult == RP_OK )); - ReferencePathInfo aResult; aResult.pPopupMenu = pCurrMenu; aResult.nPos = nPos; aResult.nLevel = nLevel; |