From 908449639beaeafb04b9a9668ee20b0042389426 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Thu, 14 Jul 2016 22:31:14 +0200 Subject: let FormulaTokenArray::RemoveToken() return the actual count of tokens removed Change-Id: Iebf654e7b4c682036b4ff334298948557b755eac --- formula/source/core/api/token.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'formula') diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index 0eb906642636..072216b955cb 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -856,7 +856,7 @@ FormulaToken* FormulaTokenArray::ReplaceToken( sal_uInt16 nOffset, FormulaToken* } } -void FormulaTokenArray::RemoveToken( sal_uInt16 nOffset, sal_uInt16 nCount ) +sal_uInt16 FormulaTokenArray::RemoveToken( sal_uInt16 nOffset, sal_uInt16 nCount ) { if (nOffset < nLen) { @@ -903,10 +903,12 @@ void 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; } } -- cgit