unwind RID_ANALYSIS_FUNCTION_NAMES local resource

Change-Id: Icaab5d3690922748bd473434dbbb1d8cc6eccd2d

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();

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)

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
 {