diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-01-27 06:33:46 +0100 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2014-01-27 12:54:51 +0000 |
commit | f59fc4e1ce2d6a506fe5a11123cc32e8c7f16540 (patch) | |
tree | 02e3c4dfac1f5cd68dbd8d27c8793a5f8be9f501 | |
parent | 37bb1d0d8032eb859322d7d3c60f8799e48250a0 (diff) |
we need to check that the content is equal as well, fdo#74077
There are a few more tokens that need to be inspected.
Change-Id: I59b5046ddde5eb8b638ad8f17b00bc7eb6966467
Reviewed-on: https://gerrit.libreoffice.org/7675
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Eike Rathke <erack@redhat.com>
Reviewed-by: Eike Rathke <erack@redhat.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
-rw-r--r-- | sc/source/core/data/formulacell.cxx | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index 05417b36f84c..cad21446ad05 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -3473,6 +3473,30 @@ ScFormulaCell::CompareState ScFormulaCell::CompareByTokenArray( ScFormulaCell& r bInvariant = false; } break; + case formula::svDouble: + { + if(!rtl::math::approxEqual(pThisTok->GetDouble(), pOtherTok->GetDouble())) + return NotEqual; + } + break; + case formula::svString: + { + if(pThisTok->GetString() != pOtherTok->GetString()) + return NotEqual; + } + break; + case formula::svIndex: + { + if(pThisTok->GetIndex() != pOtherTok->GetIndex()) + return NotEqual; + } + break; + case formula::svByte: + { + if(pThisTok->GetByte() != pOtherTok->GetByte()) + return NotEqual; + } + break; default: ; } |