summaryrefslogtreecommitdiff
path: root/include/formula
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2016-08-03 18:17:16 +0200
committerEike Rathke <erack@redhat.com>2016-08-03 18:57:37 +0200
commitfa2fdb6607a7b961affadb6ca633b8feed828467 (patch)
tree50018d497ff14aeab37c7a4469a7ddd87629184e /include/formula
parentf6283cf6b4342a0492f1127c2d7a8597255a75c3 (diff)
rename ocConvert to ocConvertOOo and related
... to clarify that this is not the "real" CONVERT function. Change-Id: Ia71949ffabd2c983be0dbf9fa36bb8c52f0077ee
Diffstat (limited to 'include/formula')
-rw-r--r--include/formula/compiler.hrc2
-rw-r--r--include/formula/opcode.hxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index 915cea41fc14..92627cd24ad7 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -390,7 +390,7 @@
#define SC_OPCODE_VAR_P_A 379
#define SC_OPCODE_EASTERSUNDAY 380
#define SC_OPCODE_DECIMAL 381
-#define SC_OPCODE_CONVERT 382
+#define SC_OPCODE_CONVERT_OOO 382
#define SC_OPCODE_ROMAN 383
#define SC_OPCODE_MIRR 384
#define SC_OPCODE_CELL 385
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index bfc7ac6323fb..13c85fb100c3 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -485,7 +485,7 @@ enum OpCode : sal_uInt16
ocVarPA = SC_OPCODE_VAR_P_A,
ocEasterSunday = SC_OPCODE_EASTERSUNDAY,
ocDecimal = SC_OPCODE_DECIMAL,
- ocConvert = SC_OPCODE_CONVERT,
+ ocConvertOOo = SC_OPCODE_CONVERT_OOO,
ocRoman = SC_OPCODE_ROMAN,
ocHyperLink = SC_OPCODE_HYPERLINK,
ocGetPivotData = SC_OPCODE_GET_PIVOT_DATA,