diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-07 09:42:33 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-07 10:48:19 +0200 |
| commit | c421cab5bdd883fd547804b37f654fb9f4a59b38 (patch) | |
| tree | e22d32ea7c2e9104df98183b036e6bf5d5c88ed2 /scaddins | |
| parent | 99330e7b35b71bdc2a765a24ad8a25f6067aa3a6 (diff) | |
remove more STR_FROM_ANSI macro
Change-Id: I0957d1162c7b5bf8f52c7a79aaced667961d40a3
Diffstat (limited to 'scaddins')
| -rw-r--r-- | scaddins/source/pricing/pricing.cxx | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/scaddins/source/pricing/pricing.cxx b/scaddins/source/pricing/pricing.cxx index 022a89c6eb23..be52c922fcf2 100644 --- a/scaddins/source/pricing/pricing.cxx +++ b/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; } |