Kaydet (Commit) 765acdf9 authored tarafından Caolán McNamara's avatar Caolán McNamara

convert DATE_FUNCDESC_* resources to StringArrays

Change-Id: I13527ba3a53b7a0e913b672a5a87dae4a1556270
üst 3ff163ae
...@@ -93,13 +93,6 @@ void InitScaFuncDataList( ScaFuncDataList& rList, ResMgr& rResMgr ) ...@@ -93,13 +93,6 @@ void InitScaFuncDataList( ScaFuncDataList& rList, ResMgr& rResMgr )
rList.push_back( ScaFuncData( nIndex, rResMgr ) ); rList.push_back( ScaFuncData( nIndex, rResMgr ) );
} }
ScaFuncRes::ScaFuncRes( ResId& rResId, ResMgr& rResMgr, sal_uInt16 nIndex, OUString& rRet ) :
Resource( rResId )
{
rRet = ScaResId(nIndex, rResMgr).toString();
FreeResource();
}
// entry points for service registration / instantiation // entry points for service registration / instantiation
uno::Reference< uno::XInterface > SAL_CALL ScaDateAddIn_CreateInstance( uno::Reference< uno::XInterface > SAL_CALL ScaDateAddIn_CreateInstance(
const uno::Reference< lang::XMultiServiceFactory >& ) const uno::Reference< lang::XMultiServiceFactory >& )
...@@ -196,14 +189,8 @@ void ScaDateAddIn::InitData() ...@@ -196,14 +189,8 @@ void ScaDateAddIn::InitData()
OUString ScaDateAddIn::GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) OUString ScaDateAddIn::GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex )
{ {
OUString aRet; ResStringArray aArr(ScaResId(nResId, GetResMgr()));
return aArr.GetString(nStrIndex - 1);
ScaResId aResId( nResId, GetResMgr() );
aResId.SetRT( RSC_RESOURCE );
ScaFuncRes aSubRes( aResId, GetResMgr(), nStrIndex, aRet );
return aRet;
} }
OUString ScaDateAddIn::getImplementationName_Static() OUString ScaDateAddIn::getImplementationName_Static()
......
...@@ -43,12 +43,6 @@ public: ...@@ -43,12 +43,6 @@ public:
ScaResId(sal_uInt16 nResId, ResMgr& rResMgr); ScaResId(sal_uInt16 nResId, ResMgr& rResMgr);
}; };
class ScaFuncRes : public Resource
{
public:
ScaFuncRes(ResId& rResId, ResMgr& rResMgr, sal_uInt16 nIndex, OUString& rRet);
};
enum class ScaCategory enum class ScaCategory
{ {
DateTime, DateTime,
......
...@@ -19,179 +19,95 @@ ...@@ -19,179 +19,95 @@
#include "datefunc.hrc" #include "datefunc.hrc"
Resource DATE_FUNCDESC_DiffWeeks StringArray DATE_FUNCDESC_DiffWeeks
{ {
String 1 // description DiffWeeks ItemList [ en-US ] =
{ {
Text [ en-US ] = "Calculates the number of weeks in a specific period"; < "Calculates the number of weeks in a specific period"; > ;
}; < "Start date"; > ;
String 2 // name of parameter 1 DiffWeeks < "First day of the period"; > ;
{ < "End date"; > ;
Text [ en-US ] = "Start date"; < "Last day of the period"; > ;
}; < "Type"; > ;
String 3 // description of parameter 1 DiffWeeks < "Type of calculation: Type=0 means the time interval, Type=1 means calendar weeks."; > ;
{
Text [ en-US ] = "First day of the period";
};
String 4 // name of parameter 2 DiffWeeks
{
Text [ en-US ] = "End date";
};
String 5 // description of parameter 2 DiffWeeks
{
Text [ en-US ] = "Last day of the period";
};
String 6 // name of parameter 3 DiffWeeks
{
Text [ en-US ] = "Type";
};
String 7 // description of parameter 3 DiffWeeks
{
Text [ en-US ] = "Type of calculation: Type=0 means the time interval, Type=1 means calendar weeks.";
}; };
}; };
Resource DATE_FUNCDESC_DiffMonths StringArray DATE_FUNCDESC_DiffMonths
{ {
String 1 // description DiffMonths ItemList [ en-US ] =
{
Text [ en-US ] = "Determines the number of months in a specific period.";
};
String 2 // name of parameter 1 DiffMonths
{ {
Text [ en-US ] = "Start date"; < "Determines the number of months in a specific period."; > ;
}; < "Start date"; > ;
String 3 // description of parameter 1 DiffMonths < "First day of the period."; > ;
{ < "End date"; > ;
Text [ en-US ] = "First day of the period."; < "Last day of the period."; > ;
}; < "Type"; > ;
String 4 // name of parameter 2 DiffMonths < "Type of calculation: Type=0 means the time interval, Type=1 means calendar months."; > ;
{
Text [ en-US ] = "End date";
};
String 5 // description of parameter 2 DiffMonths
{
Text [ en-US ] = "Last day of the period.";
};
String 6 // name of parameter 3 DiffMonths
{
Text [ en-US ] = "Type";
};
String 7 // description of parameter 3 DiffMonths
{
Text [ en-US ] = "Type of calculation: Type=0 means the time interval, Type=1 means calendar months.";
}; };
}; };
Resource DATE_FUNCDESC_DiffYears StringArray DATE_FUNCDESC_DiffYears
{ {
String 1 // description DiffYears ItemList [ en-US ] =
{
Text [ en-US ] = "Calculates the number of years in a specific period.";
};
String 2 // name of parameter 1 DiffYears
{
Text [ en-US ] = "Start date";
};
String 3 // description of parameter 1 DiffYears
{ {
Text [ en-US ] = "First day of the period"; < "Calculates the number of years in a specific period."; > ;
}; < "Start date"; > ;
String 4 // name of parameter 2 DiffYears < "First day of the period"; > ;
{ < "End date"; > ;
Text [ en-US ] = "End date"; < "Last day of the period"; > ;
}; < "Type"; > ;
String 5 // description of parameter 2 DiffYears < "Type of calculation: Type=0 means the time interval, Type=1 means calendar years."; > ;
{
Text [ en-US ] = "Last day of the period";
};
String 6 // name of parameter 3 DiffYears
{
Text [ en-US ] = "Type";
};
String 7 // description of parameter 3 DiffYears
{
Text [ en-US ] = "Type of calculation: Type=0 means the time interval, Type=1 means calendar years.";
}; };
}; };
Resource DATE_FUNCDESC_IsLeapYear StringArray DATE_FUNCDESC_IsLeapYear
{ {
String 1 // description IsLeapYear ItemList [ en-US ] =
{
Text [ en-US ] = "Returns 1 (TRUE) if the date is a day of a leap year, otherwise 0 (FALSE).";
};
String 2 // name of parameter 1 IsLeapYear
{ {
Text [ en-US ] = "Date"; < "Returns 1 (TRUE) if the date is a day of a leap year, otherwise 0 (FALSE)."; > ;
}; < "Date"; > ;
String 3 // description of parameter 1 IsLeapYear < "Any day in the desired year"; > ;
{
Text [ en-US ] = "Any day in the desired year";
}; };
}; };
Resource DATE_FUNCDESC_DaysInMonth StringArray DATE_FUNCDESC_DaysInMonth
{ {
String 1 // description DaysInMonth ItemList [ en-US ] =
{
Text [ en-US ] = "Returns the number of days of the month in which the date entered occurs";
};
String 2 // name of parameter 1 DaysInMonth
{ {
Text [ en-US ] = "Date"; < "Returns the number of days of the month in which the date entered occurs"; > ;
}; < "Date"; > ;
String 3 // description of parameter 1 DaysInMonth < "Any day in the desired month"; > ;
{
Text [ en-US ] = "Any day in the desired month";
}; };
}; };
Resource DATE_FUNCDESC_DaysInYear StringArray DATE_FUNCDESC_DaysInYear
{ {
String 1 // description DaysInYear ItemList [ en-US ] =
{
Text [ en-US ] = "Returns the number of days of the year in which the date entered occurs.";
};
String 2 // name of parameter 1 DaysInYear
{ {
Text [ en-US ] = "Date"; < "Returns the number of days of the year in which the date entered occurs."; > ;
}; < "Date"; > ;
String 3 // description of parameter 1 DaysInYear < "Any day in the desired year"; > ;
{
Text [ en-US ] = "Any day in the desired year";
}; };
}; };
Resource DATE_FUNCDESC_WeeksInYear StringArray DATE_FUNCDESC_WeeksInYear
{ {
String 1 // description WeeksInYear ItemList [ en-US ] =
{
Text [ en-US ] = "Returns the number of weeks of the year in which the date entered occurs";
};
String 2 // name of parameter 1 WeeksInYear
{
Text [ en-US ] = "Date";
};
String 3 // description of parameter 1 WeeksInYear
{ {
Text [ en-US ] = "Any day in the desired year"; < "Returns the number of weeks of the year in which the date entered occurs"; > ;
< "Date"; > ;
< "Any day in the desired year"; > ;
}; };
}; };
Resource DATE_FUNCDESC_Rot13 StringArray DATE_FUNCDESC_Rot13
{ {
String 1 // description Rot13 ItemList [ en-US ] =
{
Text [ en-US ] = "Encrypts or decrypts a text using the ROT13 algorithm";
};
String 2 // name of parameter 1 Rot13
{
Text [ en-US ] = "Text";
};
String 3 // description of parameter 1 Rot13
{ {
Text [ en-US ] = "Text to be encrypted or text already encrypted"; < "Encrypts or decrypts a text using the ROT13 algorithm"; > ;
< "Text"; > ;
< "Text to be encrypted or text already encrypted"; > ;
}; };
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment