diff options
author | Eike Rathke <erack@redhat.com> | 2016-08-03 17:08:13 +0200 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2016-08-03 17:08:36 +0200 |
commit | dbbab7b1b0c2c1c43cc52b620212fb29c7b99bff (patch) | |
tree | e50c036cd19b53fe5474fe994c02054e2cfd8341 | |
parent | 3bc16f4a476f22935bd128cef797fb2d69758294 (diff) |
UI rename DURATION to PDURATION, DURATION_ADD to DURATION, tdf#50488 related
Change-Id: I7ba783b59a711fc9c9d6bbe68dcf8c3c1a0d409d
-rw-r--r-- | formula/source/core/resource/core_resource.src | 8 | ||||
-rw-r--r-- | sc/qa/unit/ucalc.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/odffmap.cxx | 2 | ||||
-rw-r--r-- | 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 d8cd84f629a9..d130204c1156 100644 --- a/formula/source/core/resource/core_resource.src +++ b/formula/source/core/resource/core_resource.src @@ -1106,7 +1106,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_PODF String SC_OPCODE_DDB { Text = "DDB" ; }; String SC_OPCODE_DB { Text = "DB" ; }; String SC_OPCODE_VBD { Text = "VDB" ; }; - String SC_OPCODE_PDURATION { Text = "DURATION" ; }; + String SC_OPCODE_PDURATION { Text = "DURATION" ; }; // wrong but ODF1.1, keep it. String SC_OPCODE_SLN { Text = "SLN" ; }; String SC_OPCODE_PMT { Text = "PMT" ; }; String SC_OPCODE_COLUMNS { Text = "COLUMNS" ; }; @@ -1548,7 +1548,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_API String SC_OPCODE_DDB { Text = "DDB" ; }; String SC_OPCODE_DB { Text = "DB" ; }; String SC_OPCODE_VBD { Text = "VDB" ; }; - String SC_OPCODE_PDURATION { Text = "DURATION" ; }; + String SC_OPCODE_PDURATION { Text = "DURATION" ; }; /* TODO: wrong but API, change? */ String SC_OPCODE_SLN { Text = "SLN" ; }; String SC_OPCODE_PMT { Text = "PMT" ; }; String SC_OPCODE_COLUMNS { Text = "COLUMNS" ; }; @@ -1989,7 +1989,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH String SC_OPCODE_DDB { Text = "DDB" ; }; String SC_OPCODE_DB { Text = "DB" ; }; String SC_OPCODE_VBD { Text = "VDB" ; }; - String SC_OPCODE_PDURATION { Text = "DURATION" ; }; + String SC_OPCODE_PDURATION { Text = "PDURATION" ; }; String SC_OPCODE_SLN { Text = "SLN" ; }; String SC_OPCODE_PMT { Text = "PMT" ; }; String SC_OPCODE_COLUMNS { Text = "COLUMNS" ; }; @@ -2969,7 +2969,7 @@ Resource RID_STRLIST_FUNCTION_NAMES }; String SC_OPCODE_PDURATION { - Text [ en-US ] = "DURATION" ; + Text [ en-US ] = "PDURATION" ; }; String SC_OPCODE_SLN { diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 387914af4591..5d3d663533e5 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -2125,7 +2125,6 @@ void Test::testFunctionLists() "CUMPRINC", "DB", "DDB", - "DURATION", "EFFECT", "FV", "IPMT", @@ -2139,6 +2138,7 @@ void Test::testFunctionLists() "OPT_PROB_HIT", "OPT_PROB_INMONEY", "OPT_TOUCH", + "PDURATION", "PMT", "PPMT", "PV", diff --git a/sc/source/core/tool/odffmap.cxx b/sc/source/core/tool/odffmap.cxx index d0a62cde6d31..3f66859ea9ca 100644 --- a/sc/source/core/tool/odffmap.cxx +++ b/sc/source/core/tool/odffmap.cxx @@ -102,7 +102,7 @@ ScCompiler::AddInMap ScCompiler::maAddInMap[] = { "ACCRINTM", "ACCRINTM", "com.sun.star.sheet.addin.Analysis.getAccrintm", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETACCRINTM" }, { "RECEIVED", "RECEIVED", "com.sun.star.sheet.addin.Analysis.getReceived", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETRECEIVED" }, { "DISC", "DISC", "com.sun.star.sheet.addin.Analysis.getDisc", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETDISC" }, - { "DURATION", "DURATION_ADD", "com.sun.star.sheet.addin.Analysis.getDuration", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETDURATION" }, + { "DURATION", "DURATION", "com.sun.star.sheet.addin.Analysis.getDuration", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETDURATION" }, { "EFFECT", "EFFECT_ADD", "com.sun.star.sheet.addin.Analysis.getEffect", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETEFFECT" }, { "CUMPRINC", "CUMPRINC_ADD", "com.sun.star.sheet.addin.Analysis.getCumprinc", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETCUMPRINC" }, { "CUMIPMT", "CUMIPMT_ADD", "com.sun.star.sheet.addin.Analysis.getCumipmt", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETCUMIPMT" }, diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx index 992abfd64554..ea8da0c82b67 100644 --- a/scaddins/source/analysis/analysishelper.cxx +++ b/scaddins/source/analysis/analysishelper.cxx @@ -120,7 +120,7 @@ const FuncDataBase pFuncDatas[] = FUNCDATA( Accrintm, UNIQUE, INTPAR, 5, FDCat_Finance ), FUNCDATA( Received, UNIQUE, INTPAR, 5, FDCat_Finance ), FUNCDATA( Disc, UNIQUE, INTPAR, 5, FDCat_Finance ), - FUNCDATA( Duration, DOUBLE, INTPAR, 6, FDCat_Finance ), + FUNCDATA( Duration, UNIQUE, INTPAR, 6, FDCat_Finance ), FUNCDATA( Effect, DOUBLE, STDPAR, 2, FDCat_Finance ), FUNCDATA( Cumprinc, DOUBLE, STDPAR, 6, FDCat_Finance ), FUNCDATA( Cumipmt, DOUBLE, STDPAR, 6, FDCat_Finance ), |