convert FDCategory to scoped enum

and drop unused AddIn constant

Change-Id: I9cb07d58d7c986973d9713572538ce2142654397

3 files changed, 124 insertions, 130 deletions

diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx
index c8f5bf5265db..7cf11cb1c6ab 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -355,13 +355,11 @@ OUString SAL_CALL AnalysisAddIn::getProgrammaticCategoryName( const OUString& aN
     {
         switch( it->GetCategory() )
         {
-            case FDCat_DateTime:    aRet = "Date&Time";         break;
-            case FDCat_Finance:     aRet = "Financial";         break;
-            case FDCat_Inf:         aRet = "Information";       break;
-            case FDCat_Math:        aRet = "Mathematical";      break;
-            case FDCat_Tech:        aRet = "Technical";         break;
-            default:
-                                    aRet = pDefCatName;         break;
+            case FDCategory::DateTime:    aRet = "Date&Time";         break;
+            case FDCategory::Finance:     aRet = "Financial";         break;
+            case FDCategory::Inf:         aRet = "Information";       break;
+            case FDCategory::Math:        aRet = "Mathematical";      break;
+            case FDCategory::Tech:        aRet = "Technical";         break;
         }
     }
     else
@@ -373,20 +371,17 @@ OUString SAL_CALL AnalysisAddIn::getProgrammaticCategoryName( const OUString& aN
 OUString SAL_CALL AnalysisAddIn::getDisplayCategoryName( const OUString& aProgrammaticFunctionName )
 {
     //  return translated strings, not used for predefined categories
-    //  return OUString( "Add-In" );
     auto it = std::find_if(pFD->begin(), pFD->end(), FindFuncData( aProgrammaticFunctionName ) );
     OUString              aRet;
     if( it != pFD->end() )
     {
         switch( it->GetCategory() )
         {
-            case FDCat_DateTime:    aRet = "Date&Time";         break;
-            case FDCat_Finance:     aRet = "Financial";         break;
-            case FDCat_Inf:         aRet = "Information";       break;
-            case FDCat_Math:        aRet = "Mathematical";      break;
-            case FDCat_Tech:        aRet = "Technical";         break;
-            default:
-                                    aRet = pDefCatName;         break;
+            case FDCategory::DateTime:    aRet = "Date&Time";         break;
+            case FDCategory::Finance:     aRet = "Financial";         break;
+            case FDCategory::Inf:         aRet = "Information";       break;
+            case FDCategory::Math:        aRet = "Mathematical";      break;
+            case FDCategory::Tech:        aRet = "Technical";         break;
         }
     }
     else
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index a3bedca123f8..355217c331db 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -50,107 +50,107 @@ const FuncDataBase pFuncDatas[] =
 {
     //                          UNIQUE or   INTPAR or
     //         function name     DOUBLE      STDPAR     # of param  category
-    FUNCDATA( Workday,          UNIQUE,     INTPAR,     3,          FDCat_DateTime ),
-    FUNCDATA( Yearfrac,         UNIQUE,     INTPAR,     3,          FDCat_DateTime ),
-    FUNCDATA( Edate,            UNIQUE,     INTPAR,     2,          FDCat_DateTime ),
-    FUNCDATAS( Weeknum,         DOUBLE,     INTPAR,     2,          FDCat_DateTime, "_EXCEL2003" ),
-    FUNCDATA( Eomonth,          UNIQUE,     INTPAR,     2,          FDCat_DateTime ),
-    FUNCDATAS( Networkdays,     DOUBLE,     INTPAR,     3,          FDCat_DateTime, "_EXCEL2003" ),
-    FUNCDATA( Iseven,           DOUBLE,     STDPAR,     1,          FDCat_Inf ),
-    FUNCDATA( Isodd,            DOUBLE,     STDPAR,     1,          FDCat_Inf ),
-    FUNCDATA( Multinomial,      UNIQUE,     STDPAR,     1,          FDCat_Math ),
-    FUNCDATA( Seriessum,        UNIQUE,     STDPAR,     4,          FDCat_Math ),
-    FUNCDATA( Quotient,         UNIQUE,     STDPAR,     2,          FDCat_Math ),
-    FUNCDATA( Mround,           UNIQUE,     STDPAR,     2,          FDCat_Math ),
-    FUNCDATA( Sqrtpi,           UNIQUE,     STDPAR,     1,          FDCat_Math ),
-    FUNCDATA( Randbetween,      UNIQUE,     STDPAR,     2,          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 ),
-    FUNCDATA( Bessely,          UNIQUE,     STDPAR,     2,          FDCat_Tech ),
-    FUNCDATA( Bin2Oct,          UNIQUE,     INTPAR,     2,          FDCat_Tech ),
-    FUNCDATA( Bin2Dec,          UNIQUE,     STDPAR,     1,          FDCat_Tech ),
-    FUNCDATA( Bin2Hex,          UNIQUE,     INTPAR,     2,          FDCat_Tech ),
-    FUNCDATA( Oct2Bin,          UNIQUE,     INTPAR,     2,          FDCat_Tech ),
-    FUNCDATA( Oct2Dec,          UNIQUE,     STDPAR,     1,          FDCat_Tech ),
-    FUNCDATA( Oct2Hex,          UNIQUE,     INTPAR,     2,          FDCat_Tech ),
-    FUNCDATA( Dec2Bin,          UNIQUE,     INTPAR,     2,          FDCat_Tech ),
-    FUNCDATA( Dec2Hex,          UNIQUE,     INTPAR,     2,          FDCat_Tech ),
-    FUNCDATA( Dec2Oct,          UNIQUE,     INTPAR,     2,          FDCat_Tech ),
-    FUNCDATA( Hex2Bin,          UNIQUE,     INTPAR,     2,          FDCat_Tech ),
-    FUNCDATA( Hex2Dec,          UNIQUE,     STDPAR,     1,          FDCat_Tech ),
-    FUNCDATA( Hex2Oct,          UNIQUE,     INTPAR,     2,          FDCat_Tech ),
-    FUNCDATA( Delta,            UNIQUE,     INTPAR,     2,          FDCat_Tech ),
-    FUNCDATA( Erf,              UNIQUE,     INTPAR,     2,          FDCat_Tech ),
-    FUNCDATA( Erfc,             UNIQUE,     STDPAR,     1,          FDCat_Tech ),
-    FUNCDATA( Gestep,           UNIQUE,     INTPAR,     2,          FDCat_Tech ),
-    FUNCDATA( Factdouble,       UNIQUE,     STDPAR,     1,          FDCat_Tech ),
-    FUNCDATA( Imabs,            UNIQUE,     STDPAR,     1,          FDCat_Tech ),
-    FUNCDATA( Imaginary,        UNIQUE,     STDPAR,     1,          FDCat_Tech ),
-    FUNCDATA( Impower,          UNIQUE,     STDPAR,     2,          FDCat_Tech ),
-    FUNCDATA( Imargument,       UNIQUE,     STDPAR,     1,          FDCat_Tech ),
-    FUNCDATA( Imcos,            UNIQUE,     STDPAR,     1,          FDCat_Tech ),
-    FUNCDATA( Imdiv,            UNIQUE,     STDPAR,     2,          FDCat_Tech ),
-    FUNCDATA( Imexp,            UNIQUE,     STDPAR,     1,          FDCat_Tech ),
-    FUNCDATA( Imconjugate,      UNIQUE,     STDPAR,     1,          FDCat_Tech ),
-    FUNCDATA( Imln,             UNIQUE,     STDPAR,     1,          FDCat_Tech ),
-    FUNCDATA( Imlog10,          UNIQUE,     STDPAR,     1,          FDCat_Tech ),
-    FUNCDATA( Imlog2,           UNIQUE,     STDPAR,     1,          FDCat_Tech ),
-    FUNCDATA( Improduct,        UNIQUE,     INTPAR,     2,          FDCat_Tech ),
-    FUNCDATA( Imreal,           UNIQUE,     STDPAR,     1,          FDCat_Tech ),
-    FUNCDATA( Imsin,            UNIQUE,     STDPAR,     1,          FDCat_Tech ),
-    FUNCDATA( Imsub,            UNIQUE,     STDPAR,     2,          FDCat_Tech ),
-    FUNCDATA( Imsqrt,           UNIQUE,     STDPAR,     1,          FDCat_Tech ),
-    FUNCDATA( Imsum,            UNIQUE,     INTPAR,     1,          FDCat_Tech ),
-    FUNCDATA( Imtan,            UNIQUE,     STDPAR,     1,          FDCat_Tech ),
-    FUNCDATA( Imsec,            UNIQUE,     STDPAR,     1,          FDCat_Tech ),
-    FUNCDATA( Imcsc,            UNIQUE,     STDPAR,     1,          FDCat_Tech ),
-    FUNCDATA( Imcot,            UNIQUE,     STDPAR,     1,          FDCat_Tech ),
-    FUNCDATA( Imsinh,           UNIQUE,     STDPAR,     1,          FDCat_Tech ),
-    FUNCDATA( Imcosh,           UNIQUE,     STDPAR,     1,          FDCat_Tech ),
-    FUNCDATA( Imsech,           UNIQUE,     STDPAR,     1,          FDCat_Tech ),
-    FUNCDATA( Imcsch,           UNIQUE,     STDPAR,     1,          FDCat_Tech ),
-    FUNCDATA( Complex,          UNIQUE,     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 ),
-    FUNCDATA( Accrintm,         UNIQUE,     INTPAR,     5,          FDCat_Finance ),
-    FUNCDATA( Received,         UNIQUE,     INTPAR,     5,          FDCat_Finance ),
-    FUNCDATA( Disc,             UNIQUE,     INTPAR,     5,          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 ),
-    FUNCDATA( Price,            UNIQUE,     INTPAR,     7,          FDCat_Finance ),
-    FUNCDATA( Pricedisc,        UNIQUE,     INTPAR,     5,          FDCat_Finance ),
-    FUNCDATA( Pricemat,         UNIQUE,     INTPAR,     6,          FDCat_Finance ),
-    FUNCDATA( Mduration,        UNIQUE,     INTPAR,     6,          FDCat_Finance ),
-    FUNCDATA( Nominal,          DOUBLE,     STDPAR,     2,          FDCat_Finance ),
-    FUNCDATA( Dollarfr,         UNIQUE,     STDPAR,     2,          FDCat_Finance ),
-    FUNCDATA( Dollarde,         UNIQUE,     STDPAR,     2,          FDCat_Finance ),
-    FUNCDATA( Yield,            UNIQUE,     INTPAR,     7,          FDCat_Finance ),
-    FUNCDATA( Yielddisc,        UNIQUE,     INTPAR,     5,          FDCat_Finance ),
-    FUNCDATA( Yieldmat,         UNIQUE,     INTPAR,     6,          FDCat_Finance ),
-    FUNCDATA( Tbilleq,          UNIQUE,     INTPAR,     3,          FDCat_Finance ),
-    FUNCDATA( Tbillprice,       UNIQUE,     INTPAR,     3,          FDCat_Finance ),
-    FUNCDATA( Tbillyield,       UNIQUE,     INTPAR,     3,          FDCat_Finance ),
-    FUNCDATA( Oddfprice,        UNIQUE,     INTPAR,     9,          FDCat_Finance ),
-    FUNCDATA( Oddfyield,        UNIQUE,     INTPAR,     9,          FDCat_Finance ),
-    FUNCDATA( Oddlprice,        UNIQUE,     INTPAR,     8,          FDCat_Finance ),
-    FUNCDATA( Oddlyield,        UNIQUE,     INTPAR,     8,          FDCat_Finance ),
-    FUNCDATA( Xirr,             UNIQUE,     INTPAR,     3,          FDCat_Finance ),
-    FUNCDATA( Xnpv,             UNIQUE,     STDPAR,     3,          FDCat_Finance ),
-    FUNCDATA( Intrate,          UNIQUE,     INTPAR,     5,          FDCat_Finance ),
-    FUNCDATA( Coupncd,          UNIQUE,     INTPAR,     4,          FDCat_Finance ),
-    FUNCDATA( Coupdays,         UNIQUE,     INTPAR,     4,          FDCat_Finance ),
-    FUNCDATA( Coupdaysnc,       UNIQUE,     INTPAR,     4,          FDCat_Finance ),
-    FUNCDATA( Coupdaybs,        UNIQUE,     INTPAR,     4,          FDCat_Finance ),
-    FUNCDATA( Couppcd,          UNIQUE,     INTPAR,     4,          FDCat_Finance ),
-    FUNCDATA( Coupnum,          UNIQUE,     INTPAR,     4,          FDCat_Finance ),
-    FUNCDATA( Fvschedule,       UNIQUE,     STDPAR,     2,          FDCat_Finance )
+    FUNCDATA( Workday,          UNIQUE,     INTPAR,     3,          FDCategory::DateTime ),
+    FUNCDATA( Yearfrac,         UNIQUE,     INTPAR,     3,          FDCategory::DateTime ),
+    FUNCDATA( Edate,            UNIQUE,     INTPAR,     2,          FDCategory::DateTime ),
+    FUNCDATAS( Weeknum,         DOUBLE,     INTPAR,     2,          FDCategory::DateTime, "_EXCEL2003" ),
+    FUNCDATA( Eomonth,          UNIQUE,     INTPAR,     2,          FDCategory::DateTime ),
+    FUNCDATAS( Networkdays,     DOUBLE,     INTPAR,     3,          FDCategory::DateTime, "_EXCEL2003" ),
+    FUNCDATA( Iseven,           DOUBLE,     STDPAR,     1,          FDCategory::Inf ),
+    FUNCDATA( Isodd,            DOUBLE,     STDPAR,     1,          FDCategory::Inf ),
+    FUNCDATA( Multinomial,      UNIQUE,     STDPAR,     1,          FDCategory::Math ),
+    FUNCDATA( Seriessum,        UNIQUE,     STDPAR,     4,          FDCategory::Math ),
+    FUNCDATA( Quotient,         UNIQUE,     STDPAR,     2,          FDCategory::Math ),
+    FUNCDATA( Mround,           UNIQUE,     STDPAR,     2,          FDCategory::Math ),
+    FUNCDATA( Sqrtpi,           UNIQUE,     STDPAR,     1,          FDCategory::Math ),
+    FUNCDATA( Randbetween,      UNIQUE,     STDPAR,     2,          FDCategory::Math ),
+    FUNCDATAS( Gcd,             DOUBLE,     INTPAR,     1,          FDCategory::Math, "_EXCEL2003" ),
+    FUNCDATAS( Lcm,             DOUBLE,     INTPAR,     1,          FDCategory::Math, "_EXCEL2003" ),
+    FUNCDATA( Besseli,          UNIQUE,     STDPAR,     2,          FDCategory::Tech ),
+    FUNCDATA( Besselj,          UNIQUE,     STDPAR,     2,          FDCategory::Tech ),
+    FUNCDATA( Besselk,          UNIQUE,     STDPAR,     2,          FDCategory::Tech ),
+    FUNCDATA( Bessely,          UNIQUE,     STDPAR,     2,          FDCategory::Tech ),
+    FUNCDATA( Bin2Oct,          UNIQUE,     INTPAR,     2,          FDCategory::Tech ),
+    FUNCDATA( Bin2Dec,          UNIQUE,     STDPAR,     1,          FDCategory::Tech ),
+    FUNCDATA( Bin2Hex,          UNIQUE,     INTPAR,     2,          FDCategory::Tech ),
+    FUNCDATA( Oct2Bin,          UNIQUE,     INTPAR,     2,          FDCategory::Tech ),
+    FUNCDATA( Oct2Dec,          UNIQUE,     STDPAR,     1,          FDCategory::Tech ),
+    FUNCDATA( Oct2Hex,          UNIQUE,     INTPAR,     2,          FDCategory::Tech ),
+    FUNCDATA( Dec2Bin,          UNIQUE,     INTPAR,     2,          FDCategory::Tech ),
+    FUNCDATA( Dec2Hex,          UNIQUE,     INTPAR,     2,          FDCategory::Tech ),
+    FUNCDATA( Dec2Oct,          UNIQUE,     INTPAR,     2,          FDCategory::Tech ),
+    FUNCDATA( Hex2Bin,          UNIQUE,     INTPAR,     2,          FDCategory::Tech ),
+    FUNCDATA( Hex2Dec,          UNIQUE,     STDPAR,     1,          FDCategory::Tech ),
+    FUNCDATA( Hex2Oct,          UNIQUE,     INTPAR,     2,          FDCategory::Tech ),
+    FUNCDATA( Delta,            UNIQUE,     INTPAR,     2,          FDCategory::Tech ),
+    FUNCDATA( Erf,              UNIQUE,     INTPAR,     2,          FDCategory::Tech ),
+    FUNCDATA( Erfc,             UNIQUE,     STDPAR,     1,          FDCategory::Tech ),
+    FUNCDATA( Gestep,           UNIQUE,     INTPAR,     2,          FDCategory::Tech ),
+    FUNCDATA( Factdouble,       UNIQUE,     STDPAR,     1,          FDCategory::Tech ),
+    FUNCDATA( Imabs,            UNIQUE,     STDPAR,     1,          FDCategory::Tech ),
+    FUNCDATA( Imaginary,        UNIQUE,     STDPAR,     1,          FDCategory::Tech ),
+    FUNCDATA( Impower,          UNIQUE,     STDPAR,     2,          FDCategory::Tech ),
+    FUNCDATA( Imargument,       UNIQUE,     STDPAR,     1,          FDCategory::Tech ),
+    FUNCDATA( Imcos,            UNIQUE,     STDPAR,     1,          FDCategory::Tech ),
+    FUNCDATA( Imdiv,            UNIQUE,     STDPAR,     2,          FDCategory::Tech ),
+    FUNCDATA( Imexp,            UNIQUE,     STDPAR,     1,          FDCategory::Tech ),
+    FUNCDATA( Imconjugate,      UNIQUE,     STDPAR,     1,          FDCategory::Tech ),
+    FUNCDATA( Imln,             UNIQUE,     STDPAR,     1,          FDCategory::Tech ),
+    FUNCDATA( Imlog10,          UNIQUE,     STDPAR,     1,          FDCategory::Tech ),
+    FUNCDATA( Imlog2,           UNIQUE,     STDPAR,     1,          FDCategory::Tech ),
+    FUNCDATA( Improduct,        UNIQUE,     INTPAR,     2,          FDCategory::Tech ),
+    FUNCDATA( Imreal,           UNIQUE,     STDPAR,     1,          FDCategory::Tech ),
+    FUNCDATA( Imsin,            UNIQUE,     STDPAR,     1,          FDCategory::Tech ),
+    FUNCDATA( Imsub,            UNIQUE,     STDPAR,     2,          FDCategory::Tech ),
+    FUNCDATA( Imsqrt,           UNIQUE,     STDPAR,     1,          FDCategory::Tech ),
+    FUNCDATA( Imsum,            UNIQUE,     INTPAR,     1,          FDCategory::Tech ),
+    FUNCDATA( Imtan,            UNIQUE,     STDPAR,     1,          FDCategory::Tech ),
+    FUNCDATA( Imsec,            UNIQUE,     STDPAR,     1,          FDCategory::Tech ),
+    FUNCDATA( Imcsc,            UNIQUE,     STDPAR,     1,          FDCategory::Tech ),
+    FUNCDATA( Imcot,            UNIQUE,     STDPAR,     1,          FDCategory::Tech ),
+    FUNCDATA( Imsinh,           UNIQUE,     STDPAR,     1,          FDCategory::Tech ),
+    FUNCDATA( Imcosh,           UNIQUE,     STDPAR,     1,          FDCategory::Tech ),
+    FUNCDATA( Imsech,           UNIQUE,     STDPAR,     1,          FDCategory::Tech ),
+    FUNCDATA( Imcsch,           UNIQUE,     STDPAR,     1,          FDCategory::Tech ),
+    FUNCDATA( Complex,          UNIQUE,     STDPAR,     3,          FDCategory::Tech ),
+    FUNCDATA( Convert,          UNIQUE,     STDPAR,     3,          FDCategory::Tech ),
+    FUNCDATA( Amordegrc,        UNIQUE,     INTPAR,     7,          FDCategory::Finance ),
+    FUNCDATA( Amorlinc,         UNIQUE,     INTPAR,     7,          FDCategory::Finance ),
+    FUNCDATA( Accrint,          UNIQUE,     INTPAR,     7,          FDCategory::Finance ),
+    FUNCDATA( Accrintm,         UNIQUE,     INTPAR,     5,          FDCategory::Finance ),
+    FUNCDATA( Received,         UNIQUE,     INTPAR,     5,          FDCategory::Finance ),
+    FUNCDATA( Disc,             UNIQUE,     INTPAR,     5,          FDCategory::Finance ),
+    FUNCDATA( Duration,         UNIQUE,     INTPAR,     6,          FDCategory::Finance ),
+    FUNCDATA( Effect,           DOUBLE,     STDPAR,     2,          FDCategory::Finance ),
+    FUNCDATA( Cumprinc,         DOUBLE,     STDPAR,     6,          FDCategory::Finance ),
+    FUNCDATA( Cumipmt,          DOUBLE,     STDPAR,     6,          FDCategory::Finance ),
+    FUNCDATA( Price,            UNIQUE,     INTPAR,     7,          FDCategory::Finance ),
+    FUNCDATA( Pricedisc,        UNIQUE,     INTPAR,     5,          FDCategory::Finance ),
+    FUNCDATA( Pricemat,         UNIQUE,     INTPAR,     6,          FDCategory::Finance ),
+    FUNCDATA( Mduration,        UNIQUE,     INTPAR,     6,          FDCategory::Finance ),
+    FUNCDATA( Nominal,          DOUBLE,     STDPAR,     2,          FDCategory::Finance ),
+    FUNCDATA( Dollarfr,         UNIQUE,     STDPAR,     2,          FDCategory::Finance ),
+    FUNCDATA( Dollarde,         UNIQUE,     STDPAR,     2,          FDCategory::Finance ),
+    FUNCDATA( Yield,            UNIQUE,     INTPAR,     7,          FDCategory::Finance ),
+    FUNCDATA( Yielddisc,        UNIQUE,     INTPAR,     5,          FDCategory::Finance ),
+    FUNCDATA( Yieldmat,         UNIQUE,     INTPAR,     6,          FDCategory::Finance ),
+    FUNCDATA( Tbilleq,          UNIQUE,     INTPAR,     3,          FDCategory::Finance ),
+    FUNCDATA( Tbillprice,       UNIQUE,     INTPAR,     3,          FDCategory::Finance ),
+    FUNCDATA( Tbillyield,       UNIQUE,     INTPAR,     3,          FDCategory::Finance ),
+    FUNCDATA( Oddfprice,        UNIQUE,     INTPAR,     9,          FDCategory::Finance ),
+    FUNCDATA( Oddfyield,        UNIQUE,     INTPAR,     9,          FDCategory::Finance ),
+    FUNCDATA( Oddlprice,        UNIQUE,     INTPAR,     8,          FDCategory::Finance ),
+    FUNCDATA( Oddlyield,        UNIQUE,     INTPAR,     8,          FDCategory::Finance ),
+    FUNCDATA( Xirr,             UNIQUE,     INTPAR,     3,          FDCategory::Finance ),
+    FUNCDATA( Xnpv,             UNIQUE,     STDPAR,     3,          FDCategory::Finance ),
+    FUNCDATA( Intrate,          UNIQUE,     INTPAR,     5,          FDCategory::Finance ),
+    FUNCDATA( Coupncd,          UNIQUE,     INTPAR,     4,          FDCategory::Finance ),
+    FUNCDATA( Coupdays,         UNIQUE,     INTPAR,     4,          FDCategory::Finance ),
+    FUNCDATA( Coupdaysnc,       UNIQUE,     INTPAR,     4,          FDCategory::Finance ),
+    FUNCDATA( Coupdaybs,        UNIQUE,     INTPAR,     4,          FDCategory::Finance ),
+    FUNCDATA( Couppcd,          UNIQUE,     INTPAR,     4,          FDCategory::Finance ),
+    FUNCDATA( Coupnum,          UNIQUE,     INTPAR,     4,          FDCategory::Finance ),
+    FUNCDATA( Fvschedule,       UNIQUE,     STDPAR,     2,          FDCategory::Finance )
 };
 #undef FUNCDATA
 
diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx
index b00654d39056..670f5c55dc80 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -188,14 +188,13 @@ double              GetCoupdays( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int
                                 sal_Int32 nBase );
 
 
-enum FDCategory
-{
-    FDCat_AddIn,
-    FDCat_DateTime,
-    FDCat_Finance,
-    FDCat_Inf,
-    FDCat_Math,
-    FDCat_Tech
+enum class FDCategory
+{
+    DateTime,
+    Finance,
+    Inf,
+    Math,
+    Tech
 };
 
 
@@ -204,8 +203,8 @@ struct FuncDataBase
     const sal_Char*         pIntName;
     sal_uInt16              nUINameID;          // resource ID to UI name
     sal_uInt16              nDescrID;           // resource ID to description, parameter names and ~ description
-    bool                bDouble;            // name already exist in Calc
-    bool                bWithOpt;           // first parameter is internal
+    bool                    bDouble;            // name already exist in Calc
+    bool                    bWithOpt;           // first parameter is internal
     sal_uInt16              nCompListID;        // resource ID to list of valid names
     sal_uInt16              nNumOfParams;       // number of named / described parameters
     FDCategory              eCat;               // function category
@@ -216,15 +215,15 @@ struct FuncDataBase
 class FuncData final
 {
 private:
-    OUString         aIntName;
+    OUString                aIntName;
     sal_uInt16              nUINameID;
     sal_uInt16              nDescrID;           // leads also to parameter descriptions!
-    bool                bDouble;            // flag for names that already exist in Calc
-    bool                bWithOpt;           // has internal parameter on first position
+    bool                    bDouble;            // flag for names that already exist in Calc
+    bool                    bWithOpt;           // has internal parameter on first position
 
     sal_uInt16              nParam;             // num of parameters
     sal_uInt16              nCompID;
-    std::vector<OUString>  aCompList;          // list of all valid names
+    std::vector<OUString>   aCompList;          // list of all valid names
     FDCategory              eCat;               // function category
     OUString                aSuffix;            // if bDouble and not empty, append a suffix other than "_ADD" for UI