loplugin:constantparam in formula

Change-Id: I18246d34d27f1b12dfd107166b31ef16d9632462
This commit is contained in:
Noel Grandin
2016-03-09 14:10:31 +02:00
parent 9039ba7995
commit f803aae0f3
6 changed files with 14 additions and 14 deletions

View File

@@ -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 )
{

View File

@@ -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();
}

View File

@@ -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);

View File

@@ -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);

View File

@@ -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

View File

@@ -295,7 +295,7 @@ ScInputHandler* ScFormulaDlg::GetNextInputHandler(ScDocShell* pDocShell, ScTabVi
bool ScFormulaDlg::Close()
{
DoEnter(false);
DoEnter();
return true;
}