diff options
author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-04-11 21:37:54 -0400 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-04-13 08:30:44 +0000 |
commit | c60c7d09e4d65b57ba448cf3de68391a51dcc1b5 (patch) | |
tree | ff905055533a0bf877c2abfdc179e17dcb53e56f | |
parent | 3d98800c9b925b725fcf42c78e51e02f297a23f6 (diff) |
fdo#77307: Compare external formula tokens correctly.
To avoid different external (add-in) tokens from being evaluated equal.
Change-Id: If78187901bdca7fe0da50442b0bb66e0650dc70f
(cherry picked from commit f9cc0daec26016722bf5260e4e2634e6dcfe25a2)
Reviewed-on: https://gerrit.libreoffice.org/8942
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
-rw-r--r-- | sc/source/core/data/formulacell.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index 78c4fb066eb6..b96d0ad532b4 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -3654,6 +3654,15 @@ ScFormulaCell::CompareState ScFormulaCell::CompareByTokenArray( ScFormulaCell& r return NotEqual; } break; + case formula::svExternal: + { + if (pThisTok->GetExternal() != pOtherTok->GetExternal()) + return NotEqual; + + if (pThisTok->GetByte() != pOtherTok->GetByte()) + return NotEqual; + } + break; default: ; } |