diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2014-04-06 17:16:41 +0200 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2014-04-14 12:31:55 +0200 |
commit | 60c8df432619e4aaf90e92e18f096a43acb3a30f (patch) | |
tree | 86d0d6dc6a7a6d1313c8e2427d0ddccc400513eb /connectivity | |
parent | 18c7992d7ff66e796f18eeeb44b62a78f74f820a (diff) |
remove static strings
Diffstat (limited to 'connectivity')
-rw-r--r-- | connectivity/source/commontools/FValue.cxx | 6 | ||||
-rw-r--r-- | connectivity/source/commontools/dbtools2.cxx | 3 | ||||
-rw-r--r-- | connectivity/source/commontools/parameters.cxx | 3 |
3 files changed, 4 insertions, 8 deletions
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx index d8bc37fdef1b..4958bf62d8a2 100644 --- a/connectivity/source/commontools/FValue.cxx +++ b/connectivity/source/commontools/FValue.cxx @@ -1077,14 +1077,12 @@ bool ORowSetValue::getBool() const case DataType::LONGVARCHAR: { const OUString sValue(m_aValue.m_pString); - const static OUString s_sTrue("true"); - const static OUString s_sFalse("false"); - if ( sValue.equalsIgnoreAsciiCase(s_sTrue) || (sValue == "1") ) + if ( sValue.equalsIgnoreAsciiCase("true") || (sValue == "1") ) { bRet = true; break; } - else if ( sValue.equalsIgnoreAsciiCase(s_sFalse) || (sValue == "0") ) + else if ( sValue.equalsIgnoreAsciiCase("false") || (sValue == "0") ) { bRet = false; break; diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx index d6f58bc0970f..efe0273e66b9 100644 --- a/connectivity/source/commontools/dbtools2.cxx +++ b/connectivity/source/commontools/dbtools2.cxx @@ -1000,8 +1000,7 @@ OUString getDefaultReportEngineServiceName(const Reference< XComponentContext >& if ( aReportEngine.isValid() ) { OUString sRet; - const static OUString s_sService("ServiceName"); - aReportEngine.getNodeValue(s_sService) >>= sRet; + aReportEngine.getNodeValue("ServiceName") >>= sRet; return sRet; } } diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx index f52bd85878e6..1d0bc62924a6 100644 --- a/connectivity/source/commontools/parameters.cxx +++ b/connectivity/source/commontools/parameters.cxx @@ -381,7 +381,6 @@ namespace dbtools // did we find links where the detail field refers to a detail column (instead of a parameter name)? if ( !aAdditionalFilterComponents.empty() ) { - const static OUString s_sAnd( " AND " ); // build a conjunction of all the filter components OUStringBuffer sAdditionalFilter; for ( ::std::vector< OUString >::const_iterator aComponent = aAdditionalFilterComponents.begin(); @@ -390,7 +389,7 @@ namespace dbtools ) { if ( !sAdditionalFilter.isEmpty() ) - sAdditionalFilter.append(s_sAnd); + sAdditionalFilter.append(" AND "); sAdditionalFilter.appendAscii("( ",((sal_Int32)(sizeof("( ")-1))); sAdditionalFilter.append(*aComponent); |