trivial conversion of RID_FORMULADLG_FORMULA_MODAL to .ui

Change-Id: I25f29821079cf4fa4759daffe78bec8c4b48abbc

3 files changed, 6 insertions, 186 deletions

diff --git a/formula/source/ui/dlg/formdlgs.src b/formula/source/ui/dlg/formdlgs.src
index 91bee16ed2da..ee99d15ae07e 100644
--- a/formula/source/ui/dlg/formdlgs.src
+++ b/formula/source/ui/dlg/formdlgs.src
@@ -57,171 +57,6 @@ String STR_STRUCT_ERR2
     Text [ en-US ] = "Error" ;
 };
 
-ModalDialog RID_FORMULADLG_FORMULA_MODAL
-{
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 321 , 228 ) ;
-    Moveable = TRUE ;
-    TabControl TC_FUNCTION
-    {
-        HelpID = "formula:TabControl:RID_FORMULADLG_FORMULA_MODAL:TC_FUNCTION";
-        Pos = MAP_APPFONT ( 6 , 5 ) ;
-        Size = MAP_APPFONT ( 102 , 199 ) ;
-        PageList =
-        {
-            PageItem
-            {
-                Identifier = TP_FUNCTION ;
-                Text [ en-US ] = "Functions" ;
-            };
-            PageItem
-            {
-                Identifier = TP_STRUCT ;
-                Text [ en-US ] = "Structure" ;
-            };
-        };
-    };
-    FixedText FT_HEADLINE
-    {
-        Pos = MAP_APPFONT ( 115 , 24 ) ;
-        Size = MAP_APPFONT ( 194 , 8 ) ;
-        WordBreak = TRUE ;
-    };
-    FixedText FT_FUNCNAME
-    {
-        Pos = MAP_APPFONT ( 115 , 38 ) ;
-        Size = MAP_APPFONT ( 194 , 24 ) ;
-        WordBreak = TRUE ;
-    };
-    FixedText FT_FUNCDESC
-    {
-        Pos = MAP_APPFONT ( 115 , 68 ) ;
-        Size = MAP_APPFONT ( 194 , 64 ) ;
-        WordBreak = TRUE ;
-    };
-    FixedText FT_EDITNAME
-    {
-        Pos = MAP_APPFONT ( 113 , 6 ) ;
-        Size = MAP_APPFONT ( 83 , 10 ) ;
-    };
-    GroupBox GB_EDIT
-    {
-        Pos = MAP_APPFONT ( 112 , 18 ) ;
-        Size = MAP_APPFONT ( 203 , 128 ) ;
-    };
-    FixedText FT_FORMULA
-    {
-        Pos = MAP_APPFONT ( 112 , 151 ) ;
-        Size = MAP_APPFONT ( 50 , 10 ) ;
-        WordBreak = TRUE ;
-        Text [ en-US ] = "For~mula" ;
-    };
-    Control ED_FORMULA
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 112 , 161 ) ;
-        Size = MAP_APPFONT ( 203 , 43 ) ;
-    };
-    FixedText FT_RESULT
-    {
-        Pos = MAP_APPFONT ( 198 , 6 ) ;
-        Size = MAP_APPFONT ( 55 , 10 ) ;
-        Right = TRUE ;
-        Text [ en-US ] = "Function result" ;
-    };
-    FixedText WND_RESULT
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 255 , 4 ) ;
-        Size = MAP_APPFONT ( 60 , 12 ) ;
-        Text [ en-US ] = "Function result" ;
-    };
-    FixedText FT_FORMULA_RESULT
-    {
-        Pos = MAP_APPFONT ( 217 , 149 ) ;
-        Size = MAP_APPFONT ( 35 , 10 ) ;
-        Text [ en-US ] = "Result" ;
-        Right = TRUE ;
-    };
-    Window WND_FORMULA_RESULT
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 255 , 147 ) ;
-        Size = MAP_APPFONT ( 60 , 12 ) ;
-    };
-    CheckBox BTN_MATRIX
-    {
-        HelpID = "formula:CheckBox:RID_FORMULADLG_FORMULA_MODAL:BTN_MATRIX";
-        Pos = MAP_APPFONT ( 6 , 208 ) ;
-        Size = MAP_APPFONT ( 50 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Array" ;
-    };
-    Edit ED_REF
-    {
-        HelpID = "formula:Edit:RID_FORMULADLG_FORMULA_MODAL:ED_REF";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 76 , 205 ) ;
-        Size = MAP_APPFONT ( 66 , 12 ) ;
-    };
-    ImageButton RB_REF
-    {
-        HelpID = "formula:ImageButton:RID_FORMULADLG_FORMULA_MODAL:RB_REF";
-        Pos = MAP_APPFONT ( 144 , 205 ) ;
-        Size = MAP_APPFONT ( 13 , 15 ) ;
-        TabStop = FALSE ;
-        QuickHelpText [ en-US ] = "Maximize" ;
-    };
-    HelpButton BTN_HELP
-    {
-        Pos = MAP_APPFONT ( 72 , 208 ) ;
-        Size = MAP_APPFONT ( 45 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    CancelButton BTN_CANCEL
-    {
-        Pos = MAP_APPFONT ( 121 , 208 ) ;
-        Size = MAP_APPFONT ( 45 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    PushButton BTN_BACKWARD
-    {
-        HelpID = "formula:PushButton:RID_FORMULADLG_FORMULA_MODAL:BTN_BACKWARD";
-        Pos = MAP_APPFONT ( 171 , 208 ) ;
-        Size = MAP_APPFONT ( 45 , 14 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "<< ~Back" ;
-    };
-    PushButton BTN_FORWARD
-    {
-        HelpID = "formula:PushButton:RID_FORMULADLG_FORMULA_MODAL:BTN_FORWARD";
-        Pos = MAP_APPFONT ( 219 , 208 ) ;
-        Size = MAP_APPFONT ( 45 , 14 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Next >>" ;
-    };
-    OKButton BTN_END
-    {
-        Pos = MAP_APPFONT ( 270 , 208 ) ;
-        Size = MAP_APPFONT ( 45 , 14 ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    String STR_TITLE1
-    {
-        Text [ en-US ] = "Function Wizard" ;
-    };
-    String STR_TITLE2
-    {
-        Text [ en-US ] = "Function Wizard  -" ;
-    };
-    String STR_END
-    {
-        Text [ en-US ] = "~End" ;
-    };
-
-};
-
 String STR_TITLE1
 {
     Text [ en-US ] = "Function Wizard" ;
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 9f923baadf86..b4fc563e81cc 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -1641,38 +1641,29 @@ void FormulaDlg_Impl::SetEdSelection()
     } // if( pEd )
 }
 
-
 FormulaModalDialog::FormulaModalDialog( Window* pParent
                                             , bool _bSupportFunctionResult
                                             , bool _bSupportResult
                                             , bool _bSupportMatrix
                                             , IFunctionManager* _pFunctionMgr
-                                            , IControlReferenceHandler* _pDlg ) :
-        ModalDialog( pParent, ModuleRes(RID_FORMULADLG_FORMULA_MODAL) ),
-        m_pImpl( new FormulaDlg_Impl(this,_bSupportFunctionResult
-                                            , _bSupportResult
-                                            , _bSupportMatrix
-                                            ,this,_pFunctionMgr,_pDlg))
+                                            , IControlReferenceHandler* _pDlg )
+    : ModalDialog(pParent, "FormulaDialog", "formula/ui/formuladialog.ui")
+    , m_pImpl(new FormulaDlg_Impl(this,_bSupportFunctionResult,
+        _bSupportResult, _bSupportMatrix, this, _pFunctionMgr, _pDlg))
 {
-    FreeResource();
     SetText(m_pImpl->aTitle1);
 }
-FormulaModalDialog::~FormulaModalDialog()
-{
-}
 
 void FormulaModalDialog::Update(const OUString& _sExp)
 {
     m_pImpl->Update(_sExp);
 }
 
-
 void FormulaModalDialog::SetMeText(const OUString& _sText)
 {
     m_pImpl->SetMeText(_sText);
 }
 
-
 bool FormulaModalDialog::CheckMatrix(OUString& aFormula)
 {
     return m_pImpl->CheckMatrix(aFormula);
@@ -1682,10 +1673,12 @@ void FormulaModalDialog::Update()
 {
     m_pImpl->Update();
 }
+
 ::std::pair<RefButton*,RefEdit*> FormulaModalDialog::RefInputStartBefore( RefEdit* pEdit, RefButton* pButton )
 {
     return m_pImpl->RefInputStartBefore( pEdit, pButton );
 }
+
 void FormulaModalDialog::RefInputStartAfter( RefEdit* pEdit, RefButton* pButton )
 {
     m_pImpl->RefInputStartAfter( pEdit, pButton );
@@ -1745,10 +1738,6 @@ FormulaDlg::FormulaDlg( SfxBindings* pB, SfxChildWindow* pCW,
     SetText(m_pImpl->aTitle1);
 }
 
-FormulaDlg::~FormulaDlg()
-{
-}
-
 void FormulaDlg::Update(const OUString& _sExp)
 {
     m_pImpl->Update(_sExp);
@@ -1760,7 +1749,6 @@ void FormulaDlg::SetMeText(const OUString& _sText)
     m_pImpl->SetMeText(_sText);
 }
 
-
 FormulaDlgMode FormulaDlg::SetMeText(const OUString& _sText, sal_Int32 PrivStart, sal_Int32 PrivEnd, bool bMatrix, bool _bSelect, bool _bUpdate)
 {
     return m_pImpl->SetMeText(_sText,PrivStart, PrivEnd,bMatrix,_bSelect,_bUpdate);
diff --git a/formula/source/ui/inc/ForResId.hrc b/formula/source/ui/inc/ForResId.hrc
index 2ac1f70f5318..3109a8d0b10b 100644
--- a/formula/source/ui/inc/ForResId.hrc
+++ b/formula/source/ui/inc/ForResId.hrc
@@ -59,9 +59,6 @@
 #define BMP_STR_ERROR                               (RID_BITMAP_START + 6)
 #define BMP_FX                                      (RID_BITMAP_START + 7)
 
-// pages
-#define RID_FORMULADLG_FORMULA_MODAL                (RID_PAGE_START + 4)
-
 #endif          // FORMULA_FORRESID_HRC
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */