summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-01-27 06:33:46 +0100
committerMichael Meeks <michael.meeks@collabora.com>2014-01-27 09:36:54 +0000
commitfb4325eca45b9db36584439f30f7624a1c260e0e (patch)
treeb580227f7ad512c75a2dd2f431513db670e606a3 /sc
parentd2982b9fd66f56553acd32bec806bafcdf8c8322 (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/7674 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/data/formulacell.cxx24
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:
;
}