[Libreoffice-commits] core.git: sfx2/source

[Jeffrey Stedfast]

 sfx2/source/menu/mnumgr.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 3f8e114bae8bb3ef45a08ced3434e7a9669ed4f9
Author: Jeffrey Stedfast <jeff at xamarin.com>
Date:   Sat Jul 26 17:31:20 2014 -0400

    fdo#71770 Fixed Cut/Copy/Paste popup menu items to appear at the top
    
    Change-Id: I14b3ad87536b2cf7e2e21ba00cb2afa18c2c95a3
    Reviewed-on: https://gerrit.libreoffice.org/10564
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index b2cbdce..6f2f5db 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -298,13 +298,13 @@ SfxPopupMenuManager* SfxPopupMenuManager::Popup( const ResId& rResId, SfxViewFra
     {
         PopupMenu aPop( SfxResId( MN_CLIPBOARDFUNCS ) );
         nCount = aPop.GetItemCount();
-        pSVMenu->InsertSeparator();
         for ( n=0; n<nCount; n++ )
         {
             sal_uInt16 nId = aPop.GetItemId( n );
-            pSVMenu->InsertItem( nId, aPop.GetItemText( nId ), aPop.GetItemBits( nId ) );
+            pSVMenu->InsertItem( nId, aPop.GetItemText( nId ), aPop.GetItemBits( nId ), OString(), n );
             pSVMenu->SetHelpId( nId, aPop.GetHelpId( nId ));
         }
+        pSVMenu->InsertSeparator( OString(), n );
     }
 
     InsertVerbs_Impl( &pFrame->GetBindings(), pFrame->GetViewShell()->GetVerbs(), pSVMenu );
@@ -348,13 +348,13 @@ void SfxPopupMenuManager::ExecutePopup( const ResId& rResId, SfxViewFrame* pFram
     {
         PopupMenu aPop( SfxResId( MN_CLIPBOARDFUNCS ) );
         nCount = aPop.GetItemCount();
-        pSVMenu->InsertSeparator();
         for ( n=0; n<nCount; n++ )
         {
             sal_uInt16 nId = aPop.GetItemId( n );
-            pSVMenu->InsertItem( nId, aPop.GetItemText( nId ), aPop.GetItemBits( nId ) );
+            pSVMenu->InsertItem( nId, aPop.GetItemText( nId ), aPop.GetItemBits( nId ), OString(), n );
             pSVMenu->SetHelpId( nId, aPop.GetHelpId( nId ));
         }
+        pSVMenu->InsertSeparator( OString(), n );
     }
 
     InsertVerbs_Impl( &pFrame->GetBindings(), pFrame->GetViewShell()->GetVerbs(), pSVMenu );