From ced79363cc30f225e766195ace4f892754fc85a0 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Wed, 3 Aug 2016 18:56:01 +0200 Subject: Resolves: tdf#69539 UI rename CONVERT to CONVERT_OOO, CONVERT_ADD to CONVERT ... with same syntax but different semantics that was even more confusing. Change-Id: Ibe1efcd5c4e82c9ce8d9fe8ed0f85e86dac327f7 --- formula/source/core/resource/core_resource.src | 8 ++++---- sc/qa/unit/ucalc.cxx | 2 +- sc/source/core/tool/odffmap.cxx | 2 +- scaddins/source/analysis/analysishelper.cxx | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src index b1f09ddcaf84..40f489536ef8 100644 --- a/formula/source/core/resource/core_resource.src +++ b/formula/source/core/resource/core_resource.src @@ -1301,7 +1301,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_PODF String SC_OPCODE_DDE { Text = "DDE" ; }; String SC_OPCODE_BASE { Text = "BASE" ; }; String SC_OPCODE_DECIMAL { Text = "DECIMAL" ; }; - String SC_OPCODE_CONVERT_OOO { Text = "CONVERT" ; }; + String SC_OPCODE_CONVERT_OOO { Text = "CONVERT" ; }; // wrong but ODF1.1, keep it. String SC_OPCODE_ROMAN { Text = "ROMAN" ; }; String SC_OPCODE_ARABIC { Text = "ARABIC" ; }; String SC_OPCODE_HYPERLINK { Text = "HYPERLINK" ; }; @@ -1743,7 +1743,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_API String SC_OPCODE_DDE { Text = "DDE" ; }; String SC_OPCODE_BASE { Text = "BASE" ; }; String SC_OPCODE_DECIMAL { Text = "DECIMAL" ; }; - String SC_OPCODE_CONVERT_OOO { Text = "CONVERT" ; }; + String SC_OPCODE_CONVERT_OOO { Text = "CONVERT" ; }; /* TODO: wrong but API, change? */ String SC_OPCODE_ROMAN { Text = "ROMAN" ; }; String SC_OPCODE_ARABIC { Text = "ARABIC" ; }; String SC_OPCODE_HYPERLINK { Text = "HYPERLINK" ; }; @@ -2184,7 +2184,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH String SC_OPCODE_DDE { Text = "DDE" ; }; String SC_OPCODE_BASE { Text = "BASE" ; }; String SC_OPCODE_DECIMAL { Text = "DECIMAL" ; }; - String SC_OPCODE_CONVERT_OOO { Text = "CONVERT" ; }; + String SC_OPCODE_CONVERT_OOO { Text = "CONVERT_OOO" ; }; String SC_OPCODE_ROMAN { Text = "ROMAN" ; }; String SC_OPCODE_ARABIC { Text = "ARABIC" ; }; String SC_OPCODE_HYPERLINK { Text = "HYPERLINK" ; }; @@ -3750,7 +3750,7 @@ Resource RID_STRLIST_FUNCTION_NAMES }; String SC_OPCODE_CONVERT_OOO { - Text [ en-US ] = "CONVERT"; + Text [ en-US ] = "CONVERT_OOO"; }; String SC_OPCODE_ROMAN { diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 5d3d663533e5..394259d9e446 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -2212,7 +2212,7 @@ void Test::testFunctionLists() "COLOR", "COMBIN", "COMBINA", - "CONVERT", + "CONVERT_OOO", "COS", "COSH", "COT", diff --git a/sc/source/core/tool/odffmap.cxx b/sc/source/core/tool/odffmap.cxx index 3f66859ea9ca..4a37e2f8bdb4 100644 --- a/sc/source/core/tool/odffmap.cxx +++ b/sc/source/core/tool/odffmap.cxx @@ -95,7 +95,7 @@ ScCompiler::AddInMap ScCompiler::maAddInMap[] = { "IMSECH", "IMSECH", "com.sun.star.sheet.addin.Analysis.getImsech", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETIMSECH" }, { "IMCSCH", "IMCSCH", "com.sun.star.sheet.addin.Analysis.getImcsch", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETIMCSCH" }, { "COMPLEX", "COMPLEX", "com.sun.star.sheet.addin.Analysis.getComplex", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETCOMPLEX" }, - { "CONVERT", "CONVERT_ADD", "com.sun.star.sheet.addin.Analysis.getConvert", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETCONVERT" }, + { "CONVERT", "CONVERT", "com.sun.star.sheet.addin.Analysis.getConvert", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETCONVERT" }, { "AMORDEGRC", "AMORDEGRC", "com.sun.star.sheet.addin.Analysis.getAmordegrc", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETAMORDEGRC" }, { "AMORLINC", "AMORLINC", "com.sun.star.sheet.addin.Analysis.getAmorlinc", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETAMORLINC" }, { "ACCRINT", "ACCRINT", "com.sun.star.sheet.addin.Analysis.getAccrint", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETACCRINT" }, diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx index ea8da0c82b67..5d83a0675893 100644 --- a/scaddins/source/analysis/analysishelper.cxx +++ b/scaddins/source/analysis/analysishelper.cxx @@ -113,7 +113,7 @@ const FuncDataBase pFuncDatas[] = FUNCDATA( Imsech, UNIQUE, STDPAR, 1, FDCat_Tech ), FUNCDATA( Imcsch, UNIQUE, STDPAR, 1, FDCat_Tech ), FUNCDATA( Complex, UNIQUE, STDPAR, 3, FDCat_Tech ), - FUNCDATA( Convert, DOUBLE, STDPAR, 3, FDCat_Tech ), + FUNCDATA( Convert, UNIQUE, STDPAR, 3, FDCat_Tech ), FUNCDATA( Amordegrc, UNIQUE, INTPAR, 7, FDCat_Finance ), FUNCDATA( Amorlinc, UNIQUE, INTPAR, 7, FDCat_Finance ), FUNCDATA( Accrint, UNIQUE, INTPAR, 7, FDCat_Finance ), -- cgit v1.2.3