diff options
| author | Eike Rathke <erack@redhat.com> | 2014-08-21 15:06:46 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2014-08-21 15:10:08 +0200 |
| commit | 7c6a82d66ebe55fa5ce106bf60f841dd7758d2bc (patch) | |
| tree | a95f40a01c528cad9a4922d94c1ebd847e3560e2 | |
| parent | 2b65832b5853dfea1f970141acfeee46177e3799 (diff) | |
write COLOR function with extension namespace
and add to Excel import/export maps so it survives saving in that format
Change-Id: I3a8e07fdd1bded77d4bad60eefffeb0b1dbdd734
| -rw-r--r-- | formula/source/core/resource/core_resource.src | 3 | ||||
| -rw-r--r-- | sc/source/core/tool/compiler.cxx | 1 | ||||
| -rw-r--r-- | sc/source/filter/excel/xlformula.cxx | 3 | ||||
| -rw-r--r-- | sc/source/filter/oox/formulabase.cxx | 3 |
4 files changed, 7 insertions, 3 deletions
diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src index 259eda09ac62..6f7f8d56d020 100644 --- a/formula/source/core/resource/core_resource.src +++ b/formula/source/core/resource/core_resource.src @@ -423,7 +423,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF /* END defined ERROR.TYPE() values. */ String SC_OPCODE_FILTERXML { Text = "COM.MICROSOFT.FILTERXML";}; String SC_OPCODE_WEBSERVICE { Text = "COM.MICROSOFT.WEBSERVICE"; }; - String SC_OPCODE_COLOR { Text = "COLOR"; }; + String SC_OPCODE_COLOR { Text = "ORG.LIBREOFFICE.COLOR"; }; String SC_OPCODE_ERF_MS { Text = "COM.MICROSOFT.ERF.PRECISE" ; }; String SC_OPCODE_ERFC_MS { Text = "COM.MICROSOFT.ERFC.PRECISE" ; }; }; @@ -830,6 +830,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML /* END defined ERROR.TYPE() values. */ String SC_OPCODE_FILTERXML { Text = "_xlfn.FILTERXML";}; String SC_OPCODE_WEBSERVICE { Text = "_xlfn.WEBSERVICE"; }; + String SC_OPCODE_COLOR { Text = "_xlfn.ORG.LIBREOFFICE.COLOR"; }; String SC_OPCODE_ERF_MS { Text = "_xlfn.ERF.PRECISE" ; }; String SC_OPCODE_ERFC_MS { Text = "_xlfn.ERFC.PRECISE" ; }; }; diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 2d7694deb193..788dd0edf4b6 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -2424,6 +2424,7 @@ bool ScCompiler::IsOpCode( const OUString& rName, bool bInArray ) { "TDIST", ocTDist }, // TDIST -> LEGACY.TDIST { "EASTERSUNDAY", ocEasterSunday }, // EASTERSUNDAY -> ORG.OPENOFFICE.EASTERSUNDAY { "ZGZ", ocZGZ }, // ZGZ -> RRI + { "COLOR", ocColor }, // COLOR -> ORG.LIBREOFFICE.COLOR // Renamed new names, prepare to read future names: { "ORG.OPENOFFICE.GOALSEEK", ocBackSolver } // GOALSEEK -> ORG.OPENOFFICE.GOALSEEK }; diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx index 3944c5706bbd..abb9c2d81112 100644 --- a/sc/source/filter/excel/xlformula.cxx +++ b/sc/source/filter/excel/xlformula.cxx @@ -589,7 +589,8 @@ static const XclFunctionInfo saFuncTable_Odf[] = /** Functions defined by Calc, but not in OpenFormula nor supported by Excel. */ static const XclFunctionInfo saFuncTable_OOoLO[] = { - EXC_FUNCENTRY_OOO( ocConvert, 3, 3, 0, "ORG.OPENOFFICE.CONVERT" ) + EXC_FUNCENTRY_OOO( ocConvert, 3, 3, 0, "ORG.OPENOFFICE.CONVERT" ), + EXC_FUNCENTRY_OOO( ocColor, 3, 4, 0, "ORG.LIBREOFFICE.COLOR" ) }; #undef EXC_FUNCENTRY_OOO diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx index b866a7786fbc..2459791eb8e6 100644 --- a/sc/source/filter/oox/formulabase.cxx +++ b/sc/source/filter/oox/formulabase.cxx @@ -917,7 +917,8 @@ static const FunctionData saFuncTableOOoLO[] = { "ORG.OPENOFFICE.WEEKSINYEAR", "COM.SUN.STAR.SHEET.ADDIN.DATEFUNCTIONS.GETWEEKSINYEAR", NOID, NOID, 1, 1, V, { VR }, FUNCFLAG_IMPORTONLY | FUNCFLAG_EXTERNAL }, { "ORG.OPENOFFICE.ROT13", "COM.SUN.STAR.SHEET.ADDIN.DATEFUNCTIONS.GETROT13", NOID, NOID, 1, 1, V, { VR }, FUNCFLAG_IMPORTONLY | FUNCFLAG_EXTERNAL }, // Other functions. - { "ORG.OPENOFFICE.CONVERT", "ORG.OPENOFFICE.CONVERT", NOID, NOID, 3, 3, V, { VR }, FUNCFLAG_MACROCALL_NEW } + { "ORG.OPENOFFICE.CONVERT", "ORG.OPENOFFICE.CONVERT", NOID, NOID, 3, 3, V, { VR }, FUNCFLAG_MACROCALL_NEW }, + { "ORG.LIBREOFFICE.COLOR", "ORG.LIBREOFFICE.COLOR", NOID, NOID, 3, 4, V, { VR }, FUNCFLAG_MACROCALL_NEW } }; const sal_Unicode API_TOKEN_OPEN = '('; |