diff options
| author | Eike Rathke <erack@redhat.com> | 2016-06-10 12:47:12 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-06-10 12:57:26 +0200 |
| commit | 2b6710c2b50c83f62824fd2b258b112a5e911da1 (patch) | |
| tree | 9f4cfdd3f9d78ca3b91563029109810a08e6f1cd | |
| parent | 47462fbb9ad784fe909557d9c6806c730d9f62fe (diff) | |
check for svDouble when stripping DCOUNT/A argument, tdf#70806 follow-up
Change-Id: Ic7897b5240f9f3f66eb71485ef9eed4fa8ce87e1
| -rw-r--r-- | formula/source/core/api/token.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
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(); |