From 6773db03a657413a24b87e9ef3a6c68020936e0e Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 7 Jan 2013 12:04:04 +0000 Subject: allow menu items to be referred to by a name Change-Id: I8bb1c082e3948f919232b81e0f1f869b88fcd852 --- framework/source/fwe/classes/addonmenu.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'framework/source/fwe/classes/addonmenu.cxx') diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx index 9d8951734729..f5c5218b9677 100644 --- a/framework/source/fwe/classes/addonmenu.cxx +++ b/framework/source/fwe/classes/addonmenu.cxx @@ -208,9 +208,9 @@ void AddonMenuManager::MergeAddonHelpMenu( const Reference< XFrame >& rFrame, Me { nInsSepAfterPos += ( pHelpMenu->GetItemCount() - nItemCount ); if ( pHelpMenu->GetItemType( nInsSepAfterPos ) != MENUITEM_SEPARATOR ) - pHelpMenu->InsertSeparator( nInsSepAfterPos ); + pHelpMenu->InsertSeparator(OString(), nInsSepAfterPos); } - pHelpMenu->InsertSeparator( nItemCount ); + pHelpMenu->InsertSeparator(OString(), nItemCount); } } } @@ -258,7 +258,7 @@ void AddonMenuManager::MergeAddonPopupMenus( const Reference< XFrame >& rFrame, if ( pAddonPopupMenu->GetItemCount() > 0 ) { pAddonPopupMenu->SetCommandURL( aURL ); - pMergeMenuBar->InsertItem( nId, aTitle, 0, nInsertPos++ ); + pMergeMenuBar->InsertItem( nId, aTitle, 0, OString(), nInsertPos++ ); pMergeMenuBar->SetPopupMenu( nId, pAddonPopupMenu ); // Store the command URL into the VCL menu bar for later identification @@ -325,12 +325,12 @@ void AddonMenuManager::BuildMenu( PopupMenu* pCurrent // have already one before us nElements = 0; bInsertSeparator = sal_False; - pCurrentMenu->InsertSeparator( nInsPos ); + pCurrentMenu->InsertSeparator(OString(), nInsPos); nInsPos = AddonMenuManager::GetNextPos( nInsPos ); } sal_uInt16 nId = nUniqueMenuId++; - pCurrentMenu->InsertItem( nId, aTitle, 0, nInsPos ); + pCurrentMenu->InsertItem(nId, aTitle, 0, OString(), nInsPos); nInsPos = AddonMenuManager::GetNextPos( nInsPos ); ++nElements; -- cgit