[Libreoffice-commits] core.git: xmlsecurity/source
Noel Grandin
noel at peralex.com
Thu Nov 7 10:29:05 CET 2013
xmlsecurity/source/component/certificatecontainer.cxx | 2 +-
xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx | 4 ++--
xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx | 2 +-
xmlsecurity/source/helper/documentsignaturehelper.cxx | 6 +++---
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx | 2 +-
xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx | 2 +-
xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx | 2 +-
xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx | 2 +-
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 2 +-
xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx | 2 +-
xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx | 2 +-
xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx | 2 +-
12 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 0121f632ef72bbdb0167ec8520a9bdf0a275274e
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 31 13:04:01 2013 +0200
remove unnecessary use of OUString constructor in XMLSECURITY module
Change-Id: I95b0eda83c60456f3db267183030fe5f6cd70bc4
diff --git a/xmlsecurity/source/component/certificatecontainer.cxx b/xmlsecurity/source/component/certificatecontainer.cxx
index a1bd01b..db51de9 100644
--- a/xmlsecurity/source/component/certificatecontainer.cxx
+++ b/xmlsecurity/source/component/certificatecontainer.cxx
@@ -114,7 +114,7 @@ CertificateContainer::impl_getStaticSupportedServiceNames( )
throw(::com::sun::star::uno::RuntimeException)
{
Sequence< OUString > aRet(1);
- *aRet.getArray() = OUString("com.sun.star.security.CertificateContainer");
+ aRet[0] = "com.sun.star.security.CertificateContainer";
return aRet;
}
diff --git a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx
index 540f6d5..5686ae7 100644
--- a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx
+++ b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx
@@ -103,8 +103,8 @@ Sequence< OUString > SAL_CALL XMLEncryptionTemplateImpl :: getSupportedServiceNa
Sequence< OUString > XMLEncryptionTemplateImpl :: impl_getSupportedServiceNames() {
::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
Sequence< OUString > seqServiceNames( 1 ) ;
- seqServiceNames.getArray()[0] = OUString("com.sun.star.xml.crypto.XMLEncryptionTemplate") ;
- return seqServiceNames ;
+ seqServiceNames[0] = "com.sun.star.xml.crypto.XMLEncryptionTemplate";
+ return seqServiceNames;
}
OUString XMLEncryptionTemplateImpl :: impl_getImplementationName() throw( RuntimeException ) {
diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
index 4e095e0..a0d1a81 100644
--- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
+++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
@@ -129,7 +129,7 @@ Sequence< OUString > SAL_CALL XMLSignatureTemplateImpl :: getSupportedServiceNam
Sequence< OUString > XMLSignatureTemplateImpl :: impl_getSupportedServiceNames() {
::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
Sequence< OUString > seqServiceNames( 1 ) ;
- seqServiceNames.getArray()[0] = OUString("com.sun.star.xml.crypto.XMLSignatureTemplate") ;
+ seqServiceNames[0] = "com.sun.star.xml.crypto.XMLSignatureTemplate";
return seqServiceNames ;
}
diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx
index 2cb069a..11f6c6e 100644
--- a/xmlsecurity/source/helper/documentsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx
@@ -212,7 +212,7 @@ DocumentSignatureHelper::CreateElementList(
; // Doesn't have to exist...
}
// 3) OLE....
- aSubStorageName = OUString("ObjectReplacements");
+ aSubStorageName = "ObjectReplacements";
try
{
Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ );
@@ -261,7 +261,7 @@ DocumentSignatureHelper::CreateElementList(
}
// 2) Dialogs
- aSubStorageName = OUString("Dialogs") ;
+ aSubStorageName = "Dialogs";
try
{
Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ );
@@ -272,7 +272,7 @@ DocumentSignatureHelper::CreateElementList(
; // Doesn't have to exist...
}
// 3) Scripts
- aSubStorageName = OUString("Scripts") ;
+ aSubStorageName = "Scripts";
try
{
Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ );
diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
index 1067a6c..a459894 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
@@ -199,7 +199,7 @@ Sequence< OUString > SAL_CALL SecurityEnvironment_MSCryptImpl :: getSupportedSer
Sequence< OUString > SecurityEnvironment_MSCryptImpl :: impl_getSupportedServiceNames() {
::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
Sequence< OUString > seqServiceNames( 1 ) ;
- seqServiceNames.getArray()[0] = OUString("com.sun.star.xml.crypto.SecurityEnvironment") ;
+ seqServiceNames[0] = "com.sun.star.xml.crypto.SecurityEnvironment";
return seqServiceNames ;
}
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
index 72cc571..7b92f86 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
@@ -344,7 +344,7 @@ Sequence< OUString > SAL_CALL XMLEncryption_MSCryptImpl :: getSupportedServiceNa
Sequence< OUString > XMLEncryption_MSCryptImpl :: impl_getSupportedServiceNames() {
::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
Sequence< OUString > seqServiceNames( 1 ) ;
- seqServiceNames.getArray()[0] = OUString("com.sun.star.xml.crypto.XMLEncryption") ;
+ seqServiceNames[0] = "com.sun.star.xml.crypto.XMLEncryption";
return seqServiceNames ;
}
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
index 599bd0a..53307a7 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
@@ -141,7 +141,7 @@ Sequence< OUString > SAL_CALL XMLSecurityContext_MSCryptImpl :: getSupportedServ
Sequence< OUString > XMLSecurityContext_MSCryptImpl :: impl_getSupportedServiceNames() {
::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
Sequence< OUString > seqServiceNames( 1 ) ;
- seqServiceNames.getArray()[0] = OUString("com.sun.star.xml.crypto.XMLSecurityContext") ;
+ seqServiceNames[0] = "com.sun.star.xml.crypto.XMLSecurityContext";
return seqServiceNames ;
}
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
index 9e90863..88f2861 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
@@ -273,7 +273,7 @@ Sequence< OUString > SAL_CALL XMLSignature_MSCryptImpl :: getSupportedServiceNam
Sequence< OUString > XMLSignature_MSCryptImpl :: impl_getSupportedServiceNames() {
::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
Sequence< OUString > seqServiceNames( 1 ) ;
- seqServiceNames.getArray()[0] = OUString("com.sun.star.xml.crypto.XMLSignature") ;
+ seqServiceNames[0] = "com.sun.star.xml.crypto.XMLSignature";
return seqServiceNames ;
}
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index 42202d4..3403d15 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -180,7 +180,7 @@ Sequence< OUString > SAL_CALL SecurityEnvironment_NssImpl :: getSupportedService
Sequence< OUString > SecurityEnvironment_NssImpl :: impl_getSupportedServiceNames() {
::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
Sequence< OUString > seqServiceNames( 1 ) ;
- seqServiceNames.getArray()[0] = OUString("com.sun.star.xml.crypto.SecurityEnvironment") ;
+ seqServiceNames[0] = "com.sun.star.xml.crypto.SecurityEnvironment";
return seqServiceNames ;
}
diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
index 86d6c80..7519362 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
@@ -331,7 +331,7 @@ Sequence< OUString > SAL_CALL XMLEncryption_NssImpl :: getSupportedServiceNames(
Sequence< OUString > XMLEncryption_NssImpl :: impl_getSupportedServiceNames() {
::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
Sequence< OUString > seqServiceNames( 1 ) ;
- seqServiceNames.getArray()[0] = OUString("com.sun.star.xml.crypto.XMLEncryption") ;
+ seqServiceNames[0] = "com.sun.star.xml.crypto.XMLEncryption";
return seqServiceNames ;
}
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
index 3ded9ab..7d1e669 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
@@ -154,7 +154,7 @@ Sequence< OUString > SAL_CALL XMLSecurityContext_NssImpl :: getSupportedServiceN
Sequence< OUString > XMLSecurityContext_NssImpl :: impl_getSupportedServiceNames() {
::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
Sequence< OUString > seqServiceNames( 1 ) ;
- seqServiceNames.getArray()[0] = OUString("com.sun.star.xml.crypto.XMLSecurityContext") ;
+ seqServiceNames[0] = "com.sun.star.xml.crypto.XMLSecurityContext";
return seqServiceNames ;
}
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
index 11c5a8f..3362952 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
@@ -296,7 +296,7 @@ Sequence< OUString > SAL_CALL XMLSignature_NssImpl :: getSupportedServiceNames()
Sequence< OUString > XMLSignature_NssImpl :: impl_getSupportedServiceNames() {
::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
Sequence< OUString > seqServiceNames( 1 ) ;
- seqServiceNames.getArray()[0] = OUString("com.sun.star.xml.crypto.XMLSignature") ;
+ seqServiceNames[0] = "com.sun.star.xml.crypto.XMLSignature";
return seqServiceNames ;
}
More information about the Libreoffice-commits
mailing list