use css::awt::XPopupMenu api instead of PopupMenu

Change-Id: Iedd1e2a7db826bdf876f4b6ed0535882b9460c12
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126037
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

2 files changed, 8 insertions, 6 deletions

diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx
index 7e70f0f0a3bb..beb9779efb66 100644
--- a/framework/inc/uielement/macrosmenucontroller.hxx
+++ b/framework/inc/uielement/macrosmenucontroller.hxx
@@ -46,8 +46,8 @@ namespace framework
             virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 
         private:
-            void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu > const & rPopupMenu );
-            void addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 startItemId );
+            void fillPopupMenu(const css::uno::Reference<css::awt::XPopupMenu>& rPopupMenu);
+            void addScriptItems(const css::uno::Reference<css::awt::XPopupMenu>& rPopupMenu, sal_uInt16 startItemId);
     };
 }
 
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx
index a4c5123f50c7..cddfed74c693 100644
--- a/framework/source/uielement/macrosmenucontroller.cxx
+++ b/framework/source/uielement/macrosmenucontroller.cxx
@@ -94,7 +94,7 @@ void MacrosMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > cons
     pPopupMenu->SetItemCommand( 2, aCommand );
 
     // insert providers but not basic or java
-    addScriptItems( pPopupMenu, 4);
+    addScriptItems(rPopupMenu, 4);
 }
 
 // XEventListener
@@ -124,7 +124,7 @@ void SAL_CALL MacrosMenuController::statusChanged( const FeatureStateEvent& )
     }
 }
 
-void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 startItemId )
+void MacrosMenuController::addScriptItems(const Reference<css::awt::XPopupMenu>& rPopupMenu, sal_uInt16 startItemId)
 {
     static const OUStringLiteral aCmdBase(u".uno:ScriptOrganizer?ScriptOrganizer.Language:string=");
     static const OUStringLiteral ellipsis( u"..." );
@@ -133,6 +133,8 @@ void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 sta
     Reference< XContentEnumerationAccess > xEnumAccess( m_xContext->getServiceManager(), UNO_QUERY_THROW );
     Reference< XEnumeration > xEnum = xEnumAccess->createContentEnumeration ( "com.sun.star.script.provider.LanguageScriptProvider" );
 
+    sal_Int16 nPos = rPopupMenu->getItemCount();
+
     while ( xEnum->hasMoreElements() )
     {
         Reference< XServiceInfo > xServiceInfo;
@@ -155,8 +157,8 @@ void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 sta
                 }
                 aCommand += aDisplayName;
                 aDisplayName += ellipsis;
-                pPopupMenu->InsertItem( itemId, aDisplayName );
-                pPopupMenu->SetItemCommand( itemId, aCommand );
+                rPopupMenu->insertItem(itemId, aDisplayName, 0, nPos++);
+                rPopupMenu->setCommand(itemId, aCommand);
                 itemId++;
                 break;
             }