diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-08-21 15:07:31 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-08-21 15:10:35 +0200 |
commit | 64b993e046f23baaacaff1572b7d2a816588b5ef (patch) | |
tree | 237dce36a1d4787d168a0520839f6aab22500487 /stoc | |
parent | 75f41baab6ce75786a91fe461835ee16a23ec18e (diff) |
finish deprecation of O(U)String::valueOf()
Compiler plugin to replace with matching number(), boolean() or OUString ctor,
ran it, few manual tweaks, mark as really deprecated.
Change-Id: I4a79bdbcf4c460d21e73b635d2bd3725c22876b2
Diffstat (limited to 'stoc')
-rw-r--r-- | stoc/source/javavm/javavm.cxx | 12 | ||||
-rw-r--r-- | stoc/source/typeconv/convert.cxx | 14 |
2 files changed, 13 insertions, 13 deletions
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index 5e7dd1b045e5..352ce8b4dc93 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -300,7 +300,7 @@ void getINetPropsFromConfig(stoc_javavm::JVM * pjvm, css::uno::Reference<css::registry::XRegistryKey> ftpProxy_port = xRegistryRootKey->openKey("Settings/ooInetFTPProxyPort"); if(ftpProxy_port.is() && ftpProxy_port->getLongValue()) { OUString ftpPort = OUString("ftp.proxyPort="); - ftpPort += OUString::valueOf(ftpProxy_port->getLongValue()); + ftpPort += OUString::number(ftpProxy_port->getLongValue()); pjvm->pushProp(ftpHost); pjvm->pushProp(ftpPort); @@ -317,7 +317,7 @@ void getINetPropsFromConfig(stoc_javavm::JVM * pjvm, css::uno::Reference<css::registry::XRegistryKey> httpProxy_port = xRegistryRootKey->openKey("Settings/ooInetHTTPProxyPort"); if(httpProxy_port.is() && httpProxy_port->getLongValue()) { OUString httpPort = OUString("http.proxyPort="); - httpPort += OUString::valueOf(httpProxy_port->getLongValue()); + httpPort += OUString::number(httpProxy_port->getLongValue()); pjvm->pushProp(httpHost); pjvm->pushProp(httpPort); @@ -334,7 +334,7 @@ void getINetPropsFromConfig(stoc_javavm::JVM * pjvm, css::uno::Reference<css::registry::XRegistryKey> httpsProxy_port = xRegistryRootKey->openKey("Settings/ooInetHTTPSProxyPort"); if(httpsProxy_port.is() && httpsProxy_port->getLongValue()) { OUString httpsPort = OUString("https.proxyPort="); - httpsPort += OUString::valueOf(httpsProxy_port->getLongValue()); + httpsPort += OUString::number(httpsProxy_port->getLongValue()); pjvm->pushProp(httpsHost); pjvm->pushProp(httpsPort); @@ -1088,7 +1088,7 @@ void SAL_CALL JavaVirtualMachine::elementReplaced( aPropertyName = OUString("http.proxyPort"); sal_Int32 n = 0; rEvent.Element >>= n; - aPropertyValue = OUString::valueOf(n); + aPropertyValue = OUString::number(n); } else if ( aAccessor == "ooInetHTTPSProxyName" ) { @@ -1100,7 +1100,7 @@ void SAL_CALL JavaVirtualMachine::elementReplaced( aPropertyName = OUString("https.proxyPort"); sal_Int32 n = 0; rEvent.Element >>= n; - aPropertyValue = OUString::valueOf(n); + aPropertyValue = OUString::number(n); } else if ( aAccessor == "ooInetFTPProxyName" ) { @@ -1112,7 +1112,7 @@ void SAL_CALL JavaVirtualMachine::elementReplaced( aPropertyName = OUString("ftp.proxyPort"); sal_Int32 n = 0; rEvent.Element >>= n; - aPropertyValue = OUString::valueOf(n); + aPropertyValue = OUString::number(n); } else if ( aAccessor == "ooInetNoProxy" ) { diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx index ec83601e5764..584b7e7f9948 100644 --- a/stoc/source/typeconv/convert.cxx +++ b/stoc/source/typeconv/convert.cxx @@ -867,22 +867,22 @@ Any TypeConverter_Impl::convertToSimpleType( const Any& rVal, TypeClass aDestina break; case TypeClass_BYTE: - aRet <<= OUString::valueOf( (sal_Int32)*(sal_Int8 const *)rVal.getValue() ); + aRet <<= OUString::number( *(sal_Int8 const *)rVal.getValue() ); break; case TypeClass_SHORT: - aRet <<= OUString::valueOf( (sal_Int32)*(sal_Int16 const *)rVal.getValue() ); + aRet <<= OUString::number( *(sal_Int16 const *)rVal.getValue() ); break; case TypeClass_UNSIGNED_SHORT: - aRet <<= OUString::valueOf( (sal_Int32)*(sal_uInt16 const *)rVal.getValue() ); + aRet <<= OUString::number( *(sal_uInt16 const *)rVal.getValue() ); break; case TypeClass_LONG: - aRet <<= OUString::valueOf( *(sal_Int32 const *)rVal.getValue() ); + aRet <<= OUString::number( *(sal_Int32 const *)rVal.getValue() ); break; case TypeClass_UNSIGNED_LONG: - aRet <<= OUString::valueOf( (sal_Int64)*(sal_uInt32 const *)rVal.getValue() ); + aRet <<= OUString::number( *(sal_uInt32 const *)rVal.getValue() ); break; case TypeClass_HYPER: - aRet <<= OUString::valueOf( *(sal_Int64 const *)rVal.getValue() ); + aRet <<= OUString::number( *(sal_Int64 const *)rVal.getValue() ); break; // case TypeClass_UNSIGNED_HYPER: // aRet <<= OUString::valueOf( (sal_Int64)*(sal_uInt64 const *)rVal.getValue() ); @@ -890,7 +890,7 @@ Any TypeConverter_Impl::convertToSimpleType( const Any& rVal, TypeClass aDestina // handle unsigned hyper like double default: - aRet <<= OUString::valueOf( toDouble( rVal ) ); + aRet <<= OUString::number( toDouble( rVal ) ); } break; |