convert bookmark menu to .ui

Change-Id: I7b62c3234fd986a0648b9a543d0e44a922ee15e4

6 files changed, 53 insertions, 37 deletions

diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk
index e057deb2973b..ecb8c62b9e55 100644
--- a/sfx2/UIConfig_sfx.mk
+++ b/sfx2/UIConfig_sfx.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_UIConfig_UIConfig,sfx))
 $(eval $(call gb_UIConfig_add_uifiles,sfx,\
 	sfx2/uiconfig/ui/alienwarndialog \
 	sfx2/uiconfig/ui/bookmarkdialog \
+	sfx2/uiconfig/ui/bookmarkmenu \
 	sfx2/uiconfig/ui/checkin \
 	sfx2/uiconfig/ui/cmisinfopage \
 	sfx2/uiconfig/ui/cmisline \
diff --git a/sfx2/inc/app.hrc b/sfx2/inc/app.hrc
index e08c2ac5f268..1a95425fecf8 100644
--- a/sfx2/inc/app.hrc
+++ b/sfx2/inc/app.hrc
@@ -35,7 +35,6 @@
 
 #define CONFIG_PATH_START               (RID_SFX_APP_START+98)
 
-#define MENU_HELP_BOOKMARKS                     (RID_SFX_APP_START+105)
 #define STR_INFO_NOSEARCHRESULTS                (RID_SFX_APP_START+106)
 #define STR_INFO_NOSEARCHTEXTFOUND              (RID_SFX_APP_START+107)
 
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 061d94622c0a..4cb7668d9135 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -1247,10 +1247,19 @@ bool BookmarksBox_Impl::EventNotify( NotifyEvent& rNEvt )
         const CommandEvent* pCEvt = rNEvt.GetCommandEvent();
         if ( pCEvt->GetCommand() == CommandEventId::ContextMenu )
         {
-            ScopedVclPtrInstance<PopupMenu> aMenu( SfxResId( MENU_HELP_BOOKMARKS ) );
-            sal_uInt16 nId = aMenu->Execute( this, pCEvt->GetMousePosPixel() );
-            if ( nId != MENU_ITEM_NOTFOUND )
-                DoAction( nId );
+            VclBuilder aBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "sfx/ui/bookmarkmenu.ui", "");
+            VclPtr<PopupMenu> aMenu(aBuilder.get_menu("menu"));
+            sal_uInt16 nId = aMenu->Execute(this, pCEvt->GetMousePosPixel());
+            if (nId != MENU_ITEM_NOTFOUND)
+            {
+                OString sIdent = aMenu->GetCurItemIdent();
+                if (sIdent == "display")
+                    DoAction(MID_OPEN);
+                else if (sIdent == "rename")
+                    DoAction(MID_RENAME);
+                else if (sIdent == "delete")
+                    DoAction(MID_DELETE);
+            }
             bRet = true;
         }
     }
diff --git a/sfx2/source/appl/newhelp.src b/sfx2/source/appl/newhelp.src
index 2955f9052499..ae0bd6d3bce9 100644
--- a/sfx2/source/appl/newhelp.src
+++ b/sfx2/source/appl/newhelp.src
@@ -141,35 +141,6 @@ String STR_HELP_MENU_TEXT_COPY
     Text [ en-US ] = "~Copy" ;
 };
 
-Menu MENU_HELP_BOOKMARKS
-{
-    ItemList =
-    {
-        MenuItem
-        {
-            Identifier = MID_OPEN ;
-            HelpId = HID_HELP_BOOKMARKS_OPEN;
-            Text [ en-US ] = "Display";
-        };
-        MenuItem
-        {
-            Separator = TRUE ;
-        };
-        MenuItem
-        {
-            Identifier = MID_RENAME ;
-            HelpId = HID_HELP_BOOKMARKS_RENAME;
-            Text [ en-US ] = "Rename...";
-        };
-        MenuItem
-        {
-            Identifier = MID_DELETE ;
-            HelpId = HID_HELP_BOOKMARKS_DELETE;
-            Text [ en-US ] = "Delete";
-        };
-    };
-};
-
 String STR_INFO_NOSEARCHRESULTS
 {
     Text [ en-US ] = "No topics found.";
diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc
index da1baf6fc394..70f21bf2ee70 100644
--- a/sfx2/source/inc/helpid.hrc
+++ b/sfx2/source/inc/helpid.hrc
@@ -42,9 +42,6 @@
 #define HID_HELP_TOOLBOXITEM_PRINT                            "SFX2_HID_HELP_TOOLBOXITEM_PRINT"
 #define HID_HELP_TOOLBOXITEM_BOOKMARKS                        "SFX2_HID_HELP_TOOLBOXITEM_BOOKMARKS"
 #define HID_HELP_TOOLBOXITEM_SEARCHDIALOG                     "SFX2_HID_HELP_TOOLBOXITEM_SEARCHDIALOG"
-#define HID_HELP_BOOKMARKS_OPEN                               "SFX2_HID_HELP_BOOKMARKS_OPEN"
-#define HID_HELP_BOOKMARKS_RENAME                             "SFX2_HID_HELP_BOOKMARKS_RENAME"
-#define HID_HELP_BOOKMARKS_DELETE                             "SFX2_HID_HELP_BOOKMARKS_DELETE"
 #define HID_HELP_TEXT_SELECTION_MODE                          "SFX2_HID_HELP_TEXT_SELECTION_MODE"
 
 #define HID_CONFIG_SAVE                                       "SFX2_HID_CONFIG_SAVE"
diff --git a/sfx2/uiconfig/ui/bookmarkmenu.ui b/sfx2/uiconfig/ui/bookmarkmenu.ui
new file mode 100644
index 000000000000..84e0aa6840d7
--- /dev/null
+++ b/sfx2/uiconfig/ui/bookmarkmenu.ui
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
+<interface>
+  <requires lib="gtk+" version="3.10"/>
+  <object class="GtkMenu" id="menu">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkMenuItem" id="display">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Display</property>
+        <property name="use_underline">True</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="menuitem1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="rename">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Rename...</property>
+        <property name="use_underline">True</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="delete">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Delete</property>
+        <property name="use_underline">True</property>
+      </object>
+    </child>
+  </object>
+</interface>