summaryrefslogtreecommitdiffstats
path: root/formula
diff options
context:
space:
mode:
authorMarina Plakalovic <makkica@openoffice.org>2012-12-15 03:41:47 +0100
committerEike Rathke <erack@redhat.com>2012-12-15 21:42:40 +0100
commit07df025a730be05d087559b939858260df003b97 (patch)
tree59a1a739ba3e380b64671cc7035cdf1fe99bdeca /formula
parentcalcishmakkica: #i117283# support new functions in Excel filters (diff)
downloadcore-07df025a730be05d087559b939858260df003b97.tar.gz
core-07df025a730be05d087559b939858260df003b97.zip
calcishmakkica: #i114428# merge some XOR related code
Merged from Apache OO with adaptions, parts of http://svn.apache.org/viewvc?rev=1381446&view=rev Original Apache OO committer: Andrew Rist <arist@apache.org> Original Author: Marina Plakalovic <makkica@openoffice.org> Original Committer: Eike Rathke [er] <eike.rathke@oracle.com> # HG changeset patch # User Eike Rathke [er] <eike.rathke@oracle.com> # Date 1284060031 -7200 # Node ID 528da6bfd0daed4355d745590d5ac3a319b08fb4 # Parent 237cb91dd986ff11eb100cc631206cda102e91f7 Change-Id: If456792f23429a80582a48b022d268e6179316a1
Diffstat (limited to 'formula')
-rw-r--r--formula/source/core/resource/core_resource.src1
1 files changed, 1 insertions, 0 deletions
diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src
index c552eb1f7062..b8fc21452458 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -385,6 +385,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_GREATER_EQUAL { Text = ">=" ; };
String SC_OPCODE_AND { Text = "AND" ; };
String SC_OPCODE_OR { Text = "OR" ; };
+ String SC_OPCODE_XOR { Text = "XOR" ; };
String SC_OPCODE_INTERSECT { Text = "!" ; };
String SC_OPCODE_UNION { Text = "~" ; };
String SC_OPCODE_RANGE { Text = ":" ; };