diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-07 09:38:56 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-07 10:48:19 +0200 |
| commit | 4dc6dee3aa76085a308df5a71872cb40ef5d3aaa (patch) | |
| tree | 7f246f1b0719c82d7ced0dc5f16ff932121e9cb4 /scaddins | |
| parent | 75b7b685cecde509bb305dc370448f42010d00da (diff) | |
remove unnecessary STR_FROM_ANSI macro
Change-Id: I262158991a83083f999b0ae48da4ed4d77fc57fe
Diffstat (limited to 'scaddins')
| -rw-r--r-- | scaddins/source/datefunc/datefunc.cxx | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx index 9bf44cb799b4..d476bc514146 100644 --- a/scaddins/source/datefunc/datefunc.cxx +++ b/scaddins/source/datefunc/datefunc.cxx @@ -34,9 +34,6 @@ using namespace ::com::sun::star; #define MY_SERVICE "com.sun.star.sheet.addin.DateFunctions" #define MY_IMPLNAME "com.sun.star.sheet.addin.DateFunctionsImpl" -#define STR_FROM_ANSI( s ) OUString( s, strlen( s ), RTL_TEXTENCODING_MS_1252 ) - - ScaResId::ScaResId( sal_uInt16 nId, ResMgr& rResMgr ) : ResId( nId, rResMgr ) { @@ -281,11 +278,11 @@ OUString SAL_CALL ScaDateAddIn::getDisplayFunctionName( const OUString& aProgram { aRet = ScaResStringLoader( RID_DATE_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; } @@ -317,7 +314,7 @@ OUString SAL_CALL ScaDateAddIn::getDisplayArgumentName( if( nStr ) aRet = GetFuncDescrStr( fDataIt->GetDescrID(), nStr ); else - aRet = STR_FROM_ANSI( "internal" ); + aRet = "internal"; } return aRet; @@ -336,7 +333,7 @@ OUString SAL_CALL ScaDateAddIn::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; @@ -353,17 +350,17 @@ OUString SAL_CALL ScaDateAddIn::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; } |