diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-05-18 21:14:00 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-05-19 15:40:40 +0200 |
| commit | 2155e04d6343638ca9815d394cbc4f78c2b17c3a (patch) | |
| tree | 0378142f6ce9edb63074291aed45527568e7b254 /scaddins | |
| parent | cee02e81cd3b55fb46eacf5db5713e8bf4363bcd (diff) | |
make string translation loading more uniform
change various ResId classes that use conversion operator to OUString to
functions that return a OUString
drop various defines
drop unnecessary toString calls
Change-Id: Ibeccdf2b91a46a2ed5b4b74e6024e301a023bc92
Reviewed-on: https://gerrit.libreoffice.org/37817
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'scaddins')
| -rw-r--r-- | scaddins/source/analysis/analysis.cxx | 2 | ||||
| -rw-r--r-- | scaddins/source/datefunc/datefunc.cxx | 2 | ||||
| -rw-r--r-- | scaddins/source/pricing/pricing.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx index dd023dd473d3..344d5aa0f54a 100644 --- a/scaddins/source/analysis/analysis.cxx +++ b/scaddins/source/analysis/analysis.cxx @@ -241,7 +241,7 @@ OUString SAL_CALL AnalysisAddIn::getDisplayFunctionName( const OUString& aProgra auto it = std::find_if(pFD->begin(), pFD->end(), FindFuncData( aProgrammaticName ) ); if( it != pFD->end() ) { - aRet = AnalysisResId(it->GetUINameID(), GetResMgr()).toString(); + aRet = AnalysisResId(it->GetUINameID(), GetResMgr()); if( it->IsDouble() ) { const OUString& rSuffix = it->GetSuffix(); diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx index 055f7bcc5525..d2a33ccf5398 100644 --- a/scaddins/source/datefunc/datefunc.cxx +++ b/scaddins/source/datefunc/datefunc.cxx @@ -252,7 +252,7 @@ OUString SAL_CALL ScaDateAddIn::getDisplayFunctionName( const OUString& aProgram FindScaFuncData( aProgrammaticName ) ); if( fDataIt != pFuncDataList->end() ) { - aRet = ScaResId(fDataIt->GetUINameID(), GetResMgr()).toString(); + aRet = ScaResId(fDataIt->GetUINameID(), GetResMgr()); if( fDataIt->IsDouble() ) aRet += "_ADD"; } diff --git a/scaddins/source/pricing/pricing.cxx b/scaddins/source/pricing/pricing.cxx index e1843cf5b396..7824f0c4a67e 100644 --- a/scaddins/source/pricing/pricing.cxx +++ b/scaddins/source/pricing/pricing.cxx @@ -275,7 +275,7 @@ OUString SAL_CALL ScaPricingAddIn::getDisplayFunctionName( const OUString& aProg FindScaFuncData( aProgrammaticName ) ); if(fDataIt != pFuncDataList->end() ) { - aRet = ScaResId(fDataIt->GetUINameID(), GetResMgr()).toString(); + aRet = ScaResId(fDataIt->GetUINameID(), GetResMgr()); if( fDataIt->IsDouble() ) aRet += "_ADD"; } |