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

replace localresource of strings and keys with StringArray

Browse Source 
Change-Id: I4bbf5286384905b6201b1a04f161d50f4c9d4aef
This commit is contained in:
Caolán McNamara
2017-02-14 12:07:49 +00:00
parent dfc58d2db7
commit dd355079b8
2 changed files with 19 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,35 +37,27 @@
#include <tools/rc.hxx> #include <tools/rc.hxx>
#include <tools/resary.hxx> #include <tools/resary.hxx>
class ScaResId : public ResId class ScaResId : public ResId
{ {
public: public:
ScaResId( sal_uInt16 nResId, ResMgr& rResMgr ); ScaResId(sal_uInt16 nResId, ResMgr& rResMgr);
}; };
class ScaResStringLoader
class ScaResStringLoader : public Resource
{ {
private: private:
OUString aStr; OUString aStr;
public: public:
inline ScaResStringLoader( sal_uInt16 nResId, sal_uInt16 nStrId, ResMgr& rResMgr ); ScaResStringLoader(sal_uInt16 nResId, sal_uInt16 nStrId, ResMgr& rResMgr)
{
inline const OUString& GetString() const { return aStr; } ResStringArray aStrArray(ScaResId(nResId, rResMgr));
aStr = aStrArray.GetString(aStrArray.FindIndex(nStrId));
}
const OUString& GetString() const { return aStr; }
}; };
inline ScaResStringLoader::ScaResStringLoader( sal_uInt16 nResId, sal_uInt16 nStrId, ResMgr& rResMgr ) :
Resource( ScaResId( nResId, rResMgr ) ),
aStr( ScaResId( nStrId, rResMgr ) )
{
FreeResource();
}
class ScaResStringArrLoader : public Resource class ScaResStringArrLoader : public Resource
{ {
private: private:
@@ -84,7 +76,6 @@ inline ScaResStringArrLoader::ScaResStringArrLoader( sal_uInt16 nResId, sal_uInt
FreeResource(); FreeResource();
} }
class ScaResPublisher : public Resource class ScaResPublisher : public Resource
{ {
public: public:
@@ -94,14 +85,12 @@ public:
using Resource::FreeResource; using Resource::FreeResource;
}; };
class ScaFuncRes : public Resource class ScaFuncRes : public Resource
{ {
public: public:
ScaFuncRes( ResId& rResId, ResMgr& rResMgr, sal_uInt16 nIndex, OUString& rRet ); ScaFuncRes(ResId& rResId, ResMgr& rResMgr, sal_uInt16 nIndex, OUString& rRet);
}; };
enum class ScaCategory enum class ScaCategory
{ {
DateTime, DateTime,

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

@@ -198,39 +198,18 @@ Resource RID_DATE_FUNCTION_DESCRIPTIONS
}; };
}; };
Resource RID_DATE_FUNCTION_NAMES StringArray RID_DATE_FUNCTION_NAMES
{ {
String DATE_FUNCNAME_DiffWeeks ItemList [ en-US ] =
{ {
Text [ en-US ] = "WEEKS"; < "WEEKS" ; DATE_FUNCNAME_DiffWeeks ; >;
}; < "MONTHS" ; DATE_FUNCNAME_DiffMonths ; >;
String DATE_FUNCNAME_DiffMonths < "YEARS" ; DATE_FUNCNAME_DiffYears ; >;
{ < "ISLEAPYEAR" ; DATE_FUNCNAME_IsLeapYear ; >;
Text [ en-US ] = "MONTHS"; < "DAYSINMONTH" ; DATE_FUNCNAME_DaysInMonth ; >;
}; < "DAYSINYEAR" ; DATE_FUNCNAME_DaysInYear ; >;
String DATE_FUNCNAME_DiffYears < "WEEKSINYEAR" ; DATE_FUNCNAME_WeeksInYear ; >;
{ < "ROT13" ; DATE_FUNCNAME_Rot13 ; >;
Text [ en-US ] = "YEARS";
};
String DATE_FUNCNAME_IsLeapYear
{
Text [ en-US ] = "ISLEAPYEAR";
};
String DATE_FUNCNAME_DaysInMonth
{
Text [ en-US ] = "DAYSINMONTH";
};
String DATE_FUNCNAME_DaysInYear
{
Text [ en-US ] = "DAYSINYEAR";
};
String DATE_FUNCNAME_WeeksInYear
{
Text [ en-US ] = "WEEKSINYEAR";
};
String DATE_FUNCNAME_Rot13
{
Text [ en-US ] = "ROT13";
}; };
}; };