weld colsmenu

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

2 files changed, 20 insertions, 14 deletions

diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx
index 9b97b4282e7c..af5dbf5c15ab 100644
--- a/include/svx/fmgridcl.hxx
+++ b/include/svx/fmgridcl.hxx
@@ -27,8 +27,7 @@
 namespace com::sun::star::beans { class XPropertySet; }
 namespace com::sun::star::container { class XIndexContainer; }
 namespace com::sun::star::container { class XNameAccess; }
-
-class PopupMenu;
+namespace weld { class Menu; }
 
 // FmGridHeader
 
@@ -66,10 +65,12 @@ protected:
         All disabled entries will be removed before executing the menu, so be careful with separators
         near entries you probably wish to disable ...
     */
-    virtual void    PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rMenu);
+    virtual void    PreExecuteColumnContextMenu(sal_uInt16 nColId, weld::Menu& rMenu,
+                                                weld::Menu& rInsertMenu, weld::Menu& rChangeMenu,
+                                                weld::Menu& rShowMenu);
     /** After executing the context menu for a column this method is called.
     */
-    virtual void    PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMenu& rMenu, sal_uInt16 nExecutionResult);
+    virtual void    PostExecuteColumnContextMenu(sal_uInt16 nColId, const weld::Menu& rMenu, const OString& rExecutionResult);
 
     // DropTargetHelper
     virtual sal_Int8    AcceptDrop( const AcceptDropEvent& rEvt ) override;
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 9adfceb7b465..b2c3822757dd 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1186,28 +1186,33 @@
 #define RID_STR_UNDO_CONTAINER_REMOVE_MULTIPLE              NC_("RID_STR_UNDO_CONTAINER_REMOVE_MULTIPLE", "Delete # objects")
 #define RID_STR_UNDO_CONTAINER_REPLACE                      NC_("RID_STR_UNDO_CONTAINER_REPLACE", "Replace a container element")
 #define RID_STR_UNDO_MODEL_REPLACE                          NC_("RID_STR_UNDO_MODEL_REPLACE", "Replace Control")
-#define RID_STR_PROPTITLE_PUSHBUTTON                        NC_("RID_STR_PROPTITLE_PUSHBUTTON", "Push Button")
-#define RID_STR_PROPTITLE_RADIOBUTTON                       NC_("RID_STR_PROPTITLE_RADIOBUTTON", "Option Button")
-#define RID_STR_PROPTITLE_CHECKBOX                          NC_("RID_STR_PROPTITLE_CHECKBOX", "Check Box")
-#define RID_STR_PROPTITLE_FIXEDTEXT                         NC_("RID_STR_PROPTITLE_FIXEDTEXT", "Label Field")
-#define RID_STR_PROPTITLE_GROUPBOX                          NC_("RID_STR_PROPTITLE_GROUPBOX", "Group Box")
+
 #define RID_STR_PROPTITLE_EDIT                              NC_("RID_STR_PROPTITLE_EDIT", "Text Box")
-#define RID_STR_PROPTITLE_FORMATTED                         NC_("RID_STR_PROPTITLE_FORMATTED", "Formatted Field")
-#define RID_STR_PROPTITLE_LISTBOX                           NC_("RID_STR_PROPTITLE_LISTBOX", "List Box")
+#define RID_STR_PROPTITLE_CHECKBOX                          NC_("RID_STR_PROPTITLE_CHECKBOX", "Check Box")
 #define RID_STR_PROPTITLE_COMBOBOX                          NC_("RID_STR_PROPTITLE_COMBOBOX", "Combo Box")
-#define RID_STR_PROPTITLE_IMAGEBUTTON                       NC_("RID_STR_PROPTITLE_IMAGEBUTTON", "Image Button")
-#define RID_STR_PROPTITLE_IMAGECONTROL                      NC_("RID_STR_PROPTITLE_IMAGECONTROL", "Image Control")
-#define RID_STR_PROPTITLE_FILECONTROL                       NC_("RID_STR_PROPTITLE_FILECONTROL", "File Selection")
+#define RID_STR_PROPTITLE_LISTBOX                           NC_("RID_STR_PROPTITLE_LISTBOX", "List Box")
 #define RID_STR_PROPTITLE_DATEFIELD                         NC_("RID_STR_PROPTITLE_DATEFIELD", "Date Field")
 #define RID_STR_PROPTITLE_TIMEFIELD                         NC_("RID_STR_PROPTITLE_TIMEFIELD", "Time Field")
 #define RID_STR_PROPTITLE_NUMERICFIELD                      NC_("RID_STR_PROPTITLE_NUMERICFIELD", "Numeric Field")
 #define RID_STR_PROPTITLE_CURRENCYFIELD                     NC_("RID_STR_PROPTITLE_CURRENCYFIELD", "Currency Field")
 #define RID_STR_PROPTITLE_PATTERNFIELD                      NC_("RID_STR_PROPTITLE_PATTERNFIELD", "Pattern Field")
+#define RID_STR_PROPTITLE_FORMATTED                         NC_("RID_STR_PROPTITLE_FORMATTED", "Formatted Field")
+
+#define RID_STR_PROPTITLE_PUSHBUTTON                        NC_("RID_STR_PROPTITLE_PUSHBUTTON", "Push Button")
+#define RID_STR_PROPTITLE_RADIOBUTTON                       NC_("RID_STR_PROPTITLE_RADIOBUTTON", "Option Button")
+#define RID_STR_PROPTITLE_FIXEDTEXT                         NC_("RID_STR_PROPTITLE_FIXEDTEXT", "Label Field")
+#define RID_STR_PROPTITLE_GROUPBOX                          NC_("RID_STR_PROPTITLE_GROUPBOX", "Group Box")
+#define RID_STR_PROPTITLE_IMAGEBUTTON                       NC_("RID_STR_PROPTITLE_IMAGEBUTTON", "Image Button")
+#define RID_STR_PROPTITLE_IMAGECONTROL                      NC_("RID_STR_PROPTITLE_IMAGECONTROL", "Image Control")
+#define RID_STR_PROPTITLE_FILECONTROL                       NC_("RID_STR_PROPTITLE_FILECONTROL", "File Selection")
 #define RID_STR_PROPTITLE_DBGRID                            NC_("RID_STR_PROPTITLE_DBGRID", "Table Control ")
 #define RID_STR_PROPTITLE_SCROLLBAR                         NC_("RID_STR_PROPTITLE_SCROLLBAR", "Scrollbar")
 #define RID_STR_PROPTITLE_SPINBUTTON                        NC_("RID_STR_PROPTITLE_SPINBUTTON", "Spin Button")
 #define RID_STR_PROPTITLE_NAVBAR                            NC_("RID_STR_PROPTITLE_NAVBAR", "Navigation Bar")
 #define RID_STR_PROPTITLE_MULTISELECT                       NC_("RID_STR_PROPTITLE_MULTISELECT", "Multiselection")
+
+#define RID_STR_DATE_AND_TIME                               NC_("RID_STR_DATE_AND_TIME", "Date and Time Field")
+
 #define RID_STR_NODATACONTROLS                              NC_("RID_STR_NODATACONTROLS", "No data-related controls in the current form!")
 #define RID_STR_POSTFIX_DATE                                NC_("RID_STR_POSTFIX_DATE", " (Date)")
 #define RID_STR_POSTFIX_TIME                                NC_("RID_STR_POSTFIX_TIME", " (Time)")