remove more STR_FROM_ANSI macro

Change-Id: I0957d1162c7b5bf8f52c7a79aaced667961d40a3

scaddins/source/pricing/pricing.cxx

@@ -44,8 +44,6 @@ using namespace sca::pricing;
 #define MY_SERVICE              "com.sun.star.sheet.addin.PricingFunctions"
 #define MY_IMPLNAME             "com.sun.star.sheet.addin.PricingFunctionsImpl"
 
-#define STR_FROM_ANSI( s )      OUString( s, strlen( s ), RTL_TEXTENCODING_MS_1252 )
-
 ScaResId::ScaResId( sal_uInt16 nId, ResMgr& rResMgr ) :
     ResId( nId, rResMgr )
 {
@@ -299,11 +297,11 @@ OUString SAL_CALL ScaPricingAddIn::getDisplayFunctionName( const OUString& aProg
     {
         aRet = ScaResStringLoader( RID_PRICING_FUNCTION_NAMES, fDataIt->GetUINameID(), GetResMgr() ).GetString();
         if( fDataIt->IsDouble() )
-            aRet += STR_FROM_ANSI( "_ADD" );
+            aRet += "_ADD";
     }
     else
     {
-        aRet = STR_FROM_ANSI( "UNKNOWNFUNC_" );
+        aRet = "UNKNOWNFUNC_";
         aRet += aProgrammaticName;
     }
 
@@ -335,7 +333,7 @@ OUString SAL_CALL ScaPricingAddIn::getDisplayArgumentName(
         if( nStr )
             aRet = GetFuncDescrStr( fDataIt->GetDescrID(), nStr );
         else
-            aRet = STR_FROM_ANSI( "internal" );
+            aRet = "internal";
     }
 
     return aRet;
@@ -354,7 +352,7 @@ OUString SAL_CALL ScaPricingAddIn::getArgumentDescription(
         if( nStr )
             aRet = GetFuncDescrStr( fDataIt->GetDescrID(), nStr + 1 );
         else
-            aRet = STR_FROM_ANSI( "for internal use only" );
+            aRet = "for internal use only";
     }
 
     return aRet;
@@ -371,17 +369,17 @@ OUString SAL_CALL ScaPricingAddIn::getProgrammaticCategoryName(
     {
         switch( fDataIt->GetCategory() )
         {
-            case ScaCategory::DateTime:   aRet = STR_FROM_ANSI( "Date&Time" );    break;
-            case ScaCategory::Text:       aRet = STR_FROM_ANSI( "Text" );         break;
-            case ScaCategory::Finance:    aRet = STR_FROM_ANSI( "Financial" );    break;
-            case ScaCategory::Inf:        aRet = STR_FROM_ANSI( "Information" );  break;
-            case ScaCategory::Math:       aRet = STR_FROM_ANSI( "Mathematical" ); break;
-            case ScaCategory::Tech:       aRet = STR_FROM_ANSI( "Technical" );    break;
+            case ScaCategory::DateTime:   aRet = "Date&Time";    break;
+            case ScaCategory::Text:       aRet = "Text";         break;
+            case ScaCategory::Finance:    aRet = "Financial";    break;
+            case ScaCategory::Inf:        aRet = "Information";  break;
+            case ScaCategory::Math:       aRet = "Mathematical"; break;
+            case ScaCategory::Tech:       aRet = "Technical";    break;
         }
     }
 
     if( aRet.isEmpty() )
-        aRet = STR_FROM_ANSI( "Add-In" );
+        aRet = "Add-In";
     return aRet;
 }