From b5e5ce956b463e90bb65ad99cefca33b9b0b13bf Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Sat, 17 Aug 2013 01:11:11 +0200 Subject: fdo#57950: Remove some chained appends in xmlsecurity Change-Id: I35ac622abb995a9259f0774f463ec2816b3668b6 Reviewed-on: https://gerrit.libreoffice.org/5477 Reviewed-by: Andrzej J.R. Hunt Tested-by: Andrzej J.R. Hunt --- xmlsecurity/source/dialogs/certificatechooser.cxx | 17 +++++------------ xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 7 ++----- xmlsecurity/source/dialogs/macrosecurity.cxx | 6 ++---- xmlsecurity/source/dialogs/resourcemanager.cxx | 10 +++------- xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | 9 ++------- xmlsecurity/workben/signaturetest.cxx | 7 +++---- 6 files changed, 17 insertions(+), 39 deletions(-) (limited to 'xmlsecurity') diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index d339cde84220..aa829172641c 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -65,12 +65,8 @@ CertificateChooser::CertificateChooser( Window* _pParent, uno::Reference< uno::X m_pCertLB = new SvSimpleTable(*pSignatures); static long nTabs[] = { 3, 0, 30*nControlWidth/100, 60*nControlWidth/100 }; m_pCertLB->SetTabs( &nTabs[0] ); - OUStringBuffer sHeader; - sHeader.append(get("issuedto")->GetText()) - .append("\t").append(get("issuedby")->GetText()) - .append("\t").append(get("expiration")->GetText()); - m_pCertLB->InsertHeaderEntry(sHeader.makeStringAndClear()); - + m_pCertLB->InsertHeaderEntry(get("issuedto")->GetText() + "\t" + get("issuedby")->GetText() + + "\t" + get("expiration")->GetText()); m_pCertLB->SetSelectHdl( LINK( this, CertificateChooser, CertificateHighlightHdl ) ); m_pCertLB->SetDoubleClickHdl( LINK( this, CertificateChooser, CertificateSelectHdl ) ); m_pViewBtn->SetClickHdl( LINK( this, CertificateChooser, ViewButtonHdl ) ); @@ -174,12 +170,9 @@ void CertificateChooser::ImplInitialize() // fill list of certificates; the first entry will be selected for ( sal_Int32 nC = 0; nC < nCertificates; ++nC ) { - OUStringBuffer sEntry( XmlSec::GetContentPart( maCerts[ nC ]->getSubjectName() ) ); - sEntry.append( '\t' ); - sEntry.append( XmlSec::GetContentPart( maCerts[ nC ]->getIssuerName() ) ); - sEntry.append( '\t' ); - sEntry.append( XmlSec::GetDateString( maCerts[ nC ]->getNotValidAfter() ) ); - SvTreeListEntry* pEntry = m_pCertLB->InsertEntry( sEntry.makeStringAndClear() ); + SvTreeListEntry* pEntry = m_pCertLB->InsertEntry( XmlSec::GetContentPart( maCerts[ nC ]->getSubjectName() ) + + "\t" + XmlSec::GetContentPart( maCerts[ nC ]->getIssuerName() ) + + "\t" + XmlSec::GetDateString( maCerts[ nC ]->getNotValidAfter() ) ); pEntry->SetUserData( ( void* )(sal_IntPtr)nC ); // missuse user data as index } diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 866a0ded89f2..033b026fa46e 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -208,11 +208,8 @@ DigitalSignaturesDialog::DigitalSignaturesDialog( static long aTabs[] = { 4, 0, 6*nControlWidth/100, 36*nControlWidth/100, 74*nControlWidth/100 }; m_pSignaturesLB->SetTabs(aTabs); - OUStringBuffer sHeader; - sHeader.append("\t").append(get("signed")->GetText()) - .append("\t").append(get("issued")->GetText()) - .append("\t").append(get("date")->GetText()); - m_pSignaturesLB->InsertHeaderEntry(sHeader.makeStringAndClear()); + m_pSignaturesLB->InsertHeaderEntry("\t" + get("signed")->GetText() + "\t" + + get("issued")->GetText() + "\t" + get("date")->GetText()); mbVerifySignatures = true; mbSignaturesChanged = false; diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index 4ae1f481ab3a..70d03c77f1e7 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -361,10 +361,8 @@ MacroSecurityTrustedSourcesTP::MacroSecurityTrustedSourcesTP(Window* _pParent, M static long aTabs[] = { 3, 0, 0, 0 }; m_pTrustCertLB->SetTabs( aTabs ); - OUStringBuffer aBuf(get("to")->GetText()); - aBuf.append("\t").append(get("by")->GetText()) - .append("\t").append(get("date")->GetText()); - m_pTrustCertLB->InsertHeaderEntry(aBuf.makeStringAndClear()); + m_pTrustCertLB->InsertHeaderEntry(get("to")->GetText() + "\t" + + get("by")->GetText() + "\t" + get("date")->GetText()); m_pTrustCertLB->SetSelectHdl( LINK( this, MacroSecurityTrustedSourcesTP, TrustCertLBSelectHdl ) ); m_pViewCertPB->SetClickHdl( LINK( this, MacroSecurityTrustedSourcesTP, ViewCertPBHdl ) ); diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx index d9279b1fa335..cc2702e9f153 100644 --- a/xmlsecurity/source/dialogs/resourcemanager.cxx +++ b/xmlsecurity/source/dialogs/resourcemanager.cxx @@ -62,10 +62,8 @@ namespace XmlSec // String with date and time information (#i20172#) DateTime aDT( GetDateTime( _rDT ) ); const LocaleDataWrapper& rLoDa = GetLocaleData(); - OUStringBuffer sRet( rLoDa.getDate( aDT ) ); - sRet.append( ' ' ); - sRet.append( rLoDa.getTime( aDT ) ); - return sRet.makeStringAndClear(); + + return rLoDa.getDate( aDT ) + " " + rLoDa.getTime( aDT ); } OUString GetDateString( const ::com::sun::star::util::DateTime& _rDT ) @@ -95,9 +93,7 @@ namespace XmlSec s2.append(static_cast('\n')); } s1.append(i->second); - s2.append(i->first); - s2.append(sEqual); - s2.append(i->second); + s2.append(i->first + sEqual + i->second); } return make_pair(s1.makeStringAndClear(), s2.makeStringAndClear()); } diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx index 37188d6db948..379ac70d119e 100644 --- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx +++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx @@ -313,16 +313,11 @@ bool nsscrypto_initialize( const css::uno::Reference< css::uno::XComponentContex if (::osl::File::E_None == ::osl::File::getSystemPathFromFileURL(rootModule, rootModulePath)) { OString ospath = OUStringToOString(rootModulePath, osl_getThreadTextEncoding()); - OStringBuffer pkcs11moduleSpec; - pkcs11moduleSpec.append("name=\""); - pkcs11moduleSpec.append(ROOT_CERTS); - pkcs11moduleSpec.append("\" library=\""); - pkcs11moduleSpec.append(ospath.getStr()); - pkcs11moduleSpec.append("\""); + OString aStr = "name=\"" ROOT_CERTS "\" library=\"" + ospath + "\""; SECMODModule * RootsModule = SECMOD_LoadUserModule( - const_cast(pkcs11moduleSpec.makeStringAndClear().getStr()), + const_cast(aStr.getStr()), 0, // no parent PR_FALSE); // do not recurse diff --git a/xmlsecurity/workben/signaturetest.cxx b/xmlsecurity/workben/signaturetest.cxx index 1346ac3673e3..4d1a6f4397a3 100644 --- a/xmlsecurity/workben/signaturetest.cxx +++ b/xmlsecurity/workben/signaturetest.cxx @@ -296,13 +296,12 @@ IMPL_LINK_NOARG(MyWin, VerifyDigitalSignaturesHdl) for ( int n = 0; n < nInfos; n++ ) { security::DocumentSignatureInformation& rInf = aInfos[n]; - OUStringBuffer aText( "The document is signed by\n\n " ); - aText.append( rInf.Signer->getSubjectName() ); - aText.append( "\n\n The signature is " ); + OUString aText = "The document is signed by\n\n " + rInf.Signer->getSubjectName() + + "\n\n The signature is "; if ( !rInf.SignatureIsValid ) aText.append( "NOT " ); aText.append( "valid" ); - InfoBox( this, aText.makeStringAndClear() ).Execute(); + InfoBox( this, aText ).Execute(); } return 0; -- cgit