From 7692bfc268c57d6bcbc565179e5c63ffc0f6095d Mon Sep 17 00:00:00 2001 From: Gert Faller Date: Sun, 28 Nov 2010 18:33:53 +0100 Subject: RTL_CONSTASCII_USTRINGPARAM in components 3 --- xmlsecurity/tools/demo/performance.cxx | 22 +++++----- xmlsecurity/tools/demo/util.cxx | 2 +- xmlsecurity/tools/demo/util2.cxx | 76 +++++++++++++++++----------------- 3 files changed, 50 insertions(+), 50 deletions(-) (limited to 'xmlsecurity/tools/demo') diff --git a/xmlsecurity/tools/demo/performance.cxx b/xmlsecurity/tools/demo/performance.cxx index bcf0d203bfad..c262ec2377f0 100644 --- a/xmlsecurity/tools/demo/performance.cxx +++ b/xmlsecurity/tools/demo/performance.cxx @@ -584,13 +584,13 @@ rtl::OUString XSecTester::parseFile( } else { - ouMessage += rtl::OUString::createFromAscii( "N/A" ); + ouMessage += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("N/A")); } } else { - ouMessage += rtl::OUString::createFromAscii( "-" ); + ouMessage += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-")); } return ouMessage; @@ -736,7 +736,7 @@ rtl::OUString SAL_CALL XSecTester::transfer_without_sec( xJavaFilterParser, cssu::UNO_QUERY ); if ( !xJavaFilterParser.is() ) - return rtl::OUString::createFromAscii( "NO JAVA" ); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NO JAVA")); /* connect the SAX Parser, the Java Flat Filter and the SAX Writer */ xJavaFilterParser->setDocumentHandler( xSaxWriterHandler ); @@ -1772,7 +1772,7 @@ int main( int argc, char **argv ) * export the file with signautre/encryption (C++) */ outputFileName1 = ouInputFileName.copy(0, nPosition) + - rtl::OUString::createFromAscii("-ex.xml"); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-ex.xml")); ouTime_C = pTester->export_xml(ouInputFileName, outputFileName1, sal_False); nPosition1 = ouTime_C.lastIndexOf('\t'); ouRemark_C = ouTime_C.copy(nPosition1 + 1); @@ -1782,7 +1782,7 @@ int main( int argc, char **argv ) * export the file with signautre/encryption (Java) */ outputFileName1 = ouInputFileName.copy(0, nPosition) + - rtl::OUString::createFromAscii("-ex2.xml"); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-ex2.xml")); ouTime_Java = pTester->export_xml(ouInputFileName, outputFileName1, sal_True); nPosition1 = ouTime_Java.lastIndexOf('\t'); ouRemark_Java = ouTime_Java.copy(nPosition1 + 1); @@ -1792,14 +1792,14 @@ int main( int argc, char **argv ) * export the file without signautre/encryption */ outputFileName2 = ouInputFileName.copy(0, nPosition) + - rtl::OUString::createFromAscii("-ex-no.xml"); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-ex-no.xml")); ouTime_NoSecurity = pTester->transfer_without_sec(ouInputFileName, outputFileName2, sal_False); /* * export the file with Java Flat Filter */ outputFileName2 = ouInputFileName.copy(0, nPosition) + - rtl::OUString::createFromAscii("-ex-jf.xml"); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-ex-jf.xml")); ouTime_JavaForwardOnly = pTester->transfer_without_sec(ouInputFileName, outputFileName2, sal_True); /* @@ -1822,7 +1822,7 @@ int main( int argc, char **argv ) * import the file with signautre/encryption (C++) */ outputFileName1 = ouInputFileName.copy(0, nPosition) + - rtl::OUString::createFromAscii("-im.xml"); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-im.xml")); ouTime_C = pTester->import_xml(ouInputFileName, outputFileName1, sal_False); nPosition1 = ouTime_C.lastIndexOf('\t'); ouRemark_C = ouTime_C.copy(nPosition1 + 1); @@ -1832,7 +1832,7 @@ int main( int argc, char **argv ) * import the file with signautre/encryption (Java) */ outputFileName1 = ouInputFileName.copy(0, nPosition) + - rtl::OUString::createFromAscii("-im2.xml"); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-im2.xml")); ouTime_Java = pTester->import_xml(ouInputFileName, outputFileName1, sal_True); nPosition1 = ouTime_Java.lastIndexOf('\t'); ouRemark_Java = ouTime_Java.copy(nPosition1 + 1); @@ -1842,7 +1842,7 @@ int main( int argc, char **argv ) * import the file without signautre/encryption */ outputFileName2 = ouInputFileName.copy(0, nPosition) + - rtl::OUString::createFromAscii("-im-no.xml"); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-im-no.xml")); ouTime_NoSecurity = pTester->transfer_without_sec(ouInputFileName, outputFileName2, sal_False); /* @@ -1850,7 +1850,7 @@ int main( int argc, char **argv ) */ outputFileName2 = ouInputFileName.copy(0, nPosition) + - rtl::OUString::createFromAscii("-im-jf.xml"); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-im-jf.xml")); ouTime_JavaForwardOnly = pTester->transfer_without_sec(ouInputFileName, outputFileName2, sal_True); /* diff --git a/xmlsecurity/tools/demo/util.cxx b/xmlsecurity/tools/demo/util.cxx index b81724f15c4e..32fbc60a28ec 100644 --- a/xmlsecurity/tools/demo/util.cxx +++ b/xmlsecurity/tools/demo/util.cxx @@ -61,7 +61,7 @@ cssu::Reference< cssl::XMultiServiceFactory > CreateDemoServiceFactory() "serviceManager - " "Cannot create simple registry" ) ; - xSimpleRegistry->open(rtl::OUString::createFromAscii( "demo.rdb" ), sal_True, sal_False); + xSimpleRegistry->open(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("demo.rdb")), sal_True, sal_False); OSL_ENSURE( xSimpleRegistry->isValid() , "serviceManager - " "Cannot open xml security registry rdb" ) ; diff --git a/xmlsecurity/tools/demo/util2.cxx b/xmlsecurity/tools/demo/util2.cxx index d40506bc498e..5b71f6108e6a 100644 --- a/xmlsecurity/tools/demo/util2.cxx +++ b/xmlsecurity/tools/demo/util2.cxx @@ -170,68 +170,68 @@ void convertDateTime( ::rtl::OUStringBuffer& rBuffer, rtl::OUString result; - result += rtl::OUString::createFromAscii( "Security Id : " ) + result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Security Id : ")) +rtl::OUString::valueOf(infor.nSecurityId) - +rtl::OUString::createFromAscii( "\n" ); - result += rtl::OUString::createFromAscii( "Status : [" ) + +rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); + result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Status : [")) +rtl::OUString::valueOf((sal_Int32)(infor.nStatus)) - +rtl::OUString::createFromAscii( "] " ) + +rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("] ")) +rtl::OUString::createFromAscii(status[infor.nStatus]) - +rtl::OUString::createFromAscii( "\n" ); + +rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); const SignatureReferenceInformations& rInfors = infor.vSignatureReferenceInfors; int i; int size = rInfors.size(); - result += rtl::OUString::createFromAscii( "--References :\n" ); + result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--References :\n")); for (i=0; i0) { - result += rtl::OUString::createFromAscii( "--X509IssuerName :\n" ); + result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--X509IssuerName :\n")); result += infor.ouX509IssuerName; - result += rtl::OUString::createFromAscii( "\n" ); + result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); } if (infor.ouX509SerialNumber.getLength()>0) { - result += rtl::OUString::createFromAscii( "--X509SerialNumber :\n" ); + result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--X509SerialNumber :\n")); result += infor.ouX509SerialNumber; - result += rtl::OUString::createFromAscii( "\n" ); + result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); } if (infor.ouX509Certificate.getLength()>0) { - result += rtl::OUString::createFromAscii( "--X509Certificate :\n" ); + result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--X509Certificate :\n")); result += infor.ouX509Certificate; - result += rtl::OUString::createFromAscii( "\n" ); + result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); } if (infor.ouSignatureValue.getLength()>0) { - result += rtl::OUString::createFromAscii( "--SignatureValue :\n" ); + result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--SignatureValue :\n")); result += infor.ouSignatureValue; - result += rtl::OUString::createFromAscii( "\n" ); + result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); } - result += rtl::OUString::createFromAscii( "--Date :\n" ); + result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--Date :\n")); ::rtl::OUStringBuffer buffer; convertDateTime( buffer, infor.stDateTime ); result += buffer.makeStringAndClear(); - result += rtl::OUString::createFromAscii( "\n" ); + result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); if (infor.ouX509IssuerName.getLength()>0 && infor.ouX509SerialNumber.getLength()>0 && xSecurityEnvironment.is()) { - result += rtl::OUString::createFromAscii( "--Certificate Path :\n" ); + result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--Certificate Path :\n")); cssu::Reference< ::com::sun::star::security::XCertificate > xCert = xSecurityEnvironment->getCertificate( infor.ouX509IssuerName, numericStringToBigInteger(infor.ouX509SerialNumber) ); cssu::Sequence < cssu::Reference< ::com::sun::star::security::XCertificate > > xCertPath; if(! xCert.is() ) @@ -247,68 +247,68 @@ void convertDateTime( ::rtl::OUStringBuffer& rBuffer, for( int i = 0; i < xCertPath.getLength(); i++ ) { result += xCertPath[i]->getSubjectName(); - result += rtl::OUString::createFromAscii( "\n Subject public key algorithm : " ); + result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n Subject public key algorithm : ")); result += xCertPath[i]->getSubjectPublicKeyAlgorithm(); - result += rtl::OUString::createFromAscii( "\n Signature algorithm : " ); + result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n Signature algorithm : ")); result += xCertPath[i]->getSignatureAlgorithm(); - result += rtl::OUString::createFromAscii( "\n Subject public key value : " ); + result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n Subject public key value : ")); cssu::Sequence< sal_Int8 > keyValue = xCertPath[i]->getSubjectPublicKeyValue(); result += printHexString(keyValue); - result += rtl::OUString::createFromAscii( "\n Thumbprint (SHA1) : " ); + result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n Thumbprint (SHA1) : ")); cssu::Sequence< sal_Int8 > SHA1Thumbprint = xCertPath[i]->getSHA1Thumbprint(); result += printHexString(SHA1Thumbprint); - result += rtl::OUString::createFromAscii( "\n Thumbprint (MD5) : " ); + result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n Thumbprint (MD5) : ")); cssu::Sequence< sal_Int8 > MD5Thumbprint = xCertPath[i]->getMD5Thumbprint(); result += printHexString(MD5Thumbprint); - result += rtl::OUString::createFromAscii( "\n <<\n" ); + result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n <<\n")); } - result += rtl::OUString::createFromAscii( "\n Key Usage : " ); + result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n Key Usage : ")); sal_Int32 usage = xCert->getCertificateUsage(); if (usage & ::com::sun::star::security::KeyUsage::DIGITAL_SIGNATURE) { - result += rtl::OUString::createFromAscii( "DIGITAL_SIGNATURE " ); + result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DIGITAL_SIGNATURE ")); } if (usage & ::com::sun::star::security::KeyUsage::NON_REPUDIATION) { - result += rtl::OUString::createFromAscii( "NON_REPUDIATION " ); + result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NON_REPUDIATION ")); } if (usage & ::com::sun::star::security::KeyUsage::KEY_ENCIPHERMENT) { - result += rtl::OUString::createFromAscii( "KEY_ENCIPHERMENT " ); + result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KEY_ENCIPHERMENT ")); } if (usage & ::com::sun::star::security::KeyUsage::DATA_ENCIPHERMENT) { - result += rtl::OUString::createFromAscii( "DATA_ENCIPHERMENT " ); + result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATA_ENCIPHERMENT ")); } if (usage & ::com::sun::star::security::KeyUsage::KEY_AGREEMENT) { - result += rtl::OUString::createFromAscii( "KEY_AGREEMENT " ); + result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KEY_AGREEMENT ")); } if (usage & ::com::sun::star::security::KeyUsage::KEY_CERT_SIGN) { - result += rtl::OUString::createFromAscii( "KEY_CERT_SIGN " ); + result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KEY_CERT_SIGN ")); } if (usage & ::com::sun::star::security::KeyUsage::CRL_SIGN) { - result += rtl::OUString::createFromAscii( "CRL_SIGN " ); + result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CRL_SIGN ")); } - result += rtl::OUString::createFromAscii( "\n" ); + result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); } - result += rtl::OUString::createFromAscii( "\n" ); + result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); return result; } @@ -326,7 +326,7 @@ void convertDateTime( ::rtl::OUStringBuffer& rBuffer, result += getSignatureInformation( infor, xSecurityEnvironment ); } - result += rtl::OUString::createFromAscii( "\n" ); + result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); return result; } -- cgit