[Libreoffice-commits] core.git: include/svx svx/inc svx/source svx/uiconfig svx/UIConfig_svx.mk

[Caolán McNamara]

 include/svx/dialogs.hrc            |    1 -
 svx/UIConfig_svx.mk                |    1 +
 svx/inc/helpid.hrc                 |    1 -
 svx/source/stbctrls/stbctrls.h     |    2 --
 svx/source/stbctrls/stbctrls.src   |   12 ------------
 svx/source/stbctrls/xmlsecctrl.cxx |    6 ++++--
 svx/uiconfig/ui/xmlsecstatmenu.ui  |   17 +++++++++++++++++
 7 files changed, 22 insertions(+), 18 deletions(-)

New commits:
commit 6b6d642fe56868114669bab73f00df88afeab7fb
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Apr 5 15:02:12 2017 +0100

    convert RID_SVXMNU_XMLSECSTATBAR menu to .ui
    
    Change-Id: I16ca1543baa14cdc14dbcebd5e6093e6f3029a61

diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index f92402b9446b..af5ee763eeab 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -145,7 +145,6 @@
 
 // ResId for funktion popup menue
 #define RID_SVXMNU_PSZ_FUNC                 (RID_SVX_START +  83)
-#define RID_SVXMNU_XMLSECSTATBAR            (RID_SVX_START +  84)
 
 #define RID_SVXBMP_SLIDERBUTTON             (RID_SVX_START +  66)
 #define RID_SVXBMP_SLIDERDECREASE           (RID_SVX_START +  67)
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index 5c71dc2240de..ae2f419b73b1 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -79,6 +79,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
 	svx/uiconfig/ui/textcontrolchardialog \
 	svx/uiconfig/ui/textcontrolparadialog \
 	svx/uiconfig/ui/textunderlinecontrol \
+	svx/uiconfig/ui/xmlsecstatmenu \
 	svx/uiconfig/ui/xformspage \
 ))
 
diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index 7c9f9838f098..6ebd60d993ce 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -69,7 +69,6 @@
 #define HID_POPUP_LINEEND_CTRL                                "SVX_HID_POPUP_LINEEND_CTRL"
 #define HID_STYLE_LISTBOX                                     "SVX_HID_STYLE_LISTBOX"
 #define HID_VALUESET_EXTRUSION_LIGHTING                       "SVX_HID_VALUESET_EXTRUSION_LIGHTING"
-#define HID_XMLSEC_CALL                                       "SVX_HID_XMLSEC_CALL"
 
 #endif
 
diff --git a/svx/source/stbctrls/stbctrls.h b/svx/source/stbctrls/stbctrls.h
index 91d4fa9987b5..316cab0eb458 100644
--- a/svx/source/stbctrls/stbctrls.h
+++ b/svx/source/stbctrls/stbctrls.h
@@ -40,8 +40,6 @@
 #define PSZ_FUNC_SELECTION_COUNT    13
 #define PSZ_FUNC_NONE               16
 
-#define XMLSEC_CALL         1
-
 #define SELECTION_STANDARD  1
 #define SELECTION_EXTENDED  2
 #define SELECTION_ADDED     3
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index 033cfbac6277..e8f9c072e1b4 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -298,18 +298,6 @@ Menu RID_SVXMNU_PSZ_FUNC
         };
     };
 };
-Menu RID_SVXMNU_XMLSECSTATBAR
-{
-    ItemList =
-    {
-        MenuItem
-        {
-            Identifier = XMLSEC_CALL ;
-            HelpId = HID_XMLSEC_CALL ;
-            Text [ en-US ] = "Digital Signatures..." ;
-        };
-    };
-};
 
 Bitmap RID_SVXBMP_POSITION
 {
diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx
index ba706e8e506e..42f94aeeefba 100644
--- a/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/svx/source/stbctrls/xmlsecctrl.cxx
@@ -19,6 +19,7 @@
 
 
 #include <vcl/status.hxx>
+#include <vcl/builder.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/image.hxx>
 #include <sfx2/signaturestate.hxx>
@@ -101,8 +102,9 @@ void XmlSecStatusBarControl::Command( const CommandEvent& rCEvt )
 {
     if( rCEvt.GetCommand() == CommandEventId::ContextMenu )
     {
-        ScopedVclPtrInstance<PopupMenu> aPopupMenu( ResId( RID_SVXMNU_XMLSECSTATBAR, DIALOG_MGR() ) );
-        if( aPopupMenu->Execute( &GetStatusBar(), rCEvt.GetMousePosPixel() ) )
+        VclBuilder aBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "svx/ui/xmlsecstatmenu.ui", "");
+        VclPtr<PopupMenu> aPopupMenu(aBuilder.get_menu("menu"));
+        if (aPopupMenu->Execute(&GetStatusBar(), rCEvt.GetMousePosPixel()))
         {
             css::uno::Any a;
             SfxUInt16Item aState( GetSlotId(), 0 );
diff --git a/svx/uiconfig/ui/xmlsecstatmenu.ui b/svx/uiconfig/ui/xmlsecstatmenu.ui
new file mode 100644
index 000000000000..c8b31350f431
--- /dev/null
+++ b/svx/uiconfig/ui/xmlsecstatmenu.ui
@@ -0,0 +1,17 @@
+<?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="signatures">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Digital Signatures...</property>
+        <property name="use_underline">True</property>
+      </object>
+    </child>
+  </object>
+</interface>