From 765acdf91d0c645b13f551713c187428b79db7f0 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 14 Feb 2017 14:30:38 +0000 Subject: convert DATE_FUNCDESC_* resources to StringArrays Change-Id: I13527ba3a53b7a0e913b672a5a87dae4a1556270 --- scaddins/source/datefunc/datefunc.cxx | 17 +-- scaddins/source/datefunc/datefunc.hxx | 6 -- scaddins/source/datefunc/datefunc.src | 188 ++++++++++------------------------ 3 files changed, 54 insertions(+), 157 deletions(-) (limited to 'scaddins/source/datefunc') diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx index f2e72978a374..61db3584e6df 100644 --- a/scaddins/source/datefunc/datefunc.cxx +++ b/scaddins/source/datefunc/datefunc.cxx @@ -93,13 +93,6 @@ void InitScaFuncDataList( ScaFuncDataList& rList, ResMgr& 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 uno::Reference< uno::XInterface > SAL_CALL ScaDateAddIn_CreateInstance( const uno::Reference< lang::XMultiServiceFactory >& ) @@ -196,14 +189,8 @@ void ScaDateAddIn::InitData() OUString ScaDateAddIn::GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) { - OUString aRet; - - ScaResId aResId( nResId, GetResMgr() ); - aResId.SetRT( RSC_RESOURCE ); - - ScaFuncRes aSubRes( aResId, GetResMgr(), nStrIndex, aRet ); - - return aRet; + ResStringArray aArr(ScaResId(nResId, GetResMgr())); + return aArr.GetString(nStrIndex - 1); } OUString ScaDateAddIn::getImplementationName_Static() diff --git a/scaddins/source/datefunc/datefunc.hxx b/scaddins/source/datefunc/datefunc.hxx index 43819bcb4579..d2b460851e24 100644 --- a/scaddins/source/datefunc/datefunc.hxx +++ b/scaddins/source/datefunc/datefunc.hxx @@ -43,12 +43,6 @@ public: ScaResId(sal_uInt16 nResId, ResMgr& rResMgr); }; -class ScaFuncRes : public Resource -{ -public: - ScaFuncRes(ResId& rResId, ResMgr& rResMgr, sal_uInt16 nIndex, OUString& rRet); -}; - enum class ScaCategory { DateTime, diff --git a/scaddins/source/datefunc/datefunc.src b/scaddins/source/datefunc/datefunc.src index e467ebcc4b2e..7741792436bf 100644 --- a/scaddins/source/datefunc/datefunc.src +++ b/scaddins/source/datefunc/datefunc.src @@ -19,179 +19,95 @@ #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"; - }; - String 2 // name of parameter 1 DiffWeeks - { - Text [ en-US ] = "Start date"; - }; - String 3 // description of parameter 1 DiffWeeks - { - 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."; + < "Calculates the number of weeks in a specific period"; > ; + < "Start date"; > ; + < "First day of the period"; > ; + < "End date"; > ; + < "Last day of the period"; > ; + < "Type"; > ; + < "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 - { - Text [ en-US ] = "Determines the number of months in a specific period."; - }; - String 2 // name of parameter 1 DiffMonths + ItemList [ en-US ] = { - Text [ en-US ] = "Start date"; - }; - String 3 // description of parameter 1 DiffMonths - { - Text [ en-US ] = "First day of the period."; - }; - String 4 // name of parameter 2 DiffMonths - { - 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."; + < "Determines the number of months in a specific period."; > ; + < "Start date"; > ; + < "First day of the period."; > ; + < "End date"; > ; + < "Last day of the period."; > ; + < "Type"; > ; + < "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 - { - 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 + ItemList [ en-US ] = { - Text [ en-US ] = "First day of the period"; - }; - String 4 // name of parameter 2 DiffYears - { - Text [ en-US ] = "End date"; - }; - String 5 // description of parameter 2 DiffYears - { - 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."; + < "Calculates the number of years in a specific period."; > ; + < "Start date"; > ; + < "First day of the period"; > ; + < "End date"; > ; + < "Last day of the period"; > ; + < "Type"; > ; + < "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 - { - 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 + ItemList [ en-US ] = { - Text [ en-US ] = "Date"; - }; - String 3 // description of parameter 1 IsLeapYear - { - Text [ en-US ] = "Any day in the desired year"; + < "Returns 1 (TRUE) if the date is a day of a leap year, otherwise 0 (FALSE)."; > ; + < "Date"; > ; + < "Any day in the desired year"; > ; }; }; -Resource DATE_FUNCDESC_DaysInMonth +StringArray DATE_FUNCDESC_DaysInMonth { - String 1 // description DaysInMonth - { - Text [ en-US ] = "Returns the number of days of the month in which the date entered occurs"; - }; - String 2 // name of parameter 1 DaysInMonth + ItemList [ en-US ] = { - Text [ en-US ] = "Date"; - }; - String 3 // description of parameter 1 DaysInMonth - { - Text [ en-US ] = "Any day in the desired month"; + < "Returns the number of days of the month in which the date entered occurs"; > ; + < "Date"; > ; + < "Any day in the desired month"; > ; }; }; -Resource DATE_FUNCDESC_DaysInYear +StringArray DATE_FUNCDESC_DaysInYear { - String 1 // description DaysInYear - { - Text [ en-US ] = "Returns the number of days of the year in which the date entered occurs."; - }; - String 2 // name of parameter 1 DaysInYear + ItemList [ en-US ] = { - Text [ en-US ] = "Date"; - }; - String 3 // description of parameter 1 DaysInYear - { - Text [ en-US ] = "Any day in the desired year"; + < "Returns the number of days of the year in which the date entered occurs."; > ; + < "Date"; > ; + < "Any day in the desired year"; > ; }; }; -Resource DATE_FUNCDESC_WeeksInYear +StringArray DATE_FUNCDESC_WeeksInYear { - String 1 // description WeeksInYear - { - 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 + ItemList [ en-US ] = { - 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 - { - 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 + ItemList [ en-US ] = { - 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"; > ; }; }; -- cgit