unwind RID_PRICING_FUNCTION_DESCRIPTIONS local resource

Change-Id: Ib171e111c330241fb93edf1f2f39933eadc4adea

scaddins/source/pricing/pricing.cxx

@@ -215,14 +215,11 @@ OUString ScaPricingAddIn::GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrInd
 {
     OUString aRet;
 
-    ScaResPublisher aResPubl( ScaResId( RID_PRICING_FUNCTION_DESCRIPTIONS, GetResMgr() ) );
     ScaResId aResId( nResId, GetResMgr() );
     aResId.SetRT( RSC_RESOURCE );
 
-    if( aResPubl.IsAvailableRes( aResId ) )
     ScaFuncRes aSubRes( aResId, GetResMgr(), nStrIndex, aRet );
 
-    aResPubl.FreeResource();
     return aRet;
 }
 

scaddins/source/pricing/pricing.hrc

@@ -22,9 +22,7 @@
 
 #define PRICING_RESOURCE_START                 1000
 
-#define RID_PRICING_FUNCTION_DESCRIPTIONS  PRICING_RESOURCE_START
-
-#define PRICING_FUNCDESC_START             (RID_PRICING_FUNCTION_DESCRIPTIONS+1)
+#define PRICING_FUNCDESC_START             PRICING_RESOURCE_START
 
 #define PRICING_FUNCDESC_OptBarrier        (PRICING_FUNCDESC_START)
 #define PRICING_FUNCDESC_OptTouch          (PRICING_FUNCDESC_START+1)

scaddins/source/pricing/pricing.hxx

@@ -53,15 +53,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:

scaddins/source/pricing/pricing.src

@@ -20,10 +20,8 @@
 #include "pricing.hrc"
 
 // function and parameter description
-Resource RID_PRICING_FUNCTION_DESCRIPTIONS
+Resource PRICING_FUNCDESC_OptBarrier
 {
-    Resource PRICING_FUNCDESC_OptBarrier
-    {
     String 1    // description
     {
         Text [ en-US ] = "Pricing of a barrier option";
@@ -145,10 +143,10 @@ Resource RID_PRICING_FUNCTION_DESCRIPTIONS
     {
         Text [ en-US ] = "Optional parameter, if left out then the function simply returns the option price; if set, the function returns price sensitivities (Greeks) to one of the input parameters; possible values are (d)elta, (g)amma, (t)heta, v(e)ga, v(o)lga, v(a)nna, (r)ho, rho(f)";
     };
-    };
+};
 
-    Resource PRICING_FUNCDESC_OptTouch
-    {
+Resource PRICING_FUNCDESC_OptTouch
+{
     String 1    // description
     {
         Text [ en-US ] = "Pricing of a touch/no-touch option";
@@ -252,10 +250,10 @@ Resource RID_PRICING_FUNCTION_DESCRIPTIONS
     {
         Text [ en-US ] = "Optional parameter, if left out then the function simply returns the option price; if set, the function returns price sensitivities (Greeks) to one of the input parameters; possible values are (d)elta, (g)amma, (t)heta, v(e)ga, v(o)lga, v(a)nna, (r)ho, rho(f)";
     };
-    };
+};
 
-    Resource PRICING_FUNCDESC_OptProbHit
-    {
+Resource PRICING_FUNCDESC_OptProbHit
+{
     String 1    // description
     {
         Text [ en-US ] = "Probability that an asset hits a barrier assuming it follows dS/S = mu dt + vol dW";
@@ -314,10 +312,10 @@ Resource RID_PRICING_FUNCTION_DESCRIPTIONS
     {
         Text [ en-US ] = "Upper barrier (set to 0 for no upper barrier)";
     };
-    };
+};
 
-    Resource PRICING_FUNCDESC_OptProbInMoney
-    {
+Resource PRICING_FUNCDESC_OptProbInMoney
+{
     String 1    // description
     {
         Text [ en-US ] = "Probability that an asset will at maturity end up between two barrier levels, assuming it follows dS/S = mu dt + vol dW (if the last two optional parameters (strike, put/call) are specified, the probability of S_T in [strike, upper barrier] for a call and S_T in [lower barrier, strike] for a put will be returned)";
@@ -394,8 +392,6 @@ Resource RID_PRICING_FUNCTION_DESCRIPTIONS
     {
         Text [ en-US ] = "Optional strike level";
     };
-    };
-
 };
 
 // function names as accessible from cells