unwind RID_DATE_FUNCTION_DESCRIPTIONS local resource

Change-Id: If769264721850397c3c243c976c64c49fddf64fb

4 files changed, 160 insertions, 177 deletions

diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx
index 1a3e58cd6d6a..f2e72978a374 100644
--- a/scaddins/source/datefunc/datefunc.cxx
+++ b/scaddins/source/datefunc/datefunc.cxx
@@ -198,14 +198,11 @@ OUString ScaDateAddIn::GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex
 {
     OUString aRet;
 
-    ScaResPublisher aResPubl( ScaResId( RID_DATE_FUNCTION_DESCRIPTIONS, GetResMgr() ) );
     ScaResId aResId( nResId, GetResMgr() );
     aResId.SetRT( RSC_RESOURCE );
 
-    if( aResPubl.IsAvailableRes( aResId ) )
-        ScaFuncRes aSubRes( aResId, GetResMgr(), nStrIndex, aRet );
+    ScaFuncRes aSubRes( aResId, GetResMgr(), nStrIndex, aRet );
 
-    aResPubl.FreeResource();
     return aRet;
 }
 
diff --git a/scaddins/source/datefunc/datefunc.hrc b/scaddins/source/datefunc/datefunc.hrc
index 9cc62da6d0fb..3830db4eaec9 100644
--- a/scaddins/source/datefunc/datefunc.hrc
+++ b/scaddins/source/datefunc/datefunc.hrc
@@ -22,9 +22,7 @@
 
 #define DATE_RESOURCE_START                 1000
 
-#define RID_DATE_FUNCTION_DESCRIPTIONS      DATE_RESOURCE_START
-
-#define DATE_FUNCDESC_START                 (RID_DATE_FUNCTION_DESCRIPTIONS+1)
+#define DATE_FUNCDESC_START                 DATE_RESOURCE_START
 
 #define DATE_FUNCDESC_DiffWeeks             (DATE_FUNCDESC_START)
 #define DATE_FUNCDESC_DiffMonths            (DATE_FUNCDESC_START+1)
diff --git a/scaddins/source/datefunc/datefunc.hxx b/scaddins/source/datefunc/datefunc.hxx
index f842b9274f41..43819bcb4579 100644
--- a/scaddins/source/datefunc/datefunc.hxx
+++ b/scaddins/source/datefunc/datefunc.hxx
@@ -43,15 +43,6 @@ public:
     ScaResId(sal_uInt16 nResId, ResMgr& rResMgr);
 };
 
-class ScaResPublisher : public Resource
-{
-public:
-    explicit ScaResPublisher( const ScaResId& rResId ) : Resource( rResId ) {}
-
-    using Resource::IsAvailableRes;
-    using Resource::FreeResource;
-};
-
 class ScaFuncRes : public Resource
 {
 public:
diff --git a/scaddins/source/datefunc/datefunc.src b/scaddins/source/datefunc/datefunc.src
index 939b4465850e..e467ebcc4b2e 100644
--- a/scaddins/source/datefunc/datefunc.src
+++ b/scaddins/source/datefunc/datefunc.src
@@ -19,182 +19,179 @@
 
 #include "datefunc.hrc"
 
-Resource RID_DATE_FUNCTION_DESCRIPTIONS
+Resource DATE_FUNCDESC_DiffWeeks
 {
-    Resource DATE_FUNCDESC_DiffWeeks
-    {
-        String 1    // description              DiffWeeks
-        {
-            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.";
-        };
+    String 1    // description              DiffWeeks
+    {
+        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.";
     };
+};
 
-    Resource 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
-        {
-            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.";
-        };
+Resource 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
+    {
+        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.";
+    };
+};
 
-    Resource 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
-        {
-            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.";
-        };
+Resource 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
+    {
+        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.";
+    };
+};
 
-    Resource 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
-        {
-            Text [ en-US ] = "Date";
-        };
-        String 3 // description of parameter 1  IsLeapYear
-        {
-            Text [ en-US ] = "Any day in the desired year";
-        };
+Resource 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
+    {
+        Text [ en-US ] = "Date";
+    };
+    String 3 // description of parameter 1  IsLeapYear
+    {
+        Text [ en-US ] = "Any day in the desired year";
     };
+};
 
-    Resource 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
-        {
-            Text [ en-US ] = "Date";
-        };
-        String 3 // description of parameter 1  DaysInMonth
-        {
-            Text [ en-US ] = "Any day in the desired month";
-        };
+Resource 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
+    {
+        Text [ en-US ] = "Date";
+    };
+    String 3 // description of parameter 1  DaysInMonth
+    {
+        Text [ en-US ] = "Any day in the desired month";
     };
+};
 
-    Resource 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
-        {
-            Text [ en-US ] = "Date";
-        };
-        String 3 // description of parameter 1  DaysInYear
-        {
-            Text [ en-US ] = "Any day in the desired year";
-        };
+Resource 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
+    {
+        Text [ en-US ] = "Date";
+    };
+    String 3 // description of parameter 1  DaysInYear
+    {
+        Text [ en-US ] = "Any day in the desired year";
     };
+};
 
-    Resource 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
-        {
-            Text [ en-US ] = "Any day in the desired year";
-        };
+Resource 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
+    {
+        Text [ en-US ] = "Any day in the desired year";
+    };
+};
 
-    Resource 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
-        {
-            Text [ en-US ] = "Text to be encrypted or text already encrypted";
-        };
+Resource 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
+    {
+        Text [ en-US ] = "Text to be encrypted or text already encrypted";
     };
 };