RID_SVXDLG_SEARCHFORM dialog convert

Change-Id: I6c5f1d83733c17a561ec2218f6260794b0c4de37
Reviewed-on: https://gerrit.libreoffice.org/8718Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

cui/AllLangResTarget_cui.mk

@@ -29,7 +29,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
     cui/source/dialogs/colorpicker.src \
     cui/source/dialogs/commonlingui.src \
     cui/source/dialogs/cuires.src \
-    cui/source/dialogs/fmsearch.src \
     cui/source/dialogs/gallery.src \
     cui/source/dialogs/hangulhanjadlg.src \
     cui/source/dialogs/hlmarkwn.src \

cui/UIConfig_cui.mk

@@ -47,6 +47,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
 	cui/uiconfig/ui/eventassigndialog \
 	cui/uiconfig/ui/eventassignpage \
 	cui/uiconfig/ui/formatnumberdialog \
+	cui/uiconfig/ui/fmsearchdialog \
 	cui/uiconfig/ui/gradientpage \
 	cui/uiconfig/ui/colorconfigwin \
 	cui/uiconfig/ui/connpooloptions \

cui/source/dialogs/fmsearch.hrc

@@ -21,7 +21,6 @@
 
 #include "svl/solar.hrc"
 
-#define RID_SVXDLG_SEARCHFORM                       (RID_FORMS_START + 7)
 #define RID_STR_SEARCH_ANYWHERE                     (RID_FORMS_START +  85)
 #define RID_STR_SEARCH_BEGINNING                    (RID_FORMS_START +  86)
 #define RID_STR_SEARCH_END                          (RID_FORMS_START +  87)
@@ -34,44 +33,6 @@
 #define RID_STR_OVERFLOW_BACKWARD                   (RID_FORMS_START +  35)
 #define RID_STR_SEARCH_COUNTING                     (RID_FORMS_START +  76)
 
-#define FT_FORM             2
-#define FT_POSITION         3
-#define FT_RECORDLABEL      4
-#define FT_RECORD           5
-#define FT_HINT             6
-
-
-#define CMB_SEARCHTEXT      1
-
-#define RB_ALLFIELDS        1
-#define RB_SINGLEFIELD      2
-#define RB_SEARCHFORTEXT    3
-#define RB_SEARCHFORNULL    4
-#define RB_SEARCHFORNOTNULL 5
-
-#define LB_FORM             1
-#define LB_FIELD            2
-#define LB_POSITION         3
-
-#define PB_APPROXSETTINGS       1
-#define PB_SEARCH               2
-#define PB_SOUNDSLIKESETTINGS   3
-
-#define FL_SEARCHFOR            1
-#define FL_WHERE                        2
-#define FL_OPTIONS                      3
-#define FL_STATE                        4
-
-#define CB_USEFORMATTER     1
-#define CB_BACKWARD         2
-#define CB_STARTOVER        3
-#define CB_CASE             4
-#define CB_WILDCARD         5
-#define CB_REGULAR          6
-#define CB_APPROX           7
-#define CB_HALFFULLFORMS    8
-#define CB_SOUNDSLIKECJK    9
-
 #endif // _FMSEARCH_HRC
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

cui/source/dialogs/fmsearch.src

@@ -20,258 +20,6 @@
 #include "fmsearch.hrc"
 #include "helpid.hrc"
 
-ModalDialog RID_SVXDLG_SEARCHFORM
-{
-    OutputSize = TRUE;
-    SVLook = TRUE;
-    Size = MAP_APPFONT( 300, 253 );
-    Text [ en-US ] = "Record Search";
-    Moveable = TRUE;
-    HelpId = HID_FM_DLG_SEARCH;
-
-    FixedLine FL_SEARCHFOR
-    {
-        Pos = MAP_APPFONT( 6, 8 );
-        Size = MAP_APPFONT( 232, 8 );
-        Text [ en-US ] = "Search for";
-    };
-    RadioButton RB_SEARCHFORTEXT
-    {
-        HelpID = "cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORTEXT";
-        Pos = MAP_APPFONT( 12, 23 );
-        Size = MAP_APPFONT( 50, 10 );
-        Group = TRUE;
-        Text [ en-US ] = "~Text";
-    };
-    RadioButton RB_SEARCHFORNULL
-    {
-        HelpID = "cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORNULL";
-        Pos = MAP_APPFONT( 12, 36 );
-        Size = MAP_APPFONT( 207, 10 );
-        Text [ en-US ] = "Field content is ~NULL";
-    };
-    RadioButton RB_SEARCHFORNOTNULL
-    {
-        HelpID = "cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORNOTNULL";
-        Pos = MAP_APPFONT( 12, 49 );
-        Size = MAP_APPFONT( 207, 10 );
-        Text [ en-US ] = "Field content is not NU~LL";
-    };
-    ComboBox CMB_SEARCHTEXT
-    {
-        Border = TRUE;
-        Pos = MAP_APPFONT( 65, 20 );
-        Size = MAP_APPFONT( 154, 80 );
-        DropDown = TRUE;
-        TabStop = TRUE;
-        HelpId = HID_SEARCH_TEXT;
-    };
-
-    FixedLine FL_WHERE
-    {
-        Pos = MAP_APPFONT( 6, 65 );
-        Size = MAP_APPFONT( 232, 8 );
-        Text [ en-US ] = "Where to search";
-    };
-    FixedText FT_FORM
-    {
-        Pos = MAP_APPFONT( 12, 77 );
-        Size = MAP_APPFONT( 87, 10 );
-        Text [ en-US ] = "Form";
-    };
-    ListBox LB_FORM
-    {
-        HelpID = "cui:ListBox:RID_SVXDLG_SEARCHFORM:LB_FORM";
-        Border = TRUE;
-        Pos = MAP_APPFONT( 110, 76 );
-        Size = MAP_APPFONT( 109, 60 );
-        TabStop = TRUE;
-        DropDown = TRUE;
-    };
-    RadioButton RB_ALLFIELDS
-    {
-        Pos = MAP_APPFONT( 24, 91 );
-        Size = MAP_APPFONT( 75, 10 );
-        TabStop = TRUE;
-        HelpId = HID_SEARCH_ALLFIELDS;
-        Text [ en-US ] = "All Fields";
-    };
-    RadioButton RB_SINGLEFIELD
-    {
-        HelpID = "cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SINGLEFIELD";
-        Pos = MAP_APPFONT( 24, 106 );
-        Size = MAP_APPFONT( 75, 10 );
-        Text [ en-US ] = "Single field";
-    };
-    ListBox LB_FIELD
-    {
-        Border = TRUE;
-        Pos = MAP_APPFONT( 110, 105 );
-        Size = MAP_APPFONT( 109, 60 );
-        TabStop = TRUE;
-        DropDown = TRUE;
-        HelpId = HID_SEARCH_FIELDSELECTION;
-    };
-    FixedLine FL_OPTIONS
-    {
-        Pos = MAP_APPFONT( 6, 126 );
-        Size = MAP_APPFONT( 288, 8 );
-        Text [ en-US ] = "Settings";
-    };
-    FixedText FT_POSITION
-    {
-        Pos = MAP_APPFONT( 12, 138 );
-        Size = MAP_APPFONT( 87, 8 );
-        Text [ en-US ] = "Position";
-    };
-    ListBox LB_POSITION
-    {
-        Border = TRUE;
-        Pos = MAP_APPFONT( 110, 136 );
-        Size = MAP_APPFONT( 109, 60 );
-        TabStop = TRUE;
-        DropDown = TRUE;
-        HelpId = HID_SEARCH_POSITION;
-    };
-    CheckBox CB_USEFORMATTER
-    {
-        Pos = MAP_APPFONT( 12, 158 );
-        Size = MAP_APPFONT( 90, 10 );
-        TabStop = TRUE;
-        HelpId = HID_SEARCH_FORMATTER;
-        Text [ en-US ] = "Apply field format";
-    };
-    CheckBox CB_CASE
-    {
-        Pos = MAP_APPFONT( 12, 171 );
-        Size = MAP_APPFONT( 90, 20 );
-        TabStop = TRUE;
-        WordBreak = TRUE;
-        HelpId = HID_SEARCH_CASE;
-        Text [ en-US ] = "Match case";
-    };
-    CheckBox CB_BACKWARD
-    {
-        Pos = MAP_APPFONT( 105, 158 );
-        Size = MAP_APPFONT( 85, 10 );
-        TabStop = TRUE;
-        HelpId = HID_SEARCH_BACKWARD;
-        Text [ en-US ] = "Search backwards";
-    };
-    CheckBox CB_STARTOVER
-    {
-        Pos = MAP_APPFONT( 105, 171 );
-        Size = MAP_APPFONT( 85, 10 );
-        TabStop = TRUE;
-        HelpId = HID_SEARCH_STARTOVER;
-        Text [ en-US ] = "From Beginning";
-    };
-    CheckBox CB_WILDCARD
-    {
-        Pos = MAP_APPFONT( 190, 158 );
-        Size = MAP_APPFONT( 100, 10 );
-        TabStop = TRUE;
-        HelpId = HID_SEARCH_WILDCARD;
-        Text [ en-US ] = "Wildcard expression";
-    };
-    CheckBox CB_REGULAR
-    {
-        Pos = MAP_APPFONT( 190, 171 );
-        Size = MAP_APPFONT( 100, 10 );
-        TabStop = TRUE;
-        HelpId = HID_SEARCH_REGULAR;
-        Text [ en-US ] = "Regular expression";
-    };
-    CheckBox CB_APPROX
-    {
-        Pos = MAP_APPFONT( 190, 184 );
-        Size = MAP_APPFONT( 84, 20 );
-        TabStop = TRUE;
-        WordBreak = TRUE;
-        HelpId = HID_SEARCH_APPROX;
-        Text [ en-US ] = "Similarity Search";
-    };
-    PushButton PB_APPROXSETTINGS
-    {
-        Pos = MAP_APPFONT( 275, 182 );
-        Size = MAP_APPFONT( 14, 14 );
-        TabStop = TRUE ;
-        HelpId = HID_SEARCH_APPROXSETTINGS;
-        Text [ en-US ] = "...";
-    };
-    CheckBox CB_HALFFULLFORMS
-    {
-        HelpID = "cui:CheckBox:RID_SVXDLG_SEARCHFORM:CB_HALFFULLFORMS";
-        Pos = MAP_APPFONT( 105, 209 );
-        Size = MAP_APPFONT( 85, 10 );
-        TabStop = TRUE ;
-        Text [ en-US ] = "Match character width" ;
-    };
-    CheckBox CB_SOUNDSLIKECJK
-    {
-        HelpID = "cui:CheckBox:RID_SVXDLG_SEARCHFORM:CB_SOUNDSLIKECJK";
-        Pos = MAP_APPFONT( 190, 209 );
-        Size = MAP_APPFONT( 84, 10 );
-        TabStop = TRUE ;
-        Text [ en-US ] = "Sounds like (Japanese)";
-    };
-    PushButton PB_SOUNDSLIKESETTINGS
-    {
-        HelpID = "cui:PushButton:RID_SVXDLG_SEARCHFORM:PB_SOUNDSLIKESETTINGS";
-        Pos = MAP_APPFONT( 275, 207 );
-        Size = MAP_APPFONT( 14, 14 );
-        TabStop = TRUE ;
-        Text [ en-US ] = "..." ;
-    };
-    FixedLine FL_STATE
-    {
-        Pos = MAP_APPFONT( 6, 222 );
-        Size = MAP_APPFONT( 288, 8 );
-        Text [ en-US ] = "State";
-    };
-    FixedText FT_RECORDLABEL
-    {
-        Pos = MAP_APPFONT( 12, 232 );
-        Size = MAP_APPFONT( 45, 10 );
-        Text [ en-US ] = "Record :";
-    };
-    FixedText FT_RECORD
-    {
-        Pos = MAP_APPFONT( 60, 232 );
-        Size = MAP_APPFONT( 30, 10 );
-        UniqueId = UID_SEARCH_RECORDSTATUS;
-    };
-    FixedText FT_HINT
-    {
-        Pos = MAP_APPFONT( 99, 232 );
-        Size = MAP_APPFONT( 190, 10 );
-    };
-    PushButton PB_SEARCH
-    {
-        Pos = MAP_APPFONT( 244, 6 );
-        Size = MAP_APPFONT( 50, 14 );
-        TabStop = TRUE;
-        DefButton = TRUE;
-        HelpId = HID_SEARCH_BTN_SEARCH;
-        Text [ en-US ] = "Search";
-    };
-    CancelButton 1
-    {
-        Pos = MAP_APPFONT( 244, 26 );
-        Size = MAP_APPFONT( 50, 14 );
-        HelpId = HID_SEARCH_BTN_CLOSE;
-        TabStop = TRUE;
-        Text [ en-US ] = "~Close";
-    };
-    HelpButton 1
-    {
-        Pos = MAP_APPFONT( 244, 46 );
-        Size = MAP_APPFONT( 50, 14 );
-        TabStop = TRUE;
-        Text [ en-US ] = "~Help";
-    };
-};
-
 String RID_STR_SEARCH_ANYWHERE
 {
     Text [ en-US ] = "anywhere in the field";

cui/source/inc/cuifmsearch.hxx

@@ -47,38 +47,32 @@ class FmSearchDialog : public ModalDialog
     friend class FmSearchEngine;
 
     // my all Controls
-    FixedLine       m_flSearchFor;
-    RadioButton     m_rbSearchForText;
-    RadioButton     m_rbSearchForNull;
-    RadioButton     m_rbSearchForNotNull;
-    ComboBox        m_cmbSearchText;
-    FixedLine       m_flWhere;
-    FixedText       m_ftForm;
-    ListBox         m_lbForm;
-    RadioButton     m_rbAllFields;
-    RadioButton     m_rbSingleField;
-    ListBox         m_lbField;
-    FixedLine       m_flOptions;
-    FixedText       m_ftPosition;
-    ListBox         m_lbPosition;
-    CheckBox        m_cbUseFormat;
-    CheckBox        m_cbCase;
-    CheckBox        m_cbBackwards;
-    CheckBox        m_cbStartOver;
-    CheckBox        m_cbWildCard;
-    CheckBox        m_cbRegular;
-    CheckBox        m_cbApprox;
-    PushButton      m_pbApproxSettings;
-    CheckBox        m_aHalfFullFormsCJK;
-    CheckBox        m_aSoundsLikeCJK;
-    PushButton      m_aSoundsLikeCJKSettings;
-    FixedLine       m_flState;
-    FixedText       m_ftRecordLabel;
-    FixedText       m_ftRecord;
-    FixedText       m_ftHint;
-    PushButton      m_pbSearchAgain;
-    CancelButton    m_pbClose;
-    HelpButton      m_pbHelp;
+    RadioButton     *m_prbSearchForText;
+    RadioButton     *m_prbSearchForNull;
+    RadioButton     *m_prbSearchForNotNull;
+    ComboBox        *m_pcmbSearchText;
+    FixedText       *m_pftForm;
+    ListBox         *m_plbForm;
+    RadioButton     *m_prbAllFields;
+    RadioButton     *m_prbSingleField;
+    ListBox         *m_plbField;
+    FixedText       *m_pftPosition;
+    ListBox         *m_plbPosition;
+    CheckBox        *m_pcbUseFormat;
+    CheckBox        *m_pcbCase;
+    CheckBox        *m_pcbBackwards;
+    CheckBox        *m_pcbStartOver;
+    CheckBox        *m_pcbWildCard;
+    CheckBox        *m_pcbRegular;
+    CheckBox        *m_pcbApprox;
+    PushButton      *m_ppbApproxSettings;
+    CheckBox        *m_pHalfFullFormsCJK;
+    CheckBox        *m_pSoundsLikeCJK;
+    PushButton      *m_pSoundsLikeCJKSettings;
+    FixedText       *m_pftRecord;
+    FixedText       *m_pftHint;
+    PushButton      *m_pbSearchAgain;
+    CancelButton    *m_pbClose;
     OUString        m_sSearch;
     OUString        m_sCancel;
 
@@ -180,18 +174,16 @@ private:
 
     DECL_LINK( OnDelayedPaint, void* ); ///< see EnableSearchUI
 
-    void implMoveControls(Control** _ppControls, sal_Int32 _nControls, sal_Int32 _nUp, Control* _pToResize);
-
     void initCommon( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& _rxCursor );
 };
 
 inline void FmSearchDialog::SetActiveField(const OUString& strField)
 {
-    sal_Int32 nInitialField = m_lbField.GetEntryPos(strField);
+    sal_Int32 nInitialField = m_plbField->GetEntryPos(strField);
     if (nInitialField == LISTBOX_ENTRY_NOTFOUND)
         nInitialField = 0;
-    m_lbField.SelectEntryPos(nInitialField);
-    LINK(this, FmSearchDialog, OnFieldSelected).Call(&m_lbField);
+    m_plbField->SelectEntryPos(nInitialField);
+    LINK(this, FmSearchDialog, OnFieldSelected).Call(m_plbField);
 }
 
 #endif // INCLUDED_CUI_SOURCE_INC_CUIFMSEARCH_HXX

cui/source/inc/helpid.hrc

@@ -162,21 +162,6 @@
 #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"
-#define HID_SEARCH_TEXT "CUI_HID_SEARCH_TEXT"
-#define HID_SEARCH_ALLFIELDS "CUI_HID_SEARCH_ALLFIELDS"
-#define HID_SEARCH_FIELDSELECTION "CUI_HID_SEARCH_FIELDSELECTION"
-#define HID_SEARCH_POSITION "CUI_HID_SEARCH_POSITION"
-#define HID_SEARCH_FORMATTER "CUI_HID_SEARCH_FORMATTER"
-#define HID_SEARCH_CASE "CUI_HID_SEARCH_CASE"
-#define HID_SEARCH_BACKWARD "CUI_HID_SEARCH_BACKWARD"
-#define HID_SEARCH_STARTOVER "CUI_HID_SEARCH_STARTOVER"
-#define HID_SEARCH_WILDCARD "CUI_HID_SEARCH_WILDCARD"
-#define HID_SEARCH_REGULAR "CUI_HID_SEARCH_REGULAR"
-#define HID_SEARCH_APPROX "CUI_HID_SEARCH_APPROX"
-#define HID_SEARCH_APPROXSETTINGS "CUI_HID_SEARCH_APPROXSETTINGS"
-#define HID_SEARCH_BTN_SEARCH "CUI_HID_SEARCH_BTN_SEARCH"
-#define HID_SEARCH_BTN_CLOSE "CUI_HID_SEARCH_BTN_CLOSE"
 #define HID_DIALOG_HANGULHANJA "CUI_HID_DIALOG_HANGULHANJA"
 #define HID_HANGULHANJA_EDIT_DLG "CUI_HID_HANGULHANJA_EDIT_DLG"
 #define HID_TPHATCH_CTRL "CUI_HID_TPHATCH_CTRL"