1 files changed, 6 insertions, 18 deletions
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);