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

unwind RID_DATE_DEFFUNCTION_NAMES local resource

Browse Source 
Change-Id: I99ac46b89d2158d420e6458055cdeb5c6421f1ac
This commit is contained in:
Caolán McNamara
2017-02-14 13:23:57 +00:00
parent 2141a4e073
commit c4bce0078e
4 changed files with 50 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scaddins/source/datefunc/datefunc.cxx
View File

@@ -70,11 +70,9 @@ ScaFuncData::ScaFuncData( const ScaFuncDataBase& rBaseData, ResMgr& rResMgr ) :
bDouble( rBaseData.bDouble ), bDouble( rBaseData.bDouble ),
bWithOpt( rBaseData.bWithOpt ) bWithOpt( rBaseData.bWithOpt )
{ {
ScaResStringArrLoader aArrLoader(RID_DATE_DEFFUNCTION_NAMES, rBaseData.nCompListID, rResMgr); ResStringArray aArr(ScaResId(rBaseData.nCompListID, rResMgr));
const ResStringArray& rArr = aArrLoader.GetStringArray(); for (sal_uInt32 nIndex = 0; nIndex < aArr.Count(); ++nIndex)
aCompList.push_back(aArr.GetString(nIndex));
for( sal_uInt32 nIndex = 0; nIndex < rArr.Count(); nIndex++ )
aCompList.push_back( rArr.GetString( nIndex ) );
} }
ScaFuncData::~ScaFuncData() ScaFuncData::~ScaFuncData()

3
scaddins/source/datefunc/datefunc.hrc
View File

@@ -24,7 +24,6 @@
#define RID_DATE_FUNCTION_DESCRIPTIONS DATE_RESOURCE_START #define RID_DATE_FUNCTION_DESCRIPTIONS DATE_RESOURCE_START
#define RID_DATE_FUNCTION_NAMES (DATE_RESOURCE_START+1000) #define RID_DATE_FUNCTION_NAMES (DATE_RESOURCE_START+1000)
#define RID_DATE_DEFFUNCTION_NAMES (DATE_RESOURCE_START+2000)
#define DATE_FUNCDESC_START (RID_DATE_FUNCTION_DESCRIPTIONS+1) #define DATE_FUNCDESC_START (RID_DATE_FUNCTION_DESCRIPTIONS+1)
@@ -48,7 +47,7 @@
#define DATE_FUNCNAME_WeeksInYear (DATE_FUNCNAME_START+6) #define DATE_FUNCNAME_WeeksInYear (DATE_FUNCNAME_START+6)
#define DATE_FUNCNAME_Rot13 (DATE_FUNCNAME_START+7) #define DATE_FUNCNAME_Rot13 (DATE_FUNCNAME_START+7)
#define DATE_DEFFUNCNAME_START (RID_DATE_DEFFUNCTION_NAMES+1) #define DATE_DEFFUNCNAME_START (DATE_RESOURCE_START+2000)
#define DATE_DEFFUNCNAME_DiffWeeks (DATE_DEFFUNCNAME_START) #define DATE_DEFFUNCNAME_DiffWeeks (DATE_DEFFUNCNAME_START)
#define DATE_DEFFUNCNAME_DiffMonths (DATE_DEFFUNCNAME_START+1) #define DATE_DEFFUNCNAME_DiffMonths (DATE_DEFFUNCNAME_START+1)

18
scaddins/source/datefunc/datefunc.hxx
View File

@@ -58,24 +58,6 @@ public:
const OUString& GetString() const { return aStr; } const OUString& GetString() const { return aStr; }
}; };
class ScaResStringArrLoader : public Resource
{
private:
ResStringArray aStrArray;
public:
inline ScaResStringArrLoader( sal_uInt16 nResId, sal_uInt16 nArrayId, ResMgr& rResMgr );
inline const ResStringArray& GetStringArray() const { return aStrArray; }
};
inline ScaResStringArrLoader::ScaResStringArrLoader( sal_uInt16 nResId, sal_uInt16 nArrayId, ResMgr& rResMgr ) :
Resource( ScaResId( nResId, rResMgr ) ),
aStrArray( ScaResId( nArrayId, rResMgr ) )
{
FreeResource();
}
class ScaResPublisher : public Resource class ScaResPublisher : public Resource
{ {
public: public:

96
scaddins/source/datefunc/datefunc.src
View File

@@ -213,72 +213,68 @@ StringArray RID_DATE_FUNCTION_NAMES
}; };
}; };
Resource RID_DATE_DEFFUNCTION_NAMES StringArray DATE_DEFFUNCNAME_DiffWeeks
{ {
ItemList =
StringArray DATE_DEFFUNCNAME_DiffWeeks
{ {
ItemList = < "WOCHEN"; >;
{ < "WEEKS"; >;
< "WOCHEN"; >;
< "WEEKS"; >;
};
}; };
StringArray DATE_DEFFUNCNAME_DiffMonths };
StringArray DATE_DEFFUNCNAME_DiffMonths
{
ItemList =
{ {
ItemList = < "MONATE"; >;
{ < "MONTHS"; >;
< "MONATE"; >;
< "MONTHS"; >;
};
}; };
StringArray DATE_DEFFUNCNAME_DiffYears };
StringArray DATE_DEFFUNCNAME_DiffYears
{
ItemList =
{ {
ItemList = < "JAHRE"; >;
{ < "YEARS"; >;
< "JAHRE"; >;
< "YEARS"; >;
};
}; };
StringArray DATE_DEFFUNCNAME_IsLeapYear };
StringArray DATE_DEFFUNCNAME_IsLeapYear
{
ItemList =
{ {
ItemList = < "ISTSCHALTJAHR"; >;
{ < "ISLEAPYEAR"; >;
< "ISTSCHALTJAHR"; >;
< "ISLEAPYEAR"; >;
};
}; };
StringArray DATE_DEFFUNCNAME_DaysInMonth };
StringArray DATE_DEFFUNCNAME_DaysInMonth
{
ItemList =
{ {
ItemList = < "TAGEIMMONAT"; >;
{ < "DAYSINMONTH"; >;
< "TAGEIMMONAT"; >;
< "DAYSINMONTH"; >;
};
}; };
StringArray DATE_DEFFUNCNAME_DaysInYear };
StringArray DATE_DEFFUNCNAME_DaysInYear
{
ItemList =
{ {
ItemList = < "TAGEIMJAHR"; >;
{ < "DAYSINYEAR"; >;
< "TAGEIMJAHR"; >;
< "DAYSINYEAR"; >;
};
}; };
StringArray DATE_DEFFUNCNAME_WeeksInYear };
StringArray DATE_DEFFUNCNAME_WeeksInYear
{
ItemList =
{ {
ItemList = < "WOCHENIMJAHR"; >;
{ < "WEEKSINYEAR"; >;
< "WOCHENIMJAHR"; >;
< "WEEKSINYEAR"; >;
};
}; };
StringArray DATE_DEFFUNCNAME_Rot13 };
StringArray DATE_DEFFUNCNAME_Rot13
{
ItemList =
{ {
ItemList = < "ROT13"; >;
{ < "ROT13"; >;
< "ROT13"; >;
< "ROT13"; >;
};
}; };
}; };