diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 652ef510fd45..c60aca77246e 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -1102,7 +1102,7 @@ IMPL_LINK_NOARG_TYPED(FormulaDlg_Impl, DblClkHdl, FuncPage&, void)
         BtnHdl(m_pBtnBackward);
     }
 
-    pParaWin->SetEdFocus(0);
+    pParaWin->SetEdFocus();
     m_pBtnForward->Enable(false); //@New
 }
 
@@ -1756,9 +1756,9 @@ void FormulaModalDialog::RefInputStartAfter( RefEdit* pEdit, RefButton* pButton
 {
     m_pImpl->RefInputStartAfter( pEdit, pButton );
 }
-void FormulaModalDialog::RefInputDoneAfter( bool bForced )
+void FormulaModalDialog::RefInputDoneAfter()
 {
-    m_pImpl->RefInputDoneAfter( bForced );
+    m_pImpl->RefInputDoneAfter( true/*bForced*/ );
 }
 
 void FormulaModalDialog::SetFocusWin(vcl::Window *pWin,const OString& nUniqueId)
@@ -1854,9 +1854,9 @@ void FormulaDlg::Update()
     m_pImpl->aIdle.Start();
 }
 
-void FormulaDlg::DoEnter(bool _bOk)
+void FormulaDlg::DoEnter()
 {
-    m_pImpl->DoEnter(_bOk);
+    m_pImpl->DoEnter(false);
 }
 ::std::pair<RefButton*,RefEdit*> FormulaDlg::RefInputStartBefore( RefEdit* pEdit, RefButton* pButton )
 {
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index 911684c1d750..1762796ce832 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -420,11 +420,11 @@ void ParaWin::ShowParaLine(sal_uInt16 no)
     aArgInput[no].Show();
 }
 
-void ParaWin::SetEdFocus(sal_uInt16 no)
+void ParaWin::SetEdFocus()
 {
-    UpdateArgDesc(no);
-    if(no<4 && no<aParaArray.size())
-        aArgInput[no].GetArgEdPtr()->GrabFocus();
+    UpdateArgDesc(0);
+    if(0<aParaArray.size())
+        aArgInput[0].GetArgEdPtr()->GrabFocus();
 }
 
 
diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx
index f21eef3c9eef..431b3521dbcf 100644
--- a/formula/source/ui/dlg/parawin.hxx
+++ b/formula/source/ui/dlg/parawin.hxx
@@ -143,7 +143,7 @@ public:
         void            SetArgument(sal_uInt16 no, const OUString& aString);
         void            SetArgumentFonts(const vcl::Font& aBoldFont,const vcl::Font& aLightFont);
 
-        void            SetEdFocus(sal_uInt16 nEditLine); //Sichtbare Editzeilen
+        void            SetEdFocus(); //Sichtbare Editzeilen
         sal_uInt16      GetSliderPos();
         void            SetSliderPos(sal_uInt16 nSliderPos);
 
diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx
index 04d03b0f7b67..db744b2e356f 100644
--- a/include/formula/formula.hxx
+++ b/include/formula/formula.hxx
@@ -66,7 +66,7 @@ protected:
     virtual bool    PreNotify( NotifyEvent& rNEvt ) override;
     ::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = nullptr );
     void            RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = nullptr );
-    void            RefInputDoneAfter( bool bForced = false );
+    void            RefInputDoneAfter();
     void            SetFocusWin(vcl::Window *pWin,const OString& nUniqueId);
 
     void            SetMeText(const OUString& _sText);
@@ -118,7 +118,7 @@ protected:
     bool            CheckMatrix(OUString& aFormula /*IN/OUT*/);
     OUString        GetMeText() const;
     void            Update(const OUString& _sExp);
-    void            DoEnter(bool _bOk);
+    void            DoEnter();
     const IFunctionDescription* getCurrentFunctionDescription() const;
     bool            UpdateParaWin(Selection& _rSelection);
     void            UpdateParaWin(const Selection& _rSelection, const OUString& _sRefStr);
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx
index 4fbd9a3f6769..ad3264c977c8 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -239,7 +239,7 @@ IMPL_LINK_TYPED( FormulaDialog, OnClickHdl, OAddFieldWindow& ,_rAddFieldDlg, voi
     }
     m_pEdit = nullptr;
     _rAddFieldDlg.Hide();
-    RefInputDoneAfter( true );
+    RefInputDoneAfter();
 }
 
 uno::Reference< sheet::XFormulaParser> FormulaDialog::getFormulaParser() const
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index a0659f727834..a41d1ed78d6c 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -295,7 +295,7 @@ ScInputHandler* ScFormulaDlg::GetNextInputHandler(ScDocShell* pDocShell, ScTabVi
 
 bool ScFormulaDlg::Close()
 {
-    DoEnter(false);
+    DoEnter();
     return true;
 }