convert scenario menu to .ui

Change-Id: Iac0f52898ce9e8484731d62b2555ed3c83563d1d

2 files changed, 8 insertions, 33 deletions

diff --git a/sc/source/ui/navipi/navipi.src b/sc/source/ui/navipi/navipi.src
index a51d48f10fed..4da7b17d911b 100644
--- a/sc/source/ui/navipi/navipi.src
+++ b/sc/source/ui/navipi/navipi.src
@@ -176,23 +176,4 @@ String SCSTR_QHLP_SCEN_COMMENT
     Text [ en-US ] = "Comment";
 };
 
-Menu RID_POPUP_NAVIPI_SCENARIO
-{
-    ItemList =
-    {
-        MenuItem
-        {
-            Identifier = RID_NAVIPI_SCENARIO_DELETE ;
-            HelpId = HID_SC_SCENARIO_DELETE ;
-            Text [ en-US ] = "Delete" ;
-        };
-        MenuItem
-        {
-            Identifier = RID_NAVIPI_SCENARIO_EDIT ;
-            HelpId = HID_SC_SCENARIO_EDIT ;
-            Text [ en-US ] = "Properties..." ;
-        };
-    };
-};
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx
index 71c40d913146..b9ae59960e7f 100644
--- a/sc/source/ui/navipi/scenwnd.cxx
+++ b/sc/source/ui/navipi/scenwnd.cxx
@@ -135,20 +135,14 @@ bool ScScenarioListBox::EventNotify( NotifyEvent& rNEvt )
             {
                 if( !pEntry->mbProtected )
                 {
-                    ScopedVclPtrInstance<ScPopupMenu> aPopup( ScResId( RID_POPUP_NAVIPI_SCENARIO ) );
-                    aPopup->Execute( this, pCEvt->GetMousePosPixel() );
-                    if (aPopup->WasHit())
-                    {
-                        switch( aPopup->GetSelected() )
-                        {
-                            case RID_NAVIPI_SCENARIO_DELETE:
-                                DeleteScenario();
-                            break;
-                            case RID_NAVIPI_SCENARIO_EDIT:
-                                EditScenario();
-                            break;
-                        }
-                    }
+                    VclBuilder aBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "modules/scalc/ui/scenariomenu.ui", "");
+                    VclPtr<PopupMenu> aPopup(aBuilder.get_menu("menu"));
+                    sal_uInt16 nId = aPopup->Execute(this, pCEvt->GetMousePosPixel());
+                    OString sIdent(aPopup->GetItemIdent(nId));
+                    if (sIdent == "delete")
+                        DeleteScenario();
+                    else if (sIdent == "edit")
+                        EditScenario();
                 }
             }
             bHandled = true;