From 2b6710c2b50c83f62824fd2b258b112a5e911da1 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Fri, 10 Jun 2016 12:47:12 +0200 Subject: check for svDouble when stripping DCOUNT/A argument, tdf#70806 follow-up Change-Id: Ic7897b5240f9f3f66eb71485ef9eed4fa8ce87e1 --- formula/source/core/api/token.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'formula') diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index a32853cfc1ed..669575f23e14 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -1393,7 +1393,8 @@ FormulaTokenArray * FormulaTokenArray::RewriteMissing( const MissingConvention & if (pCtx[ pOcds[ i ] ].mnCurArg == nOmitDcountArg) { // Omit only a literal 0 value, nothing else. - if (pOcds[ i ] == nFn && pCur->GetOpCode() == ocPush && pCur->GetDouble() == 0.0) + if (pOcds[ i ] == nFn && pCur->GetOpCode() == ocPush && pCur->GetType() == svDouble && + pCur->GetDouble() == 0.0) { // No other expression, between separators. FormulaToken* p = PeekPrevNoSpaces(); -- cgit