sc/CppunitTest_sc_ucalc.mk | 3 +++ sc/qa/unit/ucalc.cxx | 12 ++++++++++++ sc/source/core/data/formulacell.cxx | 9 +++++++++ 3 files changed, 24 insertions(+)
New commits: commit f9cc0daec26016722bf5260e4e2634e6dcfe25a2 Author: Kohei Yoshida <kohei.yosh...@collabora.com> Date: Fri Apr 11 21:37:54 2014 -0400 fdo#77307: Compare external formula tokens correctly. To avoid different external (add-in) tokens from being evaluated equal. Change-Id: If78187901bdca7fe0da50442b0bb66e0650dc70f diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index 9a21066..363edb0 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -3641,6 +3641,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: ; } commit d5d43b2d8d3b8d547c8fd7553d101c31f3bfdff8 Author: Kohei Yoshida <kohei.yosh...@collabora.com> Date: Fri Apr 11 20:35:48 2014 -0400 Enable scaddins for ucalc test session. This adds several worksheet functions to the list. Change-Id: Ib1a72c4401a4bd5e09ec98dfa1bd6175234005e0 diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index c4d48d8..b4bf31d 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -99,6 +99,9 @@ $(eval $(call gb_CppunitTest_use_components,sc_ucalc,\ ucb/source/ucp/file/ucpfile1 \ unoxml/source/service/unoxml \ uui/util/uui \ + scaddins/source/analysis/analysis \ + scaddins/source/datefunc/date \ + scaddins/source/pricing/pricing \ )) $(eval $(call gb_CppunitTest_use_configuration,sc_ucalc)) diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 09b3880..06ef566 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -2374,10 +2374,14 @@ void Test::testFunctionLists() "DAY", "DAYS", "DAYS360", + "DAYSINMONTH", + "DAYSINYEAR", "EASTERSUNDAY", "HOUR", + "ISLEAPYEAR", "MINUTE", "MONTH", + "MONTHS", "NETWORKDAYS.INTL", "NOW", "SECOND", @@ -2386,8 +2390,11 @@ void Test::testFunctionLists() "TODAY", "WEEKDAY", "WEEKNUM", + "WEEKS", + "WEEKSINYEAR", "WORKDAY.INTL", "YEAR", + "YEARS", 0 }; @@ -2406,6 +2413,10 @@ void Test::testFunctionLists() "NOMINAL", "NPER", "NPV", + "OPT_BARRIER", + "OPT_PROB_HIT", + "OPT_PROB_INMONEY", + "OPT_TOUCH", "PMT", "PPMT", "PV", @@ -2739,6 +2750,7 @@ void Test::testFunctionLists() "RIGHT", "RIGHTB", "ROMAN", + "ROT13", "SEARCH", "SUBSTITUTE", "T", _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits