diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-11 13:52:39 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-13 08:34:21 +0200 |
| commit | ff4d6a7e5b166bb98bbe8d0f59cc4db36e7002aa (patch) | |
| tree | 47215924da6d8605d1790ca90b57b141b4cf3776 /formula | |
| parent | 22828c32d1ae379782631a351aac34d0b1df95f4 (diff) | |
loplugin:returnconstant in forms..fpicker
Change-Id: I3f0bead636632682488cbe677fd7fee60350f04d
Reviewed-on: https://gerrit.libreoffice.org/58876
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/source/core/api/FormulaCompiler.cxx | 6 | ||||
| -rw-r--r-- | formula/source/ui/dlg/formula.cxx | 5 |
2 files changed, 2 insertions, 9 deletions
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index 019a4b292267..6580ea898e75 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -1233,12 +1233,6 @@ void FormulaCompiler::AppendErrorConstant( OUStringBuffer& rBuffer, FormulaError } -sal_Int32 FormulaCompiler::OpCodeMap::getOpCodeUnknown() -{ - static const sal_Int32 kOpCodeUnknown = -1; - return kOpCodeUnknown; -} - bool FormulaCompiler::GetToken() { static const short nRecursionMax = 42; diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 183a6fb1440c..136fd8087e66 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -82,7 +82,7 @@ public: void RefInputStartAfter(); void RefInputDoneAfter( bool bForced ); bool CalcValue( const OUString& rStrExp, OUString& rStrResult, bool bForceMatrixFormula = false ); - bool CalcStruct( const OUString& rStrExp, bool bForceRecalcStruct = false ); + void CalcStruct( const OUString& rStrExp, bool bForceRecalcStruct = false ); void UpdateValues( bool bForceRecalcStruct = false ); void DeleteArgs(); sal_Int32 GetFunctionPos(sal_Int32 nPos); @@ -608,7 +608,7 @@ void FormulaDlg_Impl::UpdateValues( bool bForceRecalcStruct ) CalcStruct( m_pMEdit->GetText(), bForceRecalcStruct); } -bool FormulaDlg_Impl::CalcStruct( const OUString& rStrExp, bool bForceRecalcStruct ) +void FormulaDlg_Impl::CalcStruct( const OUString& rStrExp, bool bForceRecalcStruct ) { sal_Int32 nLength = rStrExp.getLength(); @@ -635,7 +635,6 @@ bool FormulaDlg_Impl::CalcStruct( const OUString& rStrExp, bool bForceRecalcStru if (rStrExp[nLength-1] == '(') UpdateTokenArray(rStrExp); } - return true; } |