convert customize menu page to .ui

Change-Id: Ifb47cb1e902a64ece951fe9b4d28ba49bbb4b3ee

3 files changed, 27 insertions, 46 deletions

diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index d8cca470ee68..14d9e0fa0d6b 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -321,7 +321,7 @@ protected:
     bool                m_bIsInternalDrag;
 
 public:
-    SvxMenuEntriesListBox( Window*, const ResId& );
+    SvxMenuEntriesListBox(Window*, SvxConfigPage*);
     ~SvxMenuEntriesListBox();
 
     virtual sal_Int8    AcceptDrop( const AcceptDropEvent& rEvt );
@@ -342,19 +342,6 @@ public:
     void                KeyInput( const KeyEvent& rKeyEvent );
 };
 
-class SvxDescriptionEdit : public ExtMultiLineEdit
-{
-private:
-    Rectangle           m_aRealRect;
-
-public:
-    SvxDescriptionEdit( Window* pParent, const ResId& _rId );
-    inline ~SvxDescriptionEdit() {}
-
-    void                SetNewText( const OUString& _rText );
-    inline void         Clear() { SetNewText( OUString() ); }
-};
-
 class SvxConfigPage : public SfxTabPage
 {
 private:
@@ -372,40 +359,38 @@ protected:
 
     // the top section of the tab page where top level menus and toolbars
     //  are displayed in a listbox
-    FixedLine                           aTopLevelSeparator;
-    FixedText                           aTopLevelLabel;
-    ListBox                             aTopLevelListBox;
-    PushButton                          aNewTopLevelButton;
-    MenuButton                          aModifyTopLevelButton;
+    VclFrame*                           m_pTopLevel;
+    FixedText*                          m_pTopLevelLabel;
+    ListBox*                            m_pTopLevelListBox;
+    PushButton*                         m_pNewTopLevelButton;
+    MenuButton*                         m_pModifyTopLevelButton;
 
     // the contents section where the contents of the selected
     // menu or toolbar are displayed
-    FixedLine                           aContentsSeparator;
-    FixedText                           aContentsLabel;
-    SvTreeListBox*                      aContentsListBox;
+    VclFrame*                           m_pContents;
+    FixedText*                          m_pContentsLabel;
+    VclContainer*                       m_pEntries;
+    SvTreeListBox*                      m_pContentsListBox;
 
-    PushButton                          aAddCommandsButton;
-    MenuButton                          aModifyCommandButton;
+    PushButton*                         m_pAddCommandsButton;
+    MenuButton*                         m_pModifyCommandButton;
 
-    ImageButton                         aMoveUpButton;
-    ImageButton                         aMoveDownButton;
+    PushButton*                         m_pMoveUpButton;
+    PushButton*                         m_pMoveDownButton;
 
-    FixedText                           aSaveInText;
-    ListBox                             aSaveInListBox;
+    ListBox*                            m_pSaveInListBox;
 
-    FixedText                           aDescriptionLabel;
-    SvxDescriptionEdit                  aDescriptionField;
+    VclMultiLineEdit*                   m_pDescriptionField;
 
-    SvxScriptSelectorDialog*            pSelectorDlg;
+    SvxScriptSelectorDialog*            m_pSelectorDlg;
 
     /// the ResourceURL to select when opening the dialog
-    OUString                       m_aURLToSelect;
+    OUString                            m_aURLToSelect;
 
     ::com::sun::star::uno::Reference
         < ::com::sun::star::frame::XFrame > m_xFrame;
 
     SvxConfigPage( Window*, const SfxItemSet& );
-    virtual ~SvxConfigPage();
 
     DECL_LINK( MoveHdl, Button * );
 
@@ -421,8 +406,6 @@ protected:
     virtual void            UpdateButtonStates() = 0;
     virtual short           QueryReset() = 0;
 
-    void            PositionContentsListBox();
-
     SvTreeListEntry*    InsertEntry(        SvxConfigEntry* pNewEntryData,
                                         SvTreeListEntry* pTarget = NULL,
                                         bool bFront = false );
@@ -461,8 +444,8 @@ public:
 
     SvxConfigEntry* GetTopLevelSelection()
     {
-        return (SvxConfigEntry*) aTopLevelListBox.GetEntryData(
-            aTopLevelListBox.GetSelectEntryPos() );
+        return (SvxConfigEntry*) m_pTopLevelListBox->GetEntryData(
+            m_pTopLevelListBox->GetSelectEntryPos() );
     }
 
     /** identifies the module in the given frame. If the frame is <NULL/>, a default
@@ -559,9 +542,7 @@ protected:
 
 public:
 
-    SvxToolbarEntriesListBox(
-        Window* pParent, const ResId& );
-
+    SvxToolbarEntriesListBox(Window* pParent, SvxToolbarConfigPage* pPg);
     ~SvxToolbarEntriesListBox();
 
     void            SetChangedListener( const Link& aChangedListener )
@@ -785,10 +766,10 @@ public:
 class SvxIconChangeDialog : public ModalDialog
 {
 private:
-    FixedImage      aFImageInfo;
-    OKButton        aBtnOK;
-    FixedText         aDescriptionLabel;
-    SvxDescriptionEdit aLineEditDescription;
+    FixedImage       aFImageInfo;
+    OKButton         aBtnOK;
+    FixedText        aDescriptionLabel;
+    VclMultiLineEdit aLineEditDescription;
 public:
     SvxIconChangeDialog(Window *pWindow, const OUString& aMessage);
 };
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index c1ea7df3278c..15a63727b974 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -261,7 +261,6 @@
 
 // customize
 #define RID_SVXDLG_CUSTOMIZE                (RID_SVX_START + 291)
-#define RID_SVXPAGE_MENUS                   (RID_SVX_START + 292)
 #define RID_SVXPAGE_TOOLBARS                (RID_SVX_START + 294)
 #define RID_SVXPAGE_CONFIGGROUPBOX          (RID_SVX_START + 304)
 #define RID_SVXDLG_ASSIGNCOMPONENT          (RID_SVX_START + 297)
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 9598b66b29ec..e2917dc9e3b2 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -133,7 +133,6 @@
 #define HID_SVX_CONFIG_TOOLBAR "CUI_HID_SVX_CONFIG_TOOLBAR"
 #define HID_SVX_CONFIG_TOOLBAR_CONTENTS "CUI_HID_SVX_CONFIG_TOOLBAR_CONTENTS"
 #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"
 #define HID_GALLERY_NEWTHEME_FINDFILES "CUI_HID_GALLERY_NEWTHEME_FINDFILES"
 #define HID_GALLERY_NEWTHEME_ADDFILES "CUI_HID_GALLERY_NEWTHEME_ADDFILES"
@@ -160,6 +159,8 @@
 #define HID_SVX_MODIFY_TOOLBAR "CUI_HID_SVX_MODIFY_TOOLBAR"
 #define HID_SVX_NEW_TOOLBAR_ITEM "CUI_HID_SVX_NEW_TOOLBAR_ITEM"
 #define HID_SVX_MODIFY_TOOLBAR_ITEM "CUI_HID_SVX_MODIFY_TOOLBAR_ITEM"
+#define HID_SVX_UP_TOOLBAR_ITEM "CUI_HID_SVX_UP_TOOLBAR_ITEM"
+#define HID_SVX_DOWN_TOOLBAR_ITEM "CUI_HID_SVX_DOWN_TOOLBAR_ITEM"
 #define HID_SVX_SAVE_IN "CUI_HID_SVX_SAVE_IN"
 #define HID_OPTIONS_MULTIPATH_LIST "CUI_HID_OPTIONS_MULTIPATH_LIST"
 #define HID_FM_DLG_SEARCH "CUI_HID_FM_DLG_SEARCH"