From 0d58e6723973211fb57d18dc8aef65510c1f965e Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 15 Dec 2014 10:14:54 +0100 Subject: scaddins: Use appropriate OUString functions on string constants Change-Id: If51c63d22223f968e185a05b79aed5bf861405a4 --- scaddins/source/analysis/analysis.cxx | 4 ++-- scaddins/source/pricing/pricing.cxx | 19 +++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-) (limited to 'scaddins') diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx index c0137f372e7d..02c6ecb75e4f 100644 --- a/scaddins/source/analysis/analysis.cxx +++ b/scaddins/source/analysis/analysis.cxx @@ -1149,8 +1149,8 @@ OUString SAL_CALL AnalysisAddIn::getComplex( double fR, double fI, const uno::An case uno::TypeClass_STRING: { const OUString* pSuff = ( const OUString* ) rSuff.getValue(); - bi = pSuff->equalsAscii( "i" ) || pSuff->isEmpty(); - if( !bi && !pSuff->equalsAscii( "j" ) ) + bi = *pSuff == "i" || pSuff->isEmpty(); + if( !bi && *pSuff != "j" ) throw lang::IllegalArgumentException(); } break; diff --git a/scaddins/source/pricing/pricing.cxx b/scaddins/source/pricing/pricing.cxx index 7453fd8eacbf..18d521207574 100644 --- a/scaddins/source/pricing/pricing.cxx +++ b/scaddins/source/pricing/pricing.cxx @@ -556,24 +556,23 @@ bool getinput_greek(bs::types::Greeks& greek, const uno::Any& anyval) { return false; } - if(str.equalsAscii("value") || str.equalsAscii("price") || - str.equalsAscii("v") || str.equalsAscii("p") ) { + if(str == "value" || str == "price" || str == "v" || str == "p") { greek=bs::types::Value; - } else if(str.equalsAscii("delta") || str.equalsAscii("d")) { + } else if(str == "delta" || str == "d") { greek=bs::types::Delta; - } else if(str.equalsAscii("gamma") || str.equalsAscii("g")) { + } else if(str == "gamma" || str == "g") { greek=bs::types::Gamma; - } else if(str.equalsAscii("theta") || str.equalsAscii("t")) { + } else if(str == "theta" || str == "t") { greek=bs::types::Theta; - } else if(str.equalsAscii("vega") || str.equalsAscii("e")) { + } else if(str == "vega" || str == "e") { greek=bs::types::Vega; - } else if(str.equalsAscii("volga") || str.equalsAscii("o")) { + } else if(str == "volga" || str == "o") { greek=bs::types::Volga; - } else if(str.equalsAscii("vanna") || str.equalsAscii("a")) { + } else if(str == "vanna" || str == "a") { greek=bs::types::Vanna; - } else if(str.equalsAscii("rho") || str.equalsAscii("r")) { + } else if(str == "rho" || str == "r") { greek=bs::types::Rho_d; - } else if(str.equalsAscii("rhof") || str.equalsAscii("f")) { + } else if(str == "rhof" || str == "f") { greek=bs::types::Rho_f; } else { return false; -- cgit