Convert Sort lists tabpage to .ui and adapt code.

Change-Id: I6251d764385ce76deb79606dcada9842544867b2

sc/UIConfig_scalc.mk

@@ -85,6 +85,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
 	sc/uiconfig/scalc/ui/optcompatibilitypage \
 	sc/uiconfig/scalc/ui/optdefaultpage \
 	sc/uiconfig/scalc/ui/optdlg \
+	sc/uiconfig/scalc/ui/optsortlists \
 	sc/uiconfig/scalc/ui/printeroptions \
 	sc/uiconfig/scalc/ui/protectsheetdlg \
 	sc/uiconfig/scalc/ui/rightfooterdialog \

sc/inc/globstr.hrc

@@ -673,7 +673,13 @@
 
 #define STR_FUN_TEXT_SELECTION_COUNT    546
 
-#define STR_COUNT                   547
+#define STR_DISMISS                 547
+#define STR_QUERYREMOVE             548
+#define STR_COPYLIST                549
+#define STR_COPYFROM                550
+#define STR_COPYERR                 551
+
+#define STR_COUNT                   552
 
 #endif
 

sc/source/ui/inc/optdlg.hrc

@@ -37,26 +37,6 @@
 #define BTN_NULLVALS        21
 #define BTN_NOTES           22
 
-
-// TP_USERLISTS:
-#define FT_LISTS            1
-#define LB_LISTS            1
-#define FT_ENTRIES          2
-#define ED_ENTRIES          2
-#define FT_COPYFROM         3
-#define ED_COPYFROM         3
-#define BTN_NEW             1
-#define BTN_ADD             2
-#define BTN_REMOVE          3
-#define BTN_COPY            4
-#define STR_QUERYREMOVE     5
-#define STR_DISMISS         6
-#define STR_COPYLIST        7
-#define STR_COPYFROM        8
-#define STR_COPYERR         9
-
-// TP_PRINT:
-
 // TP_LCONTENT
 
 #define GB_DISPLAY          20

sc/source/ui/inc/tpusrlst.hxx

@@ -23,7 +23,7 @@
 #include <sfx2/tabdlg.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
-#include <svtools/svmedit.hxx>
+#include <vcl/vclmedit.hxx>
 
 //========================================================================
 
@@ -48,19 +48,19 @@ private:
             ~ScTpUserLists();
 
 private:
-    FixedText       aFtLists;
-    ListBox         aLbLists;
-    FixedText       aFtEntries;
-    MultiLineEdit   aEdEntries;
-    FixedText       aFtCopyFrom;
-    Edit            aEdCopyFrom;
-    PushButton      aBtnNew;
-    PushButton      aBtnAdd;
-    PushButton      aBtnRemove;
-    PushButton      aBtnCopy;
+    FixedText*          mpFtLists;
+    ListBox*            mpLbLists;
+    FixedText*          mpFtEntries;
+    VclMultiLineEdit*   mpEdEntries;
+    FixedText*          mpFtCopyFrom;
+    Edit*               mpEdCopyFrom;
+    PushButton*         mpBtnNew;
+    PushButton*         mpBtnAdd;
+    PushButton*         mpBtnRemove;
+    PushButton*         mpBtnCopy;
 
     const String    aStrQueryRemove;
-    const String    aStrNew;
+    String          aStrNew;
     const String    aStrCancel;
     const String    aStrAdd;
     const String    aStrModify;
@@ -97,7 +97,7 @@ private:
     // Handler:
     DECL_LINK( LbSelectHdl,     ListBox* );
     DECL_LINK( BtnClickHdl,     PushButton* );
-    DECL_LINK( EdEntriesModHdl, MultiLineEdit* );
+    DECL_LINK( EdEntriesModHdl, VclMultiLineEdit* );
 #endif
 };
 

sc/source/ui/src/globstr.src

@@ -2065,6 +2065,26 @@ Resource RID_GLOBSTR
     {
         Text [ en-US ] = "Invalid condition." ;
     };
+    String STR_DISMISS
+    {
+        Text [ en-US ] = "~Discard" ;
+    };
+    String STR_QUERYREMOVE
+    {
+        Text [ en-US ] = "Should the entry\n#\nbe deleted?" ;
+    };
+    String STR_COPYLIST
+    {
+        Text [ en-US ] = "Copy List" ;
+    };
+    String STR_COPYFROM
+    {
+        Text [ en-US ] = "List from" ;
+    };
+    String STR_COPYERR
+    {
+        Text [ en-US ] = "Cells without text have been ignored." ;
+    };
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sc/source/ui/src/optdlg.src

@@ -189,105 +189,6 @@ TabPage RID_SCPAGE_FORMULA
     };
 };
 
-TabPage RID_SCPAGE_USERLISTS
-{
-    HelpId = HID_SCPAGE_USERLISTS ;
-    SVLook = TRUE ;
-    Hide = TRUE ;
-    Pos = MAP_APPFONT ( 0 , 0 ) ;
-    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-    FixedText FT_LISTS
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 93 , 8 ) ;
-        Text [ en-US ] = "~Lists" ;
-    };
-    ListBox LB_LISTS
-    {
-        HelpID = "sc:ListBox:RID_SCPAGE_USERLISTS:LB_LISTS";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 15 ) ;
-        Size = MAP_APPFONT ( 93 , 148 ) ;
-    };
-    FixedText FT_ENTRIES
-    {
-        Pos = MAP_APPFONT ( 105 , 3 ) ;
-        Size = MAP_APPFONT ( 93 , 8 ) ;
-        Text [ en-US ] = "~Entries" ;
-    };
-    MultiLineEdit ED_ENTRIES
-    {
-        HelpID = "sc:MultiLineEdit:RID_SCPAGE_USERLISTS:ED_ENTRIES";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 105 , 15 ) ;
-        Size = MAP_APPFONT ( 93 , 148 ) ;
-        VScroll = TRUE ;
-        IgnoreTab = TRUE ;
-    };
-    Edit ED_COPYFROM
-    {
-        HelpID = "sc:Edit:RID_SCPAGE_USERLISTS:ED_COPYFROM";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 70 , 167 ) ;
-        Size = MAP_APPFONT ( 128 , 12 ) ;
-    };
-    FixedText FT_COPYFROM
-    {
-        Pos = MAP_APPFONT ( 6 , 168 ) ;
-        Size = MAP_APPFONT ( 62 , 8 ) ;
-        Text [ en-US ] = "Copy list ~from" ;
-    };
-    PushButton BTN_NEW
-    {
-        HelpID = "sc:PushButton:RID_SCPAGE_USERLISTS:BTN_NEW";
-        Pos = MAP_APPFONT ( 204 , 15 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "~New" ;
-    };
-    PushButton BTN_ADD
-    {
-        HelpID = "sc:PushButton:RID_SCPAGE_USERLISTS:BTN_ADD";
-        Pos = MAP_APPFONT ( 204 , 36 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "~Add" ;
-        Disable = TRUE ;
-    };
-    PushButton BTN_REMOVE
-    {
-        HelpID = "sc:PushButton:RID_SCPAGE_USERLISTS:BTN_REMOVE";
-        Pos = MAP_APPFONT ( 204 , 54 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "~Delete" ;
-    };
-    PushButton BTN_COPY
-    {
-        HelpID = "sc:PushButton:RID_SCPAGE_USERLISTS:BTN_COPY";
-        Pos = MAP_APPFONT ( 204 , 166 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "~Copy" ;
-    };
-    String STR_DISMISS
-    {
-        Text [ en-US ] = "~Discard" ;
-    };
-    String STR_QUERYREMOVE
-    {
-        Text [ en-US ] = "Should the entry\n#\nbe deleted?" ;
-    };
-    String STR_COPYLIST
-    {
-        Text [ en-US ] = "Copy List" ;
-    };
-    String STR_COPYFROM
-    {
-        Text [ en-US ] = "List from" ;
-    };
-    String STR_COPYERR
-    {
-        Text [ en-US ] = "Cells without text have been ignored." ;
-    };
-};
-
 TabPage RID_SCPAGE_CONTENT
 {
     HelpId = HID_SCPAGE_CONTENT ;