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 /xmlsecurity | |
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 'xmlsecurity')
-rw-r--r-- | xmlsecurity/source/dialogs/certificateviewer.cxx | 2 | ||||
-rw-r--r-- | xmlsecurity/source/framework/buffernode.cxx | 4 | ||||
-rw-r--r-- | xmlsecurity/source/framework/saxeventkeeperimpl.cxx | 6 | ||||
-rw-r--r-- | xmlsecurity/source/helper/xsecsign.cxx | 4 | ||||
-rw-r--r-- | xmlsecurity/source/helper/xsecverify.cxx | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index a667cad7ef77..1f7c4f754394 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -267,7 +267,7 @@ CertificateViewerDetailsTP::CertificateViewerDetailsTP( Window* _pParent, Certif OUString aDetails; // Certificate Versions are reported wrong (#i35107#) - 0 == "V1", 1 == "V2", ..., n = "V(n+1)" aLBEntry = OUString( "V" ); - aLBEntry += OUString::valueOf( sal_Int32( xCert->getVersion() + 1 ) ); + aLBEntry += OUString::number( xCert->getVersion() + 1 ); InsertElement( XMLSEC_RES( STR_VERSION ), aLBEntry, aLBEntry ); Sequence< sal_Int8 > aSeq = xCert->getSerialNumber(); aLBEntry = XmlSec::GetHexString( aSeq, pHexSep ); diff --git a/xmlsecurity/source/framework/buffernode.cxx b/xmlsecurity/source/framework/buffernode.cxx index bfdedf1b2ffe..64a5a516a5bf 100644 --- a/xmlsecurity/source/framework/buffernode.cxx +++ b/xmlsecurity/source/framework/buffernode.cxx @@ -252,7 +252,7 @@ OUString BufferNode::printChildren() const for( ; ii != m_vElementCollectors.end() ; ++ii ) { rc += OUString( "BufID=" ); - rc += OUString::valueOf((*ii)->getBufferId()); + rc += OUString::number((*ii)->getBufferId()); if (((ElementCollector*)(*ii))->getModify()) { @@ -276,7 +276,7 @@ OUString BufferNode::printChildren() const rc += OUString( "(" ); rc += OUString( "SecID=" ); - rc += OUString::valueOf(((ElementCollector*)(*ii))->getSecurityId()); + rc += OUString::number(((ElementCollector*)(*ii))->getSecurityId()); rc += OUString( ")" ); rc += OUString( " " ); } diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx index 4ff3b0f9dc53..afe98c50715f 100644 --- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx +++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx @@ -379,9 +379,9 @@ OUString SAXEventKeeperImpl::printBufferNode( ElementMark * pBlocker = pBufferNode->getBlocker(); if (pBlocker != NULL) { - rc += OUString::valueOf( pBlocker->getBufferId() ); + rc += OUString::number( pBlocker->getBufferId() ); rc += OUString( "(SecId=" ); - rc += OUString::valueOf( pBlocker->getSecurityId() ); + rc += OUString::number( pBlocker->getSecurityId() ); rc += OUString( ")" ); rc += OUString( " " ); } @@ -1057,7 +1057,7 @@ OUString SAL_CALL SAXEventKeeperImpl::printBufferNodeTree() OUString rc; rc += OUString( "ElementMarkBuffers: size = " ); - rc += OUString::valueOf((sal_Int32)m_vElementMarkBuffers.size()); + rc += OUString::number(m_vElementMarkBuffers.size()); rc += OUString( "\nCurrentBufferNode: " ); rc += m_xXMLDocument->getNodeName(m_pCurrentBufferNode->getXMLElement()); rc += OUString( "\n" ); diff --git a/xmlsecurity/source/helper/xsecsign.cxx b/xmlsecurity/source/helper/xsecsign.cxx index 4fbfb40b2864..b7660d9347c0 100644 --- a/xmlsecurity/source/helper/xsecsign.cxx +++ b/xmlsecurity/source/helper/xsecsign.cxx @@ -82,9 +82,9 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar cssu::Reference<cssl::XInitialization> xInitialization(xReferenceResolvedListener, cssu::UNO_QUERY); cssu::Sequence<cssu::Any> args(5); - args[0] = cssu::makeAny(OUString::valueOf(nSecurityId)); + args[0] = cssu::makeAny(OUString::number(nSecurityId)); args[1] = cssu::makeAny(m_xSAXEventKeeper); - args[2] = cssu::makeAny(OUString::valueOf(nIdOfSignatureElementCollector)); + args[2] = cssu::makeAny(OUString::number(nIdOfSignatureElementCollector)); //i39448 : for nss, the internal module is used for signing, which needs to be improved later sal_Int32 nEnvIndex = internalSignatureInfor.signatureInfor.nSecurityEnvironmentIndex; diff --git a/xmlsecurity/source/helper/xsecverify.cxx b/xmlsecurity/source/helper/xsecverify.cxx index 67d5b2fd6b42..10fdd16bf0a5 100644 --- a/xmlsecurity/source/helper/xsecverify.cxx +++ b/xmlsecurity/source/helper/xsecverify.cxx @@ -68,9 +68,9 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar cssu::Reference<cssl::XInitialization> xInitialization(xReferenceResolvedListener, cssu::UNO_QUERY); cssu::Sequence<cssu::Any> args(5); - args[0] = cssu::makeAny(OUString::valueOf(nSecurityId)); + args[0] = cssu::makeAny(OUString::number(nSecurityId)); args[1] = cssu::makeAny(m_xSAXEventKeeper); - args[2] = cssu::makeAny(OUString::valueOf(nIdOfSignatureElementCollector)); + args[2] = cssu::makeAny(OUString::number(nIdOfSignatureElementCollector)); args[3] = cssu::makeAny(m_xSecurityContext); args[4] = cssu::makeAny(m_xXMLSignature); xInitialization->initialize(args); |