RID_SVXDLG_SEARCHFORM dialog convert

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

2 files changed, 29 insertions, 52 deletions

diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx
index 31acdbc87752..0d59adc0d737 100644
--- a/cui/source/inc/cuifmsearch.hxx
+++ b/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
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 21538912b6d6..263a78845fc3 100644
--- a/cui/source/inc/helpid.hrc
+++ b/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"