[Libreoffice-commits] core.git: xmlsecurity/source xmlsecurity/workben
Jelle van der Waa
jelle at vdwaa.nl
Sun Aug 18 06:54:15 PDT 2013
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(-)
New commits:
commit b5e5ce956b463e90bb65ad99cefca33b9b0b13bf
Author: Jelle van der Waa <jelle at vdwaa.nl>
Date: Sat Aug 17 01:11:11 2013 +0200
fdo#57950: Remove some chained appends in xmlsecurity
Change-Id: I35ac622abb995a9259f0774f463ec2816b3668b6
Reviewed-on: https://gerrit.libreoffice.org/5477
Reviewed-by: Andrzej J.R. Hunt <andrzej at ahunt.org>
Tested-by: Andrzej J.R. Hunt <andrzej at ahunt.org>
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx
index d339cde..aa82917 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<FixedText>("issuedto")->GetText())
- .append("\t").append(get<FixedText>("issuedby")->GetText())
- .append("\t").append(get<FixedText>("expiration")->GetText());
- m_pCertLB->InsertHeaderEntry(sHeader.makeStringAndClear());
-
+ m_pCertLB->InsertHeaderEntry(get<FixedText>("issuedto")->GetText() + "\t" + get<FixedText>("issuedby")->GetText()
+ + "\t" + get<FixedText>("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 866a0de..033b026 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<FixedText>("signed")->GetText())
- .append("\t").append(get<FixedText>("issued")->GetText())
- .append("\t").append(get<FixedText>("date")->GetText());
- m_pSignaturesLB->InsertHeaderEntry(sHeader.makeStringAndClear());
+ m_pSignaturesLB->InsertHeaderEntry("\t" + get<FixedText>("signed")->GetText() + "\t"
+ + get<FixedText>("issued")->GetText() + "\t" + get<FixedText>("date")->GetText());
mbVerifySignatures = true;
mbSignaturesChanged = false;
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index 4ae1f48..70d03c7 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<FixedText>("to")->GetText());
- aBuf.append("\t").append(get<FixedText>("by")->GetText())
- .append("\t").append(get<FixedText>("date")->GetText());
- m_pTrustCertLB->InsertHeaderEntry(aBuf.makeStringAndClear());
+ m_pTrustCertLB->InsertHeaderEntry(get<FixedText>("to")->GetText() + "\t"
+ + get<FixedText>("by")->GetText() + "\t" + get<FixedText>("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 d9279b1..cc2702e 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<sal_Unicode>('\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 37188d6..379ac70 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<char*>(pkcs11moduleSpec.makeStringAndClear().getStr()),
+ const_cast<char*>(aStr.getStr()),
0, // no parent
PR_FALSE); // do not recurse
diff --git a/xmlsecurity/workben/signaturetest.cxx b/xmlsecurity/workben/signaturetest.cxx
index 1346ac3..4d1a6f4 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;
More information about the Libreoffice-commits
mailing list