unwind RID_ANALYSIS_FUNCTION_NAMES local resource

Change-Id: Icaab5d3690922748bd473434dbbb1d8cc6eccd2d

4 files changed, 504 insertions, 528 deletions

diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx
index 7cf11cb1c6ab..137e9274a9ed 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -280,7 +280,7 @@ OUString SAL_CALL AnalysisAddIn::getDisplayFunctionName( const OUString& aProgra
     auto it = std::find_if(pFD->begin(), pFD->end(), FindFuncData( aProgrammaticName ) );
     if( it != pFD->end() )
     {
-        aRet = AnalysisRscStrLoader( RID_ANALYSIS_FUNCTION_NAMES, it->GetUINameID(), GetResMgr() ).GetString();
+        aRet = AnalysisResId(it->GetUINameID(), GetResMgr()).toString();
         if( it->IsDouble() )
         {
             const OUString& rSuffix = it->GetSuffix();
diff --git a/scaddins/source/analysis/analysis.hrc b/scaddins/source/analysis/analysis.hrc
index 4657499dfc67..63e9cdf31ffc 100644
--- a/scaddins/source/analysis/analysis.hrc
+++ b/scaddins/source/analysis/analysis.hrc
@@ -22,7 +22,6 @@
 #define ANALYSIS_RESOURCE_START             1000
 
 #define RID_ANALYSIS_FUNCTION_DESCRIPTIONS  (ANALYSIS_RESOURCE_START+1000)
-#define RID_ANALYSIS_FUNCTION_NAMES         (ANALYSIS_RESOURCE_START+2000)
 #define RID_ANALYSIS_DEFFUNCTION_NAMES      (ANALYSIS_RESOURCE_START+3000)
 
 #define ANALYSIS_FUNCDESC_START             (ANALYSIS_RESOURCE_START)
@@ -129,7 +128,7 @@
 #define ANALYSIS_Imsech                     (ANALYSIS_FUNCDESC_START+99)
 #define ANALYSIS_Imcsch                     (ANALYSIS_FUNCDESC_START+100)
 
-#define ANALYSIS_FUNCNAME_START             (1)
+#define ANALYSIS_FUNCNAME_START             (ANALYSIS_RESOURCE_START+2000)
 
 #define ANALYSIS_FUNCNAME_Workday           (ANALYSIS_FUNCNAME_START)
 #define ANALYSIS_FUNCNAME_Yearfrac          (ANALYSIS_FUNCNAME_START+1)
diff --git a/scaddins/source/analysis/analysis_funcnames.src b/scaddins/source/analysis/analysis_funcnames.src
index f0f568d36cee..540bf2c30207 100644
--- a/scaddins/source/analysis/analysis_funcnames.src
+++ b/scaddins/source/analysis/analysis_funcnames.src
@@ -19,514 +19,509 @@
 
 #include "analysis.hrc"
 
-Resource RID_ANALYSIS_FUNCTION_NAMES
-{
-
-    String ANALYSIS_FUNCNAME_Workday
-    {
-        Text [ en-US ] = "WORKDAY";
-    };
-
-    String ANALYSIS_FUNCNAME_Yearfrac
-    {
-        Text [ en-US ] = "YEARFRAC";
-    };
-
-    String ANALYSIS_FUNCNAME_Edate
-    {
-        Text [ en-US ] = "EDATE";
-    };
-
-    String ANALYSIS_FUNCNAME_Weeknum
-    {
-        Text [ en-US ] = "WEEKNUM";
-    };
-
-    String ANALYSIS_FUNCNAME_Eomonth
-    {
-        Text [ en-US ] = "EOMONTH";
-    };
-
-    String ANALYSIS_FUNCNAME_Networkdays
-    {
-        Text [ en-US ] = "NETWORKDAYS";
-    };
-
-    String ANALYSIS_FUNCNAME_Amordegrc
-    {
-        Text [ en-US ] = "AMORDEGRC";
-    };
-
-    String ANALYSIS_FUNCNAME_Amorlinc
-    {
-        Text [ en-US ] = "AMORLINC";
-    };
-
-    String ANALYSIS_FUNCNAME_Accrint
-    {
-        Text [ en-US ] = "ACCRINT";
-    };
-
-    String ANALYSIS_FUNCNAME_Accrintm
-    {
-        Text [ en-US ] = "ACCRINTM";
-    };
-
-    String ANALYSIS_FUNCNAME_Received
-    {
-        Text [ en-US ] = "RECEIVED";
-    };
-
-    String ANALYSIS_FUNCNAME_Disc
-    {
-        Text [ en-US ] = "DISC";
-    };
-
-    String ANALYSIS_FUNCNAME_Duration
-    {
-        Text [ en-US ] = "DURATION";
-    };
-
-    String ANALYSIS_FUNCNAME_Effect
-    {
-        Text [ en-US ] = "EFFECT";
-    };
-
-    String ANALYSIS_FUNCNAME_Cumprinc
-    {
-        Text [ en-US ] = "CUMPRINC";
-    };
-
-    String ANALYSIS_FUNCNAME_Cumipmt
-    {
-        Text [ en-US ] = "CUMIPMT";
-    };
-
-    String ANALYSIS_FUNCNAME_Price
-    {
-        Text [ en-US ] = "PRICE";
-    };
-
-    String ANALYSIS_FUNCNAME_Pricedisc
-    {
-        Text [ en-US ] = "PRICEDISC";
-    };
-
-    String ANALYSIS_FUNCNAME_Pricemat
-    {
-        Text [ en-US ] = "PRICEMAT";
-    };
-
-    String ANALYSIS_FUNCNAME_Mduration
-    {
-        Text [ en-US ] = "MDURATION";
-    };
-
-    String ANALYSIS_FUNCNAME_Nominal
-    {
-        Text [ en-US ] = "NOMINAL";
-    };
-
-    String ANALYSIS_FUNCNAME_Dollarfr
-    {
-        Text [ en-US ] = "DOLLARFR";
-    };
-
-    String ANALYSIS_FUNCNAME_Dollarde
-    {
-        Text [ en-US ] = "DOLLARDE";
-    };
-
-    String ANALYSIS_FUNCNAME_Yield
-    {
-        Text [ en-US ] = "YIELD";
-    };
-
-    String ANALYSIS_FUNCNAME_Yielddisc
-    {
-        Text [ en-US ] = "YIELDDISC";
-    };
-
-    String ANALYSIS_FUNCNAME_Yieldmat
-    {
-        Text [ en-US ] = "YIELDMAT";
-    };
-
-    String ANALYSIS_FUNCNAME_Tbilleq
-    {
-        Text [ en-US ] = "TBILLEQ";
-    };
-
-    String ANALYSIS_FUNCNAME_Tbillprice
-    {
-        Text [ en-US ] = "TBILLPRICE";
-    };
-
-    String ANALYSIS_FUNCNAME_Tbillyield
-    {
-        Text [ en-US ] = "TBILLYIELD";
-    };
-
-    String ANALYSIS_FUNCNAME_Oddfprice
-    {
-        Text [ en-US ] = "ODDFPRICE";
-    };
-
-    String ANALYSIS_FUNCNAME_Oddfyield
-    {
-        Text [ en-US ] = "ODDFYIELD";
-    };
-
-    String ANALYSIS_FUNCNAME_Oddlprice
-    {
-        Text [ en-US ] = "ODDLPRICE";
-    };
-
-    String ANALYSIS_FUNCNAME_Oddlyield
-    {
-        Text [ en-US ] = "ODDLYIELD";
-    };
-
-    String ANALYSIS_FUNCNAME_Xirr
-    {
-        Text [ en-US ] = "XIRR";
-    };
-
-    String ANALYSIS_FUNCNAME_Xnpv
-    {
-        Text [ en-US ] = "XNPV";
-    };
-
-    String ANALYSIS_FUNCNAME_Intrate
-    {
-        Text [ en-US ] = "INTRATE";
-    };
-
-    String ANALYSIS_FUNCNAME_Coupncd
-    {
-        Text [ en-US ] = "COUPNCD";
-    };
-
-    String ANALYSIS_FUNCNAME_Coupdays
-    {
-        Text [ en-US ] = "COUPDAYS";
-    };
-
-    String ANALYSIS_FUNCNAME_Coupdaysnc
-    {
-        Text [ en-US ] = "COUPDAYSNC";
-    };
-
-    String ANALYSIS_FUNCNAME_Coupdaybs
-    {
-        Text [ en-US ] = "COUPDAYBS";
-    };
-
-    String ANALYSIS_FUNCNAME_Couppcd
-    {
-        Text [ en-US ] = "COUPPCD";
-    };
-
-    String ANALYSIS_FUNCNAME_Coupnum
-    {
-        Text [ en-US ] = "COUPNUM";
-    };
-
-    String ANALYSIS_FUNCNAME_Fvschedule
-    {
-        Text [ en-US ] = "FVSCHEDULE";
-    };
-
-    String ANALYSIS_FUNCNAME_Iseven
-    {
-        Text [ en-US ] = "ISEVEN";
-    };
-
-    String ANALYSIS_FUNCNAME_Isodd
-    {
-        Text [ en-US ] = "ISODD";
-    };
-
-    String ANALYSIS_FUNCNAME_Gcd
-    {
-        Text [ en-US ] = "GCD";
-    };
-
-    String ANALYSIS_FUNCNAME_Lcm
-    {
-        Text [ en-US ] = "LCM";
-    };
-
-    String ANALYSIS_FUNCNAME_Multinomial
-    {
-        Text [ en-US ] = "MULTINOMIAL";
-    };
-
-    String ANALYSIS_FUNCNAME_Seriessum
-    {
-        Text [ en-US ] = "SERIESSUM";
-    };
-
-    String ANALYSIS_FUNCNAME_Quotient
-    {
-        Text [ en-US ] = "QUOTIENT";
-    };
-
-    String ANALYSIS_FUNCNAME_Mround
-    {
-        Text [ en-US ] = "MROUND";
-    };
-
-    String ANALYSIS_FUNCNAME_Sqrtpi
-    {
-        Text [ en-US ] = "SQRTPI";
-    };
-
-    String ANALYSIS_FUNCNAME_Randbetween
-    {
-        Text [ en-US ] = "RANDBETWEEN";
-    };
-
-    String ANALYSIS_FUNCNAME_Besseli
-    {
-        Text [ en-US ] = "BESSELI";
-    };
-
-    String ANALYSIS_FUNCNAME_Besselj
-    {
-        Text [ en-US ] = "BESSELJ";
-    };
-
-    String ANALYSIS_FUNCNAME_Besselk
-    {
-        Text [ en-US ] = "BESSELK";
-    };
-
-    String ANALYSIS_FUNCNAME_Bessely
-    {
-        Text [ en-US ] = "BESSELY";
-    };
-
-    String ANALYSIS_FUNCNAME_Bin2Dec
-    {
-        Text [ en-US ] = "BIN2DEC";
-    };
-
-    String ANALYSIS_FUNCNAME_Bin2Hex
-    {
-        Text [ en-US ] = "BIN2HEX";
-    };
-
-    String ANALYSIS_FUNCNAME_Bin2Oct
-    {
-        Text [ en-US ] = "BIN2OCT";
-    };
-
-    String ANALYSIS_FUNCNAME_Delta
-    {
-        Text [ en-US ] = "DELTA";
-    };
-
-    String ANALYSIS_FUNCNAME_Dec2Bin
-    {
-        Text [ en-US ] = "DEC2BIN";
-    };
-
-    String ANALYSIS_FUNCNAME_Dec2Hex
-    {
-        Text [ en-US ] = "DEC2HEX";
-    };
-
-    String ANALYSIS_FUNCNAME_Dec2Oct
-    {
-        Text [ en-US ] = "DEC2OCT";
-    };
-
-    String ANALYSIS_FUNCNAME_Erf
-    {
-        Text [ en-US ] = "ERF";
-    };
-
-    String ANALYSIS_FUNCNAME_Erfc
-    {
-        Text [ en-US ] = "ERFC";
-    };
-
-    String ANALYSIS_FUNCNAME_Gestep
-    {
-        Text [ en-US ] = "GESTEP";
-    };
-
-    String ANALYSIS_FUNCNAME_Hex2Bin
-    {
-        Text [ en-US ] = "HEX2BIN";
-    };
-
-    String ANALYSIS_FUNCNAME_Hex2Dec
-    {
-        Text [ en-US ] = "HEX2DEC";
-    };
-
-    String ANALYSIS_FUNCNAME_Hex2Oct
-    {
-        Text [ en-US ] = "HEX2OCT";
-    };
-
-    String ANALYSIS_FUNCNAME_Imabs
-    {
-        Text [ en-US ] = "IMABS";
-    };
-
-    String ANALYSIS_FUNCNAME_Imaginary
-    {
-        Text [ en-US ] = "IMAGINARY";
-    };
-
-    String ANALYSIS_FUNCNAME_Impower
-    {
-        Text [ en-US ] = "IMPOWER";
-    };
-
-    String ANALYSIS_FUNCNAME_Imargument
-    {
-        Text [ en-US ] = "IMARGUMENT";
-    };
-
-    String ANALYSIS_FUNCNAME_Imcos
-    {
-        Text [ en-US ] = "IMCOS";
-    };
-
-    String ANALYSIS_FUNCNAME_Imdiv
-    {
-        Text [ en-US ] = "IMDIV";
-    };
-
-    String ANALYSIS_FUNCNAME_Imexp
-    {
-        Text [ en-US ] = "IMEXP";
-    };
-
-    String ANALYSIS_FUNCNAME_Imconjugate
-    {
-        Text [ en-US ] = "IMCONJUGATE";
-    };
-
-    String ANALYSIS_FUNCNAME_Imln
-    {
-        Text [ en-US ] = "IMLN";
-    };
-
-    String ANALYSIS_FUNCNAME_Imlog10
-    {
-        Text [ en-US ] = "IMLOG10";
-    };
-
-    String ANALYSIS_FUNCNAME_Imlog2
-    {
-        Text [ en-US ] = "IMLOG2";
-    };
-
-    String ANALYSIS_FUNCNAME_Improduct
-    {
-        Text [ en-US ] = "IMPRODUCT";
-    };
-
-    String ANALYSIS_FUNCNAME_Imreal
-    {
-        Text [ en-US ] = "IMREAL";
-    };
-
-    String ANALYSIS_FUNCNAME_Imsin
-    {
-        Text [ en-US ] = "IMSIN";
-    };
-
-    String ANALYSIS_FUNCNAME_Imsub
-    {
-        Text [ en-US ] = "IMSUB";
-    };
-
-    String ANALYSIS_FUNCNAME_Imsum
-    {
-        Text [ en-US ] = "IMSUM";
-    };
-
-    String ANALYSIS_FUNCNAME_Imsqrt
-    {
-        Text [ en-US ] = "IMSQRT";
-    };
-
-    String ANALYSIS_FUNCNAME_Imtan
-    {
-        Text [ en-US ] = "IMTAN";
-    };
-
-    String ANALYSIS_FUNCNAME_Imsec
-    {
-        Text [ en-US ] = "IMSEC";
-    };
-
-    String ANALYSIS_FUNCNAME_Imcsc
-    {
-        Text [ en-US ] = "IMCSC";
-    };
-
-    String ANALYSIS_FUNCNAME_Imcot
-    {
-        Text [ en-US ] = "IMCOT";
-    };
-
-    String ANALYSIS_FUNCNAME_Imsinh
-    {
-        Text [ en-US ] = "IMSINH";
-    };
-
-    String ANALYSIS_FUNCNAME_Imcosh
-    {
-        Text [ en-US ] = "IMCOSH";
-    };
-
-    String ANALYSIS_FUNCNAME_Imsech
-    {
-        Text [ en-US ] = "IMSECH";
-    };
-
-    String ANALYSIS_FUNCNAME_Imcsch
-    {
-        Text [ en-US ] = "IMCSCH";
-    };
-
-    String ANALYSIS_FUNCNAME_Complex
-    {
-        Text [ en-US ] = "COMPLEX";
-    };
-
-    String ANALYSIS_FUNCNAME_Oct2Bin
-    {
-        Text [ en-US ] = "OCT2BIN";
-    };
-
-    String ANALYSIS_FUNCNAME_Oct2Dec
-    {
-        Text [ en-US ] = "OCT2DEC";
-    };
-
-    String ANALYSIS_FUNCNAME_Oct2Hex
-    {
-        Text [ en-US ] = "OCT2HEX";
-    };
-
-    String ANALYSIS_FUNCNAME_Convert
-    {
-        Text [ en-US ] = "CONVERT";
-    };
-
-    String ANALYSIS_FUNCNAME_Factdouble
-    {
-        Text [ en-US ] = "FACTDOUBLE";
-    };
+String ANALYSIS_FUNCNAME_Workday
+{
+    Text [ en-US ] = "WORKDAY";
+};
+
+String ANALYSIS_FUNCNAME_Yearfrac
+{
+    Text [ en-US ] = "YEARFRAC";
+};
+
+String ANALYSIS_FUNCNAME_Edate
+{
+    Text [ en-US ] = "EDATE";
+};
+
+String ANALYSIS_FUNCNAME_Weeknum
+{
+    Text [ en-US ] = "WEEKNUM";
+};
+
+String ANALYSIS_FUNCNAME_Eomonth
+{
+    Text [ en-US ] = "EOMONTH";
+};
+
+String ANALYSIS_FUNCNAME_Networkdays
+{
+    Text [ en-US ] = "NETWORKDAYS";
+};
+
+String ANALYSIS_FUNCNAME_Amordegrc
+{
+    Text [ en-US ] = "AMORDEGRC";
+};
+
+String ANALYSIS_FUNCNAME_Amorlinc
+{
+    Text [ en-US ] = "AMORLINC";
+};
+
+String ANALYSIS_FUNCNAME_Accrint
+{
+    Text [ en-US ] = "ACCRINT";
+};
+
+String ANALYSIS_FUNCNAME_Accrintm
+{
+    Text [ en-US ] = "ACCRINTM";
+};
+
+String ANALYSIS_FUNCNAME_Received
+{
+    Text [ en-US ] = "RECEIVED";
+};
+
+String ANALYSIS_FUNCNAME_Disc
+{
+    Text [ en-US ] = "DISC";
+};
+
+String ANALYSIS_FUNCNAME_Duration
+{
+    Text [ en-US ] = "DURATION";
+};
+
+String ANALYSIS_FUNCNAME_Effect
+{
+    Text [ en-US ] = "EFFECT";
+};
+
+String ANALYSIS_FUNCNAME_Cumprinc
+{
+    Text [ en-US ] = "CUMPRINC";
+};
+
+String ANALYSIS_FUNCNAME_Cumipmt
+{
+    Text [ en-US ] = "CUMIPMT";
+};
+
+String ANALYSIS_FUNCNAME_Price
+{
+    Text [ en-US ] = "PRICE";
+};
+
+String ANALYSIS_FUNCNAME_Pricedisc
+{
+    Text [ en-US ] = "PRICEDISC";
+};
+
+String ANALYSIS_FUNCNAME_Pricemat
+{
+    Text [ en-US ] = "PRICEMAT";
+};
+
+String ANALYSIS_FUNCNAME_Mduration
+{
+    Text [ en-US ] = "MDURATION";
+};
+
+String ANALYSIS_FUNCNAME_Nominal
+{
+    Text [ en-US ] = "NOMINAL";
+};
+
+String ANALYSIS_FUNCNAME_Dollarfr
+{
+    Text [ en-US ] = "DOLLARFR";
+};
+
+String ANALYSIS_FUNCNAME_Dollarde
+{
+    Text [ en-US ] = "DOLLARDE";
+};
+
+String ANALYSIS_FUNCNAME_Yield
+{
+    Text [ en-US ] = "YIELD";
+};
+
+String ANALYSIS_FUNCNAME_Yielddisc
+{
+    Text [ en-US ] = "YIELDDISC";
+};
+
+String ANALYSIS_FUNCNAME_Yieldmat
+{
+    Text [ en-US ] = "YIELDMAT";
+};
+
+String ANALYSIS_FUNCNAME_Tbilleq
+{
+    Text [ en-US ] = "TBILLEQ";
+};
+
+String ANALYSIS_FUNCNAME_Tbillprice
+{
+    Text [ en-US ] = "TBILLPRICE";
+};
+
+String ANALYSIS_FUNCNAME_Tbillyield
+{
+    Text [ en-US ] = "TBILLYIELD";
+};
+
+String ANALYSIS_FUNCNAME_Oddfprice
+{
+    Text [ en-US ] = "ODDFPRICE";
+};
+
+String ANALYSIS_FUNCNAME_Oddfyield
+{
+    Text [ en-US ] = "ODDFYIELD";
+};
+
+String ANALYSIS_FUNCNAME_Oddlprice
+{
+    Text [ en-US ] = "ODDLPRICE";
+};
+
+String ANALYSIS_FUNCNAME_Oddlyield
+{
+    Text [ en-US ] = "ODDLYIELD";
+};
+
+String ANALYSIS_FUNCNAME_Xirr
+{
+    Text [ en-US ] = "XIRR";
+};
+
+String ANALYSIS_FUNCNAME_Xnpv
+{
+    Text [ en-US ] = "XNPV";
+};
+
+String ANALYSIS_FUNCNAME_Intrate
+{
+    Text [ en-US ] = "INTRATE";
+};
+
+String ANALYSIS_FUNCNAME_Coupncd
+{
+    Text [ en-US ] = "COUPNCD";
+};
+
+String ANALYSIS_FUNCNAME_Coupdays
+{
+    Text [ en-US ] = "COUPDAYS";
+};
+
+String ANALYSIS_FUNCNAME_Coupdaysnc
+{
+    Text [ en-US ] = "COUPDAYSNC";
+};
+
+String ANALYSIS_FUNCNAME_Coupdaybs
+{
+    Text [ en-US ] = "COUPDAYBS";
+};
+
+String ANALYSIS_FUNCNAME_Couppcd
+{
+    Text [ en-US ] = "COUPPCD";
+};
+
+String ANALYSIS_FUNCNAME_Coupnum
+{
+    Text [ en-US ] = "COUPNUM";
+};
+
+String ANALYSIS_FUNCNAME_Fvschedule
+{
+    Text [ en-US ] = "FVSCHEDULE";
+};
+
+String ANALYSIS_FUNCNAME_Iseven
+{
+    Text [ en-US ] = "ISEVEN";
+};
+
+String ANALYSIS_FUNCNAME_Isodd
+{
+    Text [ en-US ] = "ISODD";
+};
+
+String ANALYSIS_FUNCNAME_Gcd
+{
+    Text [ en-US ] = "GCD";
+};
+
+String ANALYSIS_FUNCNAME_Lcm
+{
+    Text [ en-US ] = "LCM";
+};
+
+String ANALYSIS_FUNCNAME_Multinomial
+{
+    Text [ en-US ] = "MULTINOMIAL";
+};
+
+String ANALYSIS_FUNCNAME_Seriessum
+{
+    Text [ en-US ] = "SERIESSUM";
+};
+
+String ANALYSIS_FUNCNAME_Quotient
+{
+    Text [ en-US ] = "QUOTIENT";
+};
+
+String ANALYSIS_FUNCNAME_Mround
+{
+    Text [ en-US ] = "MROUND";
+};
+
+String ANALYSIS_FUNCNAME_Sqrtpi
+{
+    Text [ en-US ] = "SQRTPI";
+};
+
+String ANALYSIS_FUNCNAME_Randbetween
+{
+    Text [ en-US ] = "RANDBETWEEN";
+};
+
+String ANALYSIS_FUNCNAME_Besseli
+{
+    Text [ en-US ] = "BESSELI";
+};
+
+String ANALYSIS_FUNCNAME_Besselj
+{
+    Text [ en-US ] = "BESSELJ";
+};
+
+String ANALYSIS_FUNCNAME_Besselk
+{
+    Text [ en-US ] = "BESSELK";
+};
+
+String ANALYSIS_FUNCNAME_Bessely
+{
+    Text [ en-US ] = "BESSELY";
+};
+
+String ANALYSIS_FUNCNAME_Bin2Dec
+{
+    Text [ en-US ] = "BIN2DEC";
+};
+
+String ANALYSIS_FUNCNAME_Bin2Hex
+{
+    Text [ en-US ] = "BIN2HEX";
+};
+
+String ANALYSIS_FUNCNAME_Bin2Oct
+{
+    Text [ en-US ] = "BIN2OCT";
+};
+
+String ANALYSIS_FUNCNAME_Delta
+{
+    Text [ en-US ] = "DELTA";
+};
+
+String ANALYSIS_FUNCNAME_Dec2Bin
+{
+    Text [ en-US ] = "DEC2BIN";
+};
+
+String ANALYSIS_FUNCNAME_Dec2Hex
+{
+    Text [ en-US ] = "DEC2HEX";
+};
+
+String ANALYSIS_FUNCNAME_Dec2Oct
+{
+    Text [ en-US ] = "DEC2OCT";
+};
+
+String ANALYSIS_FUNCNAME_Erf
+{
+    Text [ en-US ] = "ERF";
+};
+
+String ANALYSIS_FUNCNAME_Erfc
+{
+    Text [ en-US ] = "ERFC";
+};
+
+String ANALYSIS_FUNCNAME_Gestep
+{
+    Text [ en-US ] = "GESTEP";
+};
+
+String ANALYSIS_FUNCNAME_Hex2Bin
+{
+    Text [ en-US ] = "HEX2BIN";
+};
+
+String ANALYSIS_FUNCNAME_Hex2Dec
+{
+    Text [ en-US ] = "HEX2DEC";
+};
+
+String ANALYSIS_FUNCNAME_Hex2Oct
+{
+    Text [ en-US ] = "HEX2OCT";
+};
+
+String ANALYSIS_FUNCNAME_Imabs
+{
+    Text [ en-US ] = "IMABS";
+};
+
+String ANALYSIS_FUNCNAME_Imaginary
+{
+    Text [ en-US ] = "IMAGINARY";
+};
+
+String ANALYSIS_FUNCNAME_Impower
+{
+    Text [ en-US ] = "IMPOWER";
+};
+
+String ANALYSIS_FUNCNAME_Imargument
+{
+    Text [ en-US ] = "IMARGUMENT";
+};
+
+String ANALYSIS_FUNCNAME_Imcos
+{
+    Text [ en-US ] = "IMCOS";
+};
+
+String ANALYSIS_FUNCNAME_Imdiv
+{
+    Text [ en-US ] = "IMDIV";
+};
+
+String ANALYSIS_FUNCNAME_Imexp
+{
+    Text [ en-US ] = "IMEXP";
+};
+
+String ANALYSIS_FUNCNAME_Imconjugate
+{
+    Text [ en-US ] = "IMCONJUGATE";
+};
+
+String ANALYSIS_FUNCNAME_Imln
+{
+    Text [ en-US ] = "IMLN";
+};
+
+String ANALYSIS_FUNCNAME_Imlog10
+{
+    Text [ en-US ] = "IMLOG10";
+};
+
+String ANALYSIS_FUNCNAME_Imlog2
+{
+    Text [ en-US ] = "IMLOG2";
+};
+
+String ANALYSIS_FUNCNAME_Improduct
+{
+    Text [ en-US ] = "IMPRODUCT";
+};
+
+String ANALYSIS_FUNCNAME_Imreal
+{
+    Text [ en-US ] = "IMREAL";
+};
+
+String ANALYSIS_FUNCNAME_Imsin
+{
+    Text [ en-US ] = "IMSIN";
+};
+
+String ANALYSIS_FUNCNAME_Imsub
+{
+    Text [ en-US ] = "IMSUB";
+};
+
+String ANALYSIS_FUNCNAME_Imsum
+{
+    Text [ en-US ] = "IMSUM";
+};
+
+String ANALYSIS_FUNCNAME_Imsqrt
+{
+    Text [ en-US ] = "IMSQRT";
+};
+
+String ANALYSIS_FUNCNAME_Imtan
+{
+    Text [ en-US ] = "IMTAN";
+};
 
+String ANALYSIS_FUNCNAME_Imsec
+{
+    Text [ en-US ] = "IMSEC";
+};
+
+String ANALYSIS_FUNCNAME_Imcsc
+{
+    Text [ en-US ] = "IMCSC";
+};
+
+String ANALYSIS_FUNCNAME_Imcot
+{
+    Text [ en-US ] = "IMCOT";
+};
+
+String ANALYSIS_FUNCNAME_Imsinh
+{
+    Text [ en-US ] = "IMSINH";
+};
+
+String ANALYSIS_FUNCNAME_Imcosh
+{
+    Text [ en-US ] = "IMCOSH";
+};
+
+String ANALYSIS_FUNCNAME_Imsech
+{
+    Text [ en-US ] = "IMSECH";
+};
+
+String ANALYSIS_FUNCNAME_Imcsch
+{
+    Text [ en-US ] = "IMCSCH";
+};
+
+String ANALYSIS_FUNCNAME_Complex
+{
+    Text [ en-US ] = "COMPLEX";
+};
+
+String ANALYSIS_FUNCNAME_Oct2Bin
+{
+    Text [ en-US ] = "OCT2BIN";
+};
+
+String ANALYSIS_FUNCNAME_Oct2Dec
+{
+    Text [ en-US ] = "OCT2DEC";
+};
+
+String ANALYSIS_FUNCNAME_Oct2Hex
+{
+    Text [ en-US ] = "OCT2HEX";
+};
+
+String ANALYSIS_FUNCNAME_Convert
+{
+    Text [ en-US ] = "CONVERT";
+};
+
+String ANALYSIS_FUNCNAME_Factdouble
+{
+    Text [ en-US ] = "FACTDOUBLE";
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx
index a5bf08d2437d..80679d867edc 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -262,24 +262,6 @@ class AnalysisResId : public ResId
                     AnalysisResId( sal_uInt16 nId, ResMgr& rResMgr );
 };
 
-
-class AnalysisRscStrLoader : public Resource
-{
-private:
-    OUString        aStr;
-public:
-    AnalysisRscStrLoader( sal_uInt16 nRsc, sal_uInt16 nStrId, ResMgr& rResMgr ) :
-        Resource( AnalysisResId( nRsc, rResMgr ) ),
-        aStr( AnalysisResId( nStrId, rResMgr ) )
-    {
-        FreeResource();
-    }
-
-    const OUString& GetString() const { return aStr; }
-
-};
-
-
 /// sorted list with unique sal_Int32 values
 class SortedIndividualInt32List final
 {