[Libreoffice-commits] core.git: scaddins/source

Winfried Donkers winfrieddonkers at libreoffice.org
Thu Oct 8 07:30:56 PDT 2015


 scaddins/source/analysis/analysis.src       |   16 ++++++++--------
 scaddins/source/analysis/analysishelper.cxx |    4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 91e15edd12dee222bd5fb0b8912d4daa24d6ea74
Author: Winfried Donkers <winfrieddonkers at libreoffice.org>
Date:   Thu Oct 8 09:49:26 2015 +0200

    Make clear to user that Calc add-in functions GCD and LCM only exist for
    
    interoperability with Excel2003 and before.
    Follow up of commit 74010f1c502a4bd7eb1ef3ee3d0e8c45a1c9afee
    
    Change-Id: I824df2fc50200fc29f7de61881d867f53056edc9
    Reviewed-on: https://gerrit.libreoffice.org/19241
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/scaddins/source/analysis/analysis.src b/scaddins/source/analysis/analysis.src
index d121fe4..c850496 100644
--- a/scaddins/source/analysis/analysis.src
+++ b/scaddins/source/analysis/analysis.src
@@ -425,17 +425,17 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
 
     Resource ANALYSIS_Gcd
     {
-        String 1    // description Gcd_add
+        String 1    // description Gcd_Excel2003
         {
-            Text [ en-US ] = "Returns the greatest common divisor";
+            Text [ en-US ] = "Returns the greatest common divisor.\nThis function exists for interoperability with older Microsoft Excel documents, for new documents use GCD instead.";
         };
 
-        String 2 // name of parameter 1         Gcd_add
+        String 2 // name of parameter 1         Gcd_Excel2003
         {
             Text [ en-US ] = "Number(s)";
         };
 
-        String 3 // description of parameter 1  Gcd_add
+        String 3 // description of parameter 1  Gcd_Excel2003
         {
             Text [ en-US ] = "Number or list of numbers";
         };
@@ -443,17 +443,17 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
 
     Resource ANALYSIS_Lcm
     {
-        String 1    // description Lcm_add
+        String 1    // description Lcm_Excel2003
         {
-            Text [ en-US ] = "Returns the least common multiple";
+            Text [ en-US ] = "Returns the least common multiple.\nThis function exists for interoperability with older Microsoft Excel documents, for new documents use LCM instead.";
         };
 
-        String 2 // name of parameter 1         Lcm_add
+        String 2 // name of parameter 1         Lcm_Excel2003
         {
             Text [ en-US ] = "Number(s)";
         };
 
-        String 3 // description of parameter 1  Lcm_add
+        String 3 // description of parameter 1  Lcm_Excel2003
         {
             Text [ en-US ] = "Number or list of numbers";
         };
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index d22d34b..517f091 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -62,8 +62,8 @@ const FuncDataBase pFuncDatas[] =
     FUNCDATA( Mround,           UNIQUE,     STDPAR,     2,          FDCat_Math ),
     FUNCDATA( Sqrtpi,           UNIQUE,     STDPAR,     1,          FDCat_Math ),
     FUNCDATA( Randbetween,      UNIQUE,     STDPAR,     2,          FDCat_Math ),
-    FUNCDATA( Gcd,              DOUBLE,     INTPAR,     1,          FDCat_Math ),
-    FUNCDATA( Lcm,              DOUBLE,     INTPAR,     1,          FDCat_Math ),
+    FUNCDATAS( Gcd,             DOUBLE,     INTPAR,     1,          FDCat_Math, "_EXCEL2003" ),
+    FUNCDATAS( Lcm,             DOUBLE,     INTPAR,     1,          FDCat_Math, "_EXCEL2003" ),
     FUNCDATA( Besseli,          UNIQUE,     STDPAR,     2,          FDCat_Tech ),
     FUNCDATA( Besselj,          UNIQUE,     STDPAR,     2,          FDCat_Tech ),
     FUNCDATA( Besselk,          UNIQUE,     STDPAR,     2,          FDCat_Tech ),


More information about the Libreoffice-commits mailing list