diff options
| author | Eike Rathke <erack@redhat.com> | 2016-06-10 12:47:12 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-06-10 11:00:18 +0000 |
| commit | bfef572871441a8cdc9509e26afbef208e4f6243 (patch) | |
| tree | 94e47c9c54559d0aea6d03660eb9eb35ef74be61 | |
| parent | dd02cca2e64b061ddd5003ad0485dcbfae7f5ddf (diff) | |
check for svDouble when stripping DCOUNT/A argument, tdf#70806 follow-up
Change-Id: Ic7897b5240f9f3f66eb71485ef9eed4fa8ce87e1
(cherry picked from commit 2b6710c2b50c83f62824fd2b258b112a5e911da1)
Reviewed-on: https://gerrit.libreoffice.org/26158
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
| -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 c0b52b67c61a..29ac8a1f912f 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -1436,7 +1436,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(); |