allow menu items to be referred to by a name

Change-Id: I8bb1c082e3948f919232b81e0f1f869b88fcd852

5 files changed, 15 insertions, 15 deletions

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;
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index 5ee41bc0da27..5b4b9b3a7b5e 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -302,7 +302,7 @@ void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Eve
                 // none of the items which precede the nSID-slot in the source menu are present in our conversion menu
                 nPrevInConversion = sal::static_int_cast< sal_uInt16 >(-1); // put the item at the first position
 
-            pVCLPopupMenu->InsertItem( nMenuId, m_pResPopupMenu->GetItemText( nMenuId ), m_pResPopupMenu->GetItemBits( nMenuId ), ++nPrevInConversion );
+            pVCLPopupMenu->InsertItem( nMenuId, m_pResPopupMenu->GetItemText( nMenuId ), m_pResPopupMenu->GetItemBits( nMenuId ), OString(), ++nPrevInConversion );
             pVCLPopupMenu->SetItemImage( nMenuId, m_pResPopupMenu->GetItemImage( nMenuId ));
             pVCLPopupMenu->SetHelpId( nMenuId, m_pResPopupMenu->GetHelpId( nMenuId ));
         }
diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx
index cd307cce786a..b0520dea7a77 100644
--- a/framework/source/uielement/headermenucontroller.cxx
+++ b/framework/source/uielement/headermenucontroller.cxx
@@ -174,7 +174,7 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra
                         aStrBuf.appendAscii( "false" );
 
                     pVCLPopupMenu->SetItemCommand( 1, aStrBuf.makeStringAndClear() );
-                    pVCLPopupMenu->InsertSeparator( 1 );
+                    pVCLPopupMenu->InsertSeparator(OString(), 1);
                 }
             }
         }
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 0f2c6ca4cb27..f28788709f3f 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -777,7 +777,7 @@ void MenuBarManager::CheckAndAddMenuExtension( Menu* pMenu )
         if ( nBeforePos != MENU_APPEND )
             nInsertPos = nBeforePos;
 
-        pMenu->InsertItem( nNewItemId, aMenuItem.aLabel, 0, nInsertPos );
+        pMenu->InsertItem(nNewItemId, aMenuItem.aLabel, 0, OString(), nInsertPos);
         pMenu->SetItemCommand( nNewItemId, aMenuItem.aURL );
     }
 }
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 );
                 }