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 /ucb | |
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 'ucb')
-rw-r--r-- | ucb/source/core/ucbcmds.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/cmis/cmis_content.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/cmis/cmis_repo_content.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/file/shell.cxx | 4 | ||||
-rw-r--r-- | ucb/source/ucp/hierarchy/hierarchycontent.cxx | 4 | ||||
-rw-r--r-- | ucb/source/ucp/package/pkgcontent.cxx | 4 | ||||
-rw-r--r-- | ucb/source/ucp/tdoc/tdoc_content.cxx | 4 | ||||
-rw-r--r-- | ucb/source/ucp/tdoc/tdoc_docmgr.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-neon/NeonUri.cxx | 4 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx | 16 |
10 files changed, 22 insertions, 22 deletions
diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx index b1f9e26bc04e..8702ac6bf52b 100644 --- a/ucb/source/core/ucbcmds.cxx +++ b/ucb/source/core/ucbcmds.cxx @@ -1119,7 +1119,7 @@ void handleNameClashRename( nTry++; OUString aNewTitle = aOldTitlePre; - aNewTitle += OUString::valueOf( nTry ); + aNewTitle += OUString::number( nTry ); aNewTitle += aOldTitlePost; // Set new title diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx index 726d2287dc30..2f8da9ef13a9 100644 --- a/ucb/source/ucp/cmis/cmis_content.cxx +++ b/ucb/source/ucp/cmis/cmis_content.cxx @@ -247,7 +247,7 @@ namespace cmis INetURLObject::GetScheme( aBindingUrl.GetProtocol( ) ), aBindingUrl.GetHost(), aBindingUrl.GetPort() ); OUString sProxy = rProxy.aName; if ( rProxy.nPort > 0 ) - sProxy += ":" + OUString::valueOf( rProxy.nPort ); + sProxy += ":" + OUString::number( rProxy.nPort ); libcmis::SessionFactory::setProxySettings( OUSTR_TO_STDSTR( sProxy ), string(), string(), string() ); // Look for a cached session, key is binding url + repo id diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx index dec135afbb73..e7c8977f4ccc 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.cxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx @@ -127,7 +127,7 @@ namespace cmis INetURLObject::GetScheme( aBindingUrl.GetProtocol( ) ), aBindingUrl.GetHost(), aBindingUrl.GetPort() ); OUString sProxy = rProxy.aName; if ( rProxy.nPort > 0 ) - sProxy += ":" + OUString::valueOf( rProxy.nPort ); + sProxy += ":" + OUString::number( rProxy.nPort ); libcmis::SessionFactory::setProxySettings( OUSTR_TO_STDSTR( sProxy ), string(), string(), string() ); if ( m_aRepositories.empty() ) diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx index ec7bce87f18a..b9c0390551ed 100644 --- a/ucb/source/ucp/file/shell.cxx +++ b/ucb/source/ucp/file/shell.cxx @@ -1187,7 +1187,7 @@ shell::move( sal_Int32 CommandId, newDstUnqPath = dstUnqPath; OUString aPostFix( "_" ); - aPostFix += OUString::valueOf( ++nTry ); + aPostFix += OUString::number( ++nTry ); newDstUnqPath = newDstUnqPath.replaceAt( nPos, 0, aPostFix ); @@ -1414,7 +1414,7 @@ shell::copy( newDstUnqPath = dstUnqPath; OUString aPostFix( "_" ); - aPostFix += OUString::valueOf( ++nTry ); + aPostFix += OUString::number( ++nTry ); newDstUnqPath = newDstUnqPath.replaceAt( nPos, 0, aPostFix ); diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx index c71de2339420..f86f1825b5eb 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx @@ -1450,7 +1450,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve, { OUString aNewId = xId->getContentIdentifier(); aNewId += OUString("_"); - aNewId += OUString::valueOf( ++nTry ); + aNewId += OUString::number( ++nTry ); xId = new ::ucbhelper::ContentIdentifier( aNewId ); } while ( hasData( xId ) && ( nTry < 1000 ) ); @@ -1470,7 +1470,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve, { OUString aNewTitle( m_aProps.getTitle() ); aNewTitle += OUString("_"); - aNewTitle += OUString::valueOf( nTry ); + aNewTitle += OUString::number( nTry ); m_aProps.setTitle( aNewTitle ); } } diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index be6cdbe5cafa..c6578482843b 100644 --- a/ucb/source/ucp/package/pkgcontent.cxx +++ b/ucb/source/ucp/package/pkgcontent.cxx @@ -1671,7 +1671,7 @@ void Content::insert( { OUString aNew = aNewUri.getUri(); aNew += OUString("_"); - aNew += OUString::valueOf( ++nTry ); + aNew += OUString::number( ++nTry ); aNewUri.setUri( aNew ); } while ( hasData( aNewUri ) && ( nTry < 1000 ) ); @@ -1690,7 +1690,7 @@ void Content::insert( else { m_aProps.aTitle += OUString("_"); - m_aProps.aTitle += OUString::valueOf( nTry ); + m_aProps.aTitle += OUString::number( nTry ); } } break; diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx index c08faf683959..a445ccd5ef2d 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.cxx +++ b/ucb/source/ucp/tdoc/tdoc_content.cxx @@ -1678,7 +1678,7 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData, { OUStringBuffer aNew = aNewUri.getUri(); aNew.appendAscii( "_" ); - aNew.append( OUString::valueOf( ++nTry ) ); + aNew.append( OUString::number( ++nTry ) ); aNewUri.setUri( aNew.makeStringAndClear() ); } while ( hasData( aNewUri ) && ( nTry < 1000 ) ); @@ -1698,7 +1698,7 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData, { OUStringBuffer aNewTitle = m_aProps.getTitle(); aNewTitle.appendAscii( "_" ); - aNewTitle.append( OUString::valueOf( ++nTry ) ); + aNewTitle.append( OUString::number( ++nTry ) ); m_aProps.setTitle( aNewTitle.makeStringAndClear() ); } } diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx index 621e34f2c1bc..92b7cad3684d 100644 --- a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx +++ b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx @@ -167,7 +167,7 @@ getDocumentId( const uno::Reference< uno::XInterface > & xDoc ) // different IDs uno::Reference< uno::XInterface > xNormalizedIFace( xDoc, uno::UNO_QUERY ); sal_Int64 nId = reinterpret_cast< sal_Int64 >( xNormalizedIFace.get() ); - aId = OUString::valueOf( nId ); + aId = OUString::number( nId ); } OSL_ENSURE( !aId.isEmpty(), "getDocumentId - Empty id!" ); diff --git a/ucb/source/ucp/webdav-neon/NeonUri.cxx b/ucb/source/ucp/webdav-neon/NeonUri.cxx index 5dba6a2fd7fb..899b2275c3ea 100644 --- a/ucb/source/ucp/webdav-neon/NeonUri.cxx +++ b/ucb/source/ucp/webdav-neon/NeonUri.cxx @@ -206,7 +206,7 @@ void NeonUri::calculateURI () if ( bAppendPort ) { aBuf.appendAscii( ":" ); - aBuf.append( OUString::valueOf( mPort ) ); + aBuf.append( OUString::number( mPort ) ); } aBuf.append( mPath ); @@ -300,7 +300,7 @@ OUString NeonUri::makeConnectionEndPointString( if ( ( nPort != DEFAULT_HTTP_PORT ) && ( nPort != DEFAULT_HTTPS_PORT ) ) { aBuf.appendAscii( ":" ); - aBuf.append( OUString::valueOf( sal_Int32( nPort ) ) ); + aBuf.append( OUString::number( nPort ) ); } return aBuf.makeStringAndClear(); } diff --git a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx index 49124127ba12..d2313dd14854 100644 --- a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx +++ b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx @@ -441,7 +441,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // long sal_Int32 nValue = 0; rInData >>= nValue; - aStringValue = OUString::valueOf( nValue ); + aStringValue = OUString::number( nValue ); aStringType = aTypeLong; } else if ( rType == getCppuType( static_cast< const sal_Int16 * >( 0 ) ) ) @@ -449,7 +449,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // short sal_Int32 nValue = 0; rInData >>= nValue; - aStringValue = OUString::valueOf( nValue ); + aStringValue = OUString::number( nValue ); aStringType = aTypeShort; } else if ( rType == getCppuBooleanType() ) @@ -457,7 +457,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // boolean sal_Bool bValue = false; rInData >>= bValue; - aStringValue = OUString::valueOf( bValue ); + aStringValue = OUString::boolean( bValue ); aStringType = aTypeBoolean; } else if ( rType == getCppuCharType() ) @@ -465,7 +465,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // char sal_Unicode cValue = 0; rInData >>= cValue; - aStringValue = OUString::valueOf( cValue ); + aStringValue = OUString( cValue ); aStringType = aTypeChar; } else if ( rType == getCppuType( static_cast< const sal_Int8 * >( 0 ) ) ) @@ -473,7 +473,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // byte sal_Int8 nValue = 0; rInData >>= nValue; - aStringValue = OUString::valueOf( sal_Unicode( nValue ) ); + aStringValue = OUString( sal_Unicode( nValue ) ); aStringType = aTypeByte; } else if ( rType == getCppuType( static_cast< const sal_Int64 * >( 0 ) ) ) @@ -481,7 +481,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // hyper sal_Int64 nValue = 0; rInData >>= nValue; - aStringValue = OUString::valueOf( nValue ); + aStringValue = OUString::number( nValue ); aStringType = aTypeHyper; } else if ( rType == getCppuType( static_cast< const float * >( 0 ) ) ) @@ -489,7 +489,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // float float nValue = 0; rInData >>= nValue; - aStringValue = OUString::valueOf( nValue ); + aStringValue = OUString::number( nValue ); aStringType = aTypeFloat; } else if ( rType == getCppuType( static_cast< const double * >( 0 ) ) ) @@ -497,7 +497,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // double double nValue = 0; rInData >>= nValue; - aStringValue = OUString::valueOf( nValue ); + aStringValue = OUString::number( nValue ); aStringType = aTypeDouble; } else |