convert run macro to .ui

Change-Id: I4e83afa3d164ba0ae8640f4b5f2712b88c1e305f

3 files changed, 45 insertions, 37 deletions

diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 8a0c5600d3b8..710f6cff183a 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -24,6 +24,16 @@
 
 // Resource-Id's ------------------------------------------------------------
 
+#define RID_SVX_MSGBOX_JAVA_RESTART         (RID_SVX_START + 0)
+#define RID_SVX_MSGBOX_OPTIONS_RESTART      (RID_SVX_START + 1)
+#define RID_SVX_MSGBOX_LANGUAGE_RESTART     (RID_SVX_START + 2)
+#define RID_CUI_DIALOG_COLORPICKER          (RID_SVX_START + 3)
+
+#define RID_CUIIMG_HARDDISK                 (RID_SVX_START + 4)
+#define RID_CUIIMG_LIB                      (RID_SVX_START + 5)
+#define RID_CUIIMG_MACRO                    (RID_SVX_START + 6)
+#define RID_CUIIMG_DOC                      (RID_SVX_START + 7)
+
 // Gallery
 #define RID_CUI_GALLERY_START               (RID_SVX_START + 360)
 //      RID_CUI_GALLERY_END                 (RID_SVX_START + 410)
@@ -157,15 +167,12 @@
 #define RID_SVXSTR_COLOR_CONFIG_SAVE2       (RID_SVX_START + 854)
 #define RID_SVXSTR_COLOR_CONFIG_DELETE      (RID_SVX_START + 855)
 #define RID_SVXSTR_OPT_DOUBLE_DICTS         (RID_SVX_START + 320)
-#define RID_SVX_MSGBOX_LANGUAGE_RESTART     ( RID_SVX_START +  2 )
 #define RID_SVXERR_OPT_PROXYPORTS           (RID_SVX_START + 224)
 #define RID_SVXDLG_OPT_JAVASCRIPT_DISABLE   (RID_SVX_START + 225)
 #define RID_SVXDLG_JAVA_PARAMETER           (RID_SVX_START + 254)
 #define RID_SVXDLG_JAVA_CLASSPATH           (RID_SVX_START + 255)
 #define RID_SVXERR_JRE_NOT_RECOGNIZED       (RID_SVX_START + 256)
 #define RID_SVXERR_JRE_FAILED_VERSION       (RID_SVX_START + 257)
-#define RID_SVX_MSGBOX_JAVA_RESTART         ( RID_SVX_START +  0 )
-#define RID_SVX_MSGBOX_OPTIONS_RESTART      ( RID_SVX_START +  1 )
 #define RID_SVXDLG_LNG_ED_NUM_PREBREAK      (RID_SVX_START +  830)
 #define RID_SVXDLG_EDIT_MODULES             (RID_SVX_START +  831)
 #define RID_SVXSTR_PATH_NAME_START          (RID_SVX_START + 1003)
@@ -315,7 +322,7 @@
 #define RID_SVXPAGE_EVENTS                  (RID_SVX_START + 295)
 #define RID_SVXPAGE_CONFIGGROUPBOX          (RID_SVX_START + 304)
 #define RID_SVXDLG_ASSIGNCOMPONENT          (RID_SVX_START + 297)
-#define RID_DLG_SCRIPTSELECTOR              (RID_SVX_START + 259)
+
 #define RID_SVXSTR_NEW_MENU                 (RID_SVX_START + 1039)
 #define RID_SVXSTR_NEW_TOOLBAR              (RID_SVX_START + 1040)
 #define RID_SVXSTR_MOVE_MENU                (RID_SVX_START + 1041)
@@ -418,9 +425,11 @@
 
 #define RID_SVXSTR_ERR_TEXTNOTFOUND                         (RID_SVX_START + 1195)
 #define RID_SVXSTR_SELECT_FILE_IFRAME                       (RID_SVX_START + 1196)
+#define RID_SVXSTR_MYMACROS                                 (RID_SVX_START + 1197)
+#define RID_SVXSTR_PRODMACROS                               (RID_SVX_START + 1198)
+#define RID_SVXSTR_SELECTOR_ADD_COMMANDS                    (RID_SVX_START + 1199)
+#define RID_SVXSTR_SELECTOR_RUN                             (RID_SVX_START + 1200)
 
-#define RID_SVXDLG_CERTPATH                                 (RID_SVX_START + 1198)
-
-#define RID_CUI_DIALOG_COLORPICKER                          (RID_SVX_START + 3)
+#define RID_SVXDLG_CERTPATH                                 (RID_SVX_START + 1201)
 
 #endif
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 38ed2206142a..8387ebaab4e5 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -170,11 +170,8 @@
 #define HID_SVX_CONFIG_EVENT "CUI_HID_SVX_CONFIG_EVENT"
 #define HID_CONFIG_EVENT_OFFICE_BASED "CUI_HID_CONFIG_EVENT_OFFICE_BASED"
 #define HID_CONFIG_EVENT_DOCUMENT_BASED "CUI_HID_CONFIG_EVENT_DOCUMENT_BASED"
-#define HID_SELECTOR_DIALOG "CUI_HID_SELECTOR_DIALOG"
-#define HID_SELECTOR_CATEGORIES "CUI_HID_SELECTOR_CATEGORIES"
 #define HID_SVX_CONFIG_TOOLBAR "CUI_HID_SVX_CONFIG_TOOLBAR"
 #define HID_SVX_CONFIG_TOOLBAR_CONTENTS "CUI_HID_SVX_CONFIG_TOOLBAR_CONTENTS"
-#define HID_SELECTOR_COMMANDS "CUI_HID_SELECTOR_COMMANDS"
 #define HID_GALLERY_EDIT_MSNAME "CUI_HID_GALLERY_EDIT_MSNAME"
 #define HID_SVX_CONFIG_MENU "CUI_HID_SVX_CONFIG_MENU"
 #define HID_SVX_CONFIG_MENU_CONTENTS "CUI_HID_SVX_CONFIG_MENU_CONTENTS"
diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx
index c4a8c7ec69d8..28459b33594b 100644
--- a/cui/source/inc/selector.hxx
+++ b/cui/source/inc/selector.hxx
@@ -89,9 +89,9 @@ public:
     virtual Image GetImage( const rtl::OUString& rCommandURL ) = 0;
 };
 
-class SvxConfigFunctionListBox_Impl : public SvTreeListBox
+class SvxConfigFunctionListBox : public SvTreeListBox
 {
-friend class SvxConfigGroupListBox_Impl;
+friend class SvxConfigGroupListBox;
     Timer                           aTimer;
     SvTreeListEntry*                    pCurEntry;
     SvxGroupInfoArr_Impl            aArr;
@@ -100,13 +100,16 @@ friend class SvxConfigGroupListBox_Impl;
     DECL_LINK(TimerHdl, void *);
     virtual void                    MouseMove( const MouseEvent& rMEvt );
 
+    void Init();
+
 public:
-                                    SvxConfigFunctionListBox_Impl( Window*, const ResId& );
-                                    ~SvxConfigFunctionListBox_Impl();
+                                    SvxConfigFunctionListBox(Window*, const ResId&);
+                                    SvxConfigFunctionListBox(Window* pParent);
+                                    ~SvxConfigFunctionListBox();
     void                            ClearAll();
     String                          GetHelpText( SvTreeListEntry *pEntry );
     using Window::GetHelpText;
-    SvTreeListEntry*                    GetLastSelectedEntry();
+    SvTreeListEntry*                GetLastSelectedEntry();
     void                            FunctionSelected();
 
     // drag n drop methods
@@ -118,12 +121,12 @@ public:
     virtual void        DragFinished( sal_Int8 );
 };
 
-class SvxConfigGroupListBox_Impl : public SvTreeListBox
+class SvxConfigGroupListBox : public SvTreeListBox
 {
     SvxGroupInfoArr_Impl            aArr;
     bool                            m_bShowSlots;
 
-    SvxConfigFunctionListBox_Impl*  pFunctionListBox;
+    SvxConfigFunctionListBox*  pFunctionListBox;
     ImageProvider*                  m_pImageProvider;
 
     ::com::sun::star::uno::Reference
@@ -162,21 +165,23 @@ protected:
     using SvListView::Expand;
 
 public:
-            SvxConfigGroupListBox_Impl (
+            SvxConfigGroupListBox (
                 Window* pParent, const ResId&,
                 bool _bShowSlots,
                 const ::com::sun::star::uno::Reference
                     < ::com::sun::star::frame::XFrame >& xFrame
             );
+            SvxConfigGroupListBox(Window* pParent);
+            ~SvxConfigGroupListBox();
 
-            ~SvxConfigGroupListBox_Impl();
+    void    Init(bool bShowSlots, const ::com::sun::star::uno::Reference
+                    < ::com::sun::star::frame::XFrame >& xFrame);
 
-    void    Init();
     void    Open( SvTreeListEntry*, sal_Bool );
     void    ClearAll();
     void    GroupSelected();
 
-    void    SetFunctionListBox( SvxConfigFunctionListBox_Impl *pBox )
+    void    SetFunctionListBox( SvxConfigFunctionListBox *pBox )
         { pFunctionListBox = pBox; }
 
     void    SetImageProvider( ImageProvider* provider )
@@ -185,26 +190,21 @@ public:
 
 class SvxScriptSelectorDialog : public ModelessDialog
 {
-    FixedText                       aDialogDescription;
-    FixedText                       aGroupText;
-    SvxConfigGroupListBox_Impl      aCategories;
-    FixedText                       aFunctionText;
-    SvxConfigFunctionListBox_Impl   aCommands;
-    OKButton                        aOKButton;
-    CancelButton                    aCancelButton;
-    HelpButton                      aHelpButton;
-    FixedLine                       aDescription;
-    FixedText                       aDescriptionText;
-
-    sal_Bool                            m_bShowSlots;
+    FixedText*                      m_pDialogDescription;
+    SvxConfigGroupListBox*          m_pCategories;
+    SvxConfigFunctionListBox*       m_pCommands;
+    PushButton*                     m_pOKButton;
+    PushButton*                     m_pCancelButton;
+    VclMultiLineEdit*               m_pDescriptionText;
+    OUString                        m_sDefaultDesc;
+    sal_Bool                        m_bShowSlots;
     Link                            m_aAddHdl;
 
     DECL_LINK( ClickHdl, Button * );
     DECL_LINK( SelectHdl, Control* );
     DECL_LINK( FunctionDoubleClickHdl, Control* );
 
-    void                                UpdateUI();
-    void                                ResizeControls();
+    void                            UpdateUI();
 
 public:
 
@@ -220,8 +220,10 @@ public:
     void        SetAddHdl( const Link& rLink ) { m_aAddHdl = rLink; }
     const Link& GetAddHdl() const { return m_aAddHdl; }
 
-    void        SetImageProvider( ImageProvider* provider )
-        { aCategories.SetImageProvider( provider ); }
+    void        SetImageProvider(ImageProvider* provider)
+    {
+        m_pCategories->SetImageProvider(provider);
+    }
 
     String      GetScriptURL() const;
     String      GetSelectedDisplayName();