diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-01-07 12:04:04 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-01-07 16:17:52 +0000 |
| commit | 6773db03a657413a24b87e9ef3a6c68020936e0e (patch) | |
| tree | 9944195abaf8ce6b344a172edae69d14bf1b0ffb /framework/source/uielement/menubarmerger.cxx | |
| parent | b2a106249f1624a61a9453bf50f1a17d75ea1825 (diff) | |
allow menu items to be referred to by a name
Change-Id: I8bb1c082e3948f919232b81e0f1f869b88fcd852
Diffstat (limited to 'framework/source/uielement/menubarmerger.cxx')
| -rw-r--r-- | framework/source/uielement/menubarmerger.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx index 64a5d363d71e..80fefdfbad11 100644 --- a/framework/source/uielement/menubarmerger.cxx +++ b/framework/source/uielement/menubarmerger.cxx @@ -178,11 +178,11 @@ bool MenuBarMerger::CreateSubMenu( { if ( rMenuItem.aURL.equalsAsciiL( SEPARATOR_STRING, SEPARATOR_STRING_LEN )) { - pSubMenu->InsertSeparator( MENU_APPEND ); + pSubMenu->InsertSeparator(); } else { - pSubMenu->InsertItem( nItemId, rMenuItem.aTitle, 0, MENU_APPEND ); + pSubMenu->InsertItem(nItemId, rMenuItem.aTitle); pSubMenu->SetItemCommand( nItemId, rMenuItem.aURL ); if ( !rMenuItem.aSubMenu.empty() ) { @@ -219,11 +219,11 @@ bool MenuBarMerger::MergeMenuItems( { if ( rMenuItem.aURL.equalsAsciiL( SEPARATOR_STRING, SEPARATOR_STRING_LEN )) { - pMenu->InsertSeparator( nPos+nModIndex+nIndex ); + pMenu->InsertSeparator(OString(), nPos+nModIndex+nIndex); } else { - pMenu->InsertItem( nItemId, rMenuItem.aTitle, 0, nPos+nModIndex+nIndex ); + pMenu->InsertItem(nItemId, rMenuItem.aTitle, 0, OString(), nPos+nModIndex+nIndex); pMenu->SetItemCommand( nItemId, rMenuItem.aURL ); if ( !rMenuItem.aSubMenu.empty() ) { @@ -343,10 +343,10 @@ bool MenuBarMerger::ProcessFallbackOperation( if ( IsCorrectContext( rMenuItem.aContext, rModuleIdentifier )) { if ( rMenuItem.aURL.equalsAsciiL( SEPARATOR_STRING, SEPARATOR_STRING_LEN )) - pCurrMenu->InsertSeparator( MENU_APPEND ); + pCurrMenu->InsertSeparator(OString(), MENU_APPEND); else { - pCurrMenu->InsertItem( rItemId, rMenuItem.aTitle, 0, MENU_APPEND ); + pCurrMenu->InsertItem(rItemId, rMenuItem.aTitle); pCurrMenu->SetItemCommand( rItemId, rMenuItem.aURL ); ++rItemId; } @@ -371,7 +371,7 @@ bool MenuBarMerger::ProcessFallbackOperation( else { // normal case: insert a new item with popup - pCurrMenu->InsertItem( rItemId, ::rtl::OUString(), 0, MENU_APPEND ); + pCurrMenu->InsertItem(rItemId, OUString()); pCurrMenu->SetItemCommand( rItemId, aCmd ); pCurrMenu->SetPopupMenu( rItemId, pPopupMenu ); } |