summaryrefslogtreecommitdiff
path: root/formula
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2011-12-07 23:35:57 +0100
committerEike Rathke <erack@redhat.com>2011-12-07 23:39:22 +0100
commit3deb83d7a74a0fe026791e7a336ac6ffad9c0026 (patch)
tree05941589d338890349153175c58a49c730c2af77 /formula
parent4d6b88417fe01a8e4039d495071cd817b4efcc3a (diff)
i#106210 store proper ODFF names, accept aliases
Older releases stored a few function names not defined by ODFF, namely EASTERSUNDAY instead of ORG.OPENOFFICE.EASTERSUNDAY, TDIST instead of LEGACY.TDIST and B instead of BINOM.DIST.RANGE. Since OOo/LibO 3.3 the proper function names can be read, additionally to the "wrong" names. Now it's time to write the proper names and still accept the incorrect ones. Test cases are attached to AOOo issues: ORG.OPENOFFICE.EASTERSUNDAY https://issues.apache.org/ooo/show_bug.cgi?id=112882 LEGACY.TDIST and BINOM.DIST.RANGE https://issues.apache.org/ooo/show_bug.cgi?id=110229 Note that the FALSE in A2 and A3 is a result of the string comparison of the actual formula, that differs in separators (, vs ;) only. (cherry picked from commit a9b03bd19945a90040fd4346599e281a7813efc2)
Diffstat (limited to 'formula')
-rw-r--r--formula/source/core/resource/core_resource.src6
1 files changed, 3 insertions, 3 deletions
diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src
index aab02c63c9e0..12cb57d01bb8 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -192,7 +192,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_ST_DEV_A { Text = "STDEVA" ; };
String SC_OPCODE_ST_DEV_P { Text = "STDEVP" ; };
String SC_OPCODE_ST_DEV_P_A { Text = "STDEVPA" ; };
- String SC_OPCODE_B { Text = "B" ; };
+ String SC_OPCODE_B { Text = "BINOM.DIST.RANGE" ; };
String SC_OPCODE_NORM_DIST { Text = "NORMDIST" ; };
String SC_OPCODE_EXP_DIST { Text = "EXPONDIST" ; };
String SC_OPCODE_BINOM_DIST { Text = "BINOMDIST" ; };
@@ -273,7 +273,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_BACK_SOLVER { Text = "GOALSEEK" ; };
String SC_OPCODE_HYP_GEOM_DIST { Text = "HYPGEOMDIST" ; };
String SC_OPCODE_LOG_NORM_DIST { Text = "LOGNORMDIST" ; };
- String SC_OPCODE_T_DIST { Text = "TDIST" ; };
+ String SC_OPCODE_T_DIST { Text = "LEGACY.TDIST" ; };
String SC_OPCODE_F_DIST { Text = "LEGACY.FDIST" ; };
String SC_OPCODE_CHI_DIST { Text = "LEGACY.CHIDIST" ; };
String SC_OPCODE_WEIBULL { Text = "WEIBULL" ; };
@@ -325,7 +325,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_BETA_DIST { Text = "BETADIST" ; };
String SC_OPCODE_BETA_INV { Text = "BETAINV" ; };
String SC_OPCODE_WEEK { Text = "ISOWEEKNUM" ; };
- String SC_OPCODE_EASTERSUNDAY { Text = "EASTERSUNDAY" ; };
+ String SC_OPCODE_EASTERSUNDAY { Text = "ORG.OPENOFFICE.EASTERSUNDAY" ; };
String SC_OPCODE_GET_DAY_OF_WEEK { Text = "WEEKDAY" ; };
String SC_OPCODE_NO_NAME { Text = "#NAME!" ; };
String SC_OPCODE_STYLE { Text = "ORG.OPENOFFICE.STYLE" ; };