mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unwind RID_ANALYSIS_DEFFUNCTION_NAMES local resource

Browse Source 
Change-Id: I65ce69460b6c5f73fd41345f55630d0fcf5c04a4
This commit is contained in:
Caolán McNamara
2017-02-14 16:26:11 +00:00
parent 288ca353a8
commit 5401ccd65d
3 changed files with 610 additions and 633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scaddins/source/analysis/analysis.hrc
View File

@@ -21,8 +21,6 @@
#define ANALYSIS_RESOURCE_START 1000 #define ANALYSIS_RESOURCE_START 1000
#define RID_ANALYSIS_DEFFUNCTION_NAMES (ANALYSIS_RESOURCE_START+3000)
#define ANALYSIS_FUNCDESC_START (ANALYSIS_RESOURCE_START) #define ANALYSIS_FUNCDESC_START (ANALYSIS_RESOURCE_START)
#define ANALYSIS_Workday (ANALYSIS_FUNCDESC_START) #define ANALYSIS_Workday (ANALYSIS_FUNCDESC_START)
@@ -231,7 +229,7 @@
#define ANALYSIS_FUNCNAME_Imsech (ANALYSIS_FUNCNAME_START+99) #define ANALYSIS_FUNCNAME_Imsech (ANALYSIS_FUNCNAME_START+99)
#define ANALYSIS_FUNCNAME_Imcsch (ANALYSIS_FUNCNAME_START+100) #define ANALYSIS_FUNCNAME_Imcsch (ANALYSIS_FUNCNAME_START+100)
#define ANALYSIS_DEFFUNCNAME_START (RID_ANALYSIS_DEFFUNCTION_NAMES+1) #define ANALYSIS_DEFFUNCNAME_START (ANALYSIS_RESOURCE_START+3000)
#define ANALYSIS_DEFFUNCNAME_Workday (ANALYSIS_DEFFUNCNAME_START) #define ANALYSIS_DEFFUNCNAME_Workday (ANALYSIS_DEFFUNCNAME_START)
#define ANALYSIS_DEFFUNCNAME_Yearfrac (ANALYSIS_DEFFUNCNAME_START+1) #define ANALYSIS_DEFFUNCNAME_Yearfrac (ANALYSIS_DEFFUNCNAME_START+1)

4
scaddins/source/analysis/analysis_deffuncnames.src
View File

@@ -19,9 +19,6 @@
#include "analysis.hrc" #include "analysis.hrc"
Resource RID_ANALYSIS_DEFFUNCTION_NAMES
{
StringArray ANALYSIS_DEFFUNCNAME_Workday StringArray ANALYSIS_DEFFUNCNAME_Workday
{ {
ItemList = ItemList =
@@ -930,6 +927,5 @@ Resource RID_ANALYSIS_DEFFUNCTION_NAMES
< "FACTDOUBLE"; >; < "FACTDOUBLE"; >;
}; };
}; };
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

25
scaddins/source/analysis/analysishelper.cxx
View File

@@ -1372,22 +1372,6 @@ double GetCoupnum( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_I
return static_cast< double >( nMonths * nFreq / 12 ); return static_cast< double >( nMonths * nFreq / 12 );
} }
class AnalysisRscStrArrLoader : public Resource
{
private:
ResStringArray aStrArray;
public:
AnalysisRscStrArrLoader( sal_uInt16 nRsc, sal_uInt16 nArrayId, ResMgr& rResMgr ) :
Resource( AnalysisResId( nRsc, rResMgr ) ),
aStrArray( AnalysisResId( nArrayId, rResMgr ) )
{
FreeResource();
}
const ResStringArray& GetStringArray() const { return aStrArray; }
};
FuncData::FuncData( const FuncDataBase& r, ResMgr& rResMgr ) : FuncData::FuncData( const FuncDataBase& r, ResMgr& rResMgr ) :
aIntName( OUString::createFromAscii( r.pIntName ) ), aIntName( OUString::createFromAscii( r.pIntName ) ),
nUINameID( r.nUINameID ), nUINameID( r.nUINameID ),
@@ -1400,14 +1384,13 @@ FuncData::FuncData( const FuncDataBase& r, ResMgr& rResMgr ) :
if (r.pSuffix) if (r.pSuffix)
aSuffix = OUString::createFromAscii( r.pSuffix); aSuffix = OUString::createFromAscii( r.pSuffix);
AnalysisRscStrArrLoader aArrLoader(RID_ANALYSIS_DEFFUNCTION_NAMES, r.nCompListID, rResMgr); ResStringArray aArr(AnalysisResId(r.nCompListID, rResMgr));
const ResStringArray& rArr = aArrLoader.GetStringArray();
sal_uInt16 nCount = sal::static_int_cast<sal_uInt16>( rArr.Count() ); sal_uInt32 nCount = aArr.Count();
aCompList.resize(nCount); aCompList.resize(nCount);
for( sal_uInt16 n = 0 ; n < nCount ; n++ ) for(sal_uInt32 n = 0 ; n < nCount; ++n)
aCompList[n] = rArr.GetString( n ); aCompList[n] = aArr.GetString( n );
} }
FuncData::~FuncData() FuncData::~FuncData()