Kaydet (Commit) 9ae96127 authored tarafından Eike Rathke's avatar Eike Rathke

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
üst 033cce3e
...@@ -403,7 +403,7 @@ static const XclFunctionInfo saFuncTable_Odf[] = ...@@ -403,7 +403,7 @@ static const XclFunctionInfo saFuncTable_Odf[] =
EXC_FUNCENTRY_ODF( ocNoName, 1, MX, 0, "SKEWP" ), EXC_FUNCENTRY_ODF( ocNoName, 1, MX, 0, "SKEWP" ),
EXC_FUNCENTRY_ODF( ocUnichar, 1, 1, 0, "UNICHAR" ), EXC_FUNCENTRY_ODF( ocUnichar, 1, 1, 0, "UNICHAR" ),
EXC_FUNCENTRY_ODF( ocUnicode, 1, 1, 0, "UNICODE" ), 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 #undef EXC_FUNCENTRY_ODF
......
...@@ -669,7 +669,6 @@ static const FunctionData saFuncTableBiff5[] = ...@@ -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, "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 { 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 }, { "ROMAN", "ROMAN", 354, 354, 1, 2, V, { VR }, 0 },
{ "XOR", "XOR", 355, 355, 1, MX, V, { RX }, 0 },
// *** EuroTool add-in *** // *** EuroTool add-in ***
......
...@@ -2687,7 +2687,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 ...@@ -2687,7 +2687,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
{ {
String 1 // Description 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 = ExtraData =
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment