diff options
| author | Eike Rathke <erack@redhat.com> | 2012-06-12 22:09:07 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2012-06-12 22:30:00 +0200 |
| commit | 9ae96127e5b363e6eea14a0e9459b22f0f7307ca (patch) | |
| tree | a12a4f2060f9c4ec9d2bdc188879ba3c1d0856c4 | |
| parent | 033cce3e0fbb72a9400836923be96c5036aaacb0 (diff) | |
changes to patch "fdo#50822 add function XOR to calc as in ODFF1.2"
* removed XOR entry again from sc/source/filter/oox/formulabase.cxx
saFuncTableBiff5
* changed XOR entry in sc/source/filter/excel/xlformula.cxx saFuncTable_Odf
from ocNoName to ocXor to have it written as _xlfnodf.XOR
* changed description of function in Function Wizard
| -rw-r--r-- | sc/source/filter/excel/xlformula.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/oox/formulabase.cxx | 1 | ||||
| -rw-r--r-- | sc/source/ui/src/scfuncs.src | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx index 4af76f08c08c..9a11412c2b77 100644 --- a/sc/source/filter/excel/xlformula.cxx +++ b/sc/source/filter/excel/xlformula.cxx @@ -403,7 +403,7 @@ static const XclFunctionInfo saFuncTable_Odf[] = EXC_FUNCENTRY_ODF( ocNoName, 1, MX, 0, "SKEWP" ), EXC_FUNCENTRY_ODF( ocUnichar, 1, 1, 0, "UNICHAR" ), EXC_FUNCENTRY_ODF( ocUnicode, 1, 1, 0, "UNICODE" ), - EXC_FUNCENTRY_ODF( ocNoName, 1, MX, 0, "XOR" ) + EXC_FUNCENTRY_ODF( ocXor, 1, MX, 0, "XOR" ) }; #undef EXC_FUNCENTRY_ODF diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx index 381d74d1df54..b80dbfaaf7b2 100644 --- a/sc/source/filter/oox/formulabase.cxx +++ b/sc/source/filter/oox/formulabase.cxx @@ -669,7 +669,6 @@ static const FunctionData saFuncTableBiff5[] = { 0, "DATESTRING", 352, 352, 1, 1, V, { VR }, FUNCFLAG_IMPORTONLY }, // not supported in Calc, missing in OOXML spec { 0, "NUMBERSTRING", 353, 353, 2, 2, V, { VR }, FUNCFLAG_IMPORTONLY }, // not supported in Calc, missing in OOXML spec { "ROMAN", "ROMAN", 354, 354, 1, 2, V, { VR }, 0 }, - { "XOR", "XOR", 355, 355, 1, MX, V, { RX }, 0 }, // *** EuroTool add-in *** diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src index 60f8fcac85f6..039aad6db2f9 100644 --- a/sc/source/ui/src/scfuncs.src +++ b/sc/source/ui/src/scfuncs.src @@ -2687,7 +2687,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 { String 1 // Description { - Text [ en-US ] = "Returns TRUE if one argument is TRUE, but not both." ; + Text [ en-US ] = "Returns TRUE if an odd number of arguments evaluates to TRUE." ; }; ExtraData = { |