diff options
Diffstat (limited to 'formula')
-rw-r--r-- | formula/source/core/api/token.cxx | 9 | ||||
-rw-r--r-- | formula/source/ui/dlg/formula.cxx | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index ff166e14ed2e..e868bbfd2ef1 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -901,7 +901,7 @@ FormulaToken* FormulaTokenArray::ReplaceToken( sal_uInt16 nOffset, FormulaToken* } } -sal_uInt16 FormulaTokenArray::RemoveToken( sal_uInt16 nOffset, sal_uInt16 nCount ) +void FormulaTokenArray::RemoveToken( sal_uInt16 nOffset, sal_uInt16 nCount ) { if (nOffset < nLen) { @@ -948,13 +948,10 @@ sal_uInt16 FormulaTokenArray::RemoveToken( sal_uInt16 nOffset, sal_uInt16 nCount else nIndex -= nStop - nOffset; } - - return nCount; } else { SAL_WARN("formula.core","FormulaTokenArray::RemoveToken - nOffset " << nOffset << " >= nLen " << nLen); - return 0; } } @@ -994,9 +991,9 @@ FormulaToken* FormulaTokenArray::AddDouble( double fVal ) return Add( new FormulaDoubleToken( fVal ) ); } -FormulaToken* FormulaTokenArray::AddExternal( const sal_Unicode* pStr ) +void FormulaTokenArray::AddExternal( const sal_Unicode* pStr ) { - return AddExternal( OUString( pStr ) ); + AddExternal( OUString( pStr ) ); } FormulaToken* FormulaTokenArray::AddExternal( const OUString& rStr, diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 1cf839d12eb3..26fbf81b818c 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -1742,9 +1742,9 @@ void FormulaModalDialog::SetMeText(const OUString& _sText) m_pImpl->SetMeText(_sText); } -bool FormulaModalDialog::CheckMatrix(OUString& aFormula) +void FormulaModalDialog::CheckMatrix(OUString& aFormula) { - return m_pImpl->CheckMatrix(aFormula); + m_pImpl->CheckMatrix(aFormula); } void FormulaModalDialog::Update() |