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 | 6e9b6af919e54be26a7b806c47e86617f62c3229 (patch) | |
tree | 54668aeaed24757d58ae8126efcd1d9af457f5fd /framework/source/uielement/menubarmerger.cxx | |
parent | efec9416d772edf205a54c92374ed0a31bbb80f6 (diff) |
framework-menubar-fix.diff: Framework menubar fix
Diffstat (limited to 'framework/source/uielement/menubarmerger.cxx')
-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 f82253345778..595ca1c38fe6 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; |