Kaydet (Commit) 0121f632 authored tarafından Noel Grandin's avatar Noel Grandin

remove unnecessary use of OUString constructor in XMLSECURITY module

Change-Id: I95b0eda83c60456f3db267183030fe5f6cd70bc4
üst cc79b16a
...@@ -114,7 +114,7 @@ CertificateContainer::impl_getStaticSupportedServiceNames( ) ...@@ -114,7 +114,7 @@ CertificateContainer::impl_getStaticSupportedServiceNames( )
throw(::com::sun::star::uno::RuntimeException) throw(::com::sun::star::uno::RuntimeException)
{ {
Sequence< OUString > aRet(1); Sequence< OUString > aRet(1);
*aRet.getArray() = OUString("com.sun.star.security.CertificateContainer"); aRet[0] = "com.sun.star.security.CertificateContainer";
return aRet; return aRet;
} }
......
...@@ -103,8 +103,8 @@ Sequence< OUString > SAL_CALL XMLEncryptionTemplateImpl :: getSupportedServiceNa ...@@ -103,8 +103,8 @@ Sequence< OUString > SAL_CALL XMLEncryptionTemplateImpl :: getSupportedServiceNa
Sequence< OUString > XMLEncryptionTemplateImpl :: impl_getSupportedServiceNames() { Sequence< OUString > XMLEncryptionTemplateImpl :: impl_getSupportedServiceNames() {
::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ; ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
Sequence< OUString > seqServiceNames( 1 ) ; Sequence< OUString > seqServiceNames( 1 ) ;
seqServiceNames.getArray()[0] = OUString("com.sun.star.xml.crypto.XMLEncryptionTemplate") ; seqServiceNames[0] = "com.sun.star.xml.crypto.XMLEncryptionTemplate";
return seqServiceNames ; return seqServiceNames;
} }
OUString XMLEncryptionTemplateImpl :: impl_getImplementationName() throw( RuntimeException ) { OUString XMLEncryptionTemplateImpl :: impl_getImplementationName() throw( RuntimeException ) {
......
...@@ -129,7 +129,7 @@ Sequence< OUString > SAL_CALL XMLSignatureTemplateImpl :: getSupportedServiceNam ...@@ -129,7 +129,7 @@ Sequence< OUString > SAL_CALL XMLSignatureTemplateImpl :: getSupportedServiceNam
Sequence< OUString > XMLSignatureTemplateImpl :: impl_getSupportedServiceNames() { Sequence< OUString > XMLSignatureTemplateImpl :: impl_getSupportedServiceNames() {
::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ; ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
Sequence< OUString > seqServiceNames( 1 ) ; Sequence< OUString > seqServiceNames( 1 ) ;
seqServiceNames.getArray()[0] = OUString("com.sun.star.xml.crypto.XMLSignatureTemplate") ; seqServiceNames[0] = "com.sun.star.xml.crypto.XMLSignatureTemplate";
return seqServiceNames ; return seqServiceNames ;
} }
......
...@@ -212,7 +212,7 @@ DocumentSignatureHelper::CreateElementList( ...@@ -212,7 +212,7 @@ DocumentSignatureHelper::CreateElementList(
; // Doesn't have to exist... ; // Doesn't have to exist...
} }
// 3) OLE.... // 3) OLE....
aSubStorageName = OUString("ObjectReplacements"); aSubStorageName = "ObjectReplacements";
try try
{ {
Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ ); Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ );
...@@ -261,7 +261,7 @@ DocumentSignatureHelper::CreateElementList( ...@@ -261,7 +261,7 @@ DocumentSignatureHelper::CreateElementList(
} }
// 2) Dialogs // 2) Dialogs
aSubStorageName = OUString("Dialogs") ; aSubStorageName = "Dialogs";
try try
{ {
Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ ); Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ );
...@@ -272,7 +272,7 @@ DocumentSignatureHelper::CreateElementList( ...@@ -272,7 +272,7 @@ DocumentSignatureHelper::CreateElementList(
; // Doesn't have to exist... ; // Doesn't have to exist...
} }
// 3) Scripts // 3) Scripts
aSubStorageName = OUString("Scripts") ; aSubStorageName = "Scripts";
try try
{ {
Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ ); Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ );
......
...@@ -199,7 +199,7 @@ Sequence< OUString > SAL_CALL SecurityEnvironment_MSCryptImpl :: getSupportedSer ...@@ -199,7 +199,7 @@ Sequence< OUString > SAL_CALL SecurityEnvironment_MSCryptImpl :: getSupportedSer
Sequence< OUString > SecurityEnvironment_MSCryptImpl :: impl_getSupportedServiceNames() { Sequence< OUString > SecurityEnvironment_MSCryptImpl :: impl_getSupportedServiceNames() {
::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ; ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
Sequence< OUString > seqServiceNames( 1 ) ; Sequence< OUString > seqServiceNames( 1 ) ;
seqServiceNames.getArray()[0] = OUString("com.sun.star.xml.crypto.SecurityEnvironment") ; seqServiceNames[0] = "com.sun.star.xml.crypto.SecurityEnvironment";
return seqServiceNames ; return seqServiceNames ;
} }
......
...@@ -344,7 +344,7 @@ Sequence< OUString > SAL_CALL XMLEncryption_MSCryptImpl :: getSupportedServiceNa ...@@ -344,7 +344,7 @@ Sequence< OUString > SAL_CALL XMLEncryption_MSCryptImpl :: getSupportedServiceNa
Sequence< OUString > XMLEncryption_MSCryptImpl :: impl_getSupportedServiceNames() { Sequence< OUString > XMLEncryption_MSCryptImpl :: impl_getSupportedServiceNames() {
::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ; ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
Sequence< OUString > seqServiceNames( 1 ) ; Sequence< OUString > seqServiceNames( 1 ) ;
seqServiceNames.getArray()[0] = OUString("com.sun.star.xml.crypto.XMLEncryption") ; seqServiceNames[0] = "com.sun.star.xml.crypto.XMLEncryption";
return seqServiceNames ; return seqServiceNames ;
} }
......
...@@ -141,7 +141,7 @@ Sequence< OUString > SAL_CALL XMLSecurityContext_MSCryptImpl :: getSupportedServ ...@@ -141,7 +141,7 @@ Sequence< OUString > SAL_CALL XMLSecurityContext_MSCryptImpl :: getSupportedServ
Sequence< OUString > XMLSecurityContext_MSCryptImpl :: impl_getSupportedServiceNames() { Sequence< OUString > XMLSecurityContext_MSCryptImpl :: impl_getSupportedServiceNames() {
::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ; ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
Sequence< OUString > seqServiceNames( 1 ) ; Sequence< OUString > seqServiceNames( 1 ) ;
seqServiceNames.getArray()[0] = OUString("com.sun.star.xml.crypto.XMLSecurityContext") ; seqServiceNames[0] = "com.sun.star.xml.crypto.XMLSecurityContext";
return seqServiceNames ; return seqServiceNames ;
} }
......
...@@ -273,7 +273,7 @@ Sequence< OUString > SAL_CALL XMLSignature_MSCryptImpl :: getSupportedServiceNam ...@@ -273,7 +273,7 @@ Sequence< OUString > SAL_CALL XMLSignature_MSCryptImpl :: getSupportedServiceNam
Sequence< OUString > XMLSignature_MSCryptImpl :: impl_getSupportedServiceNames() { Sequence< OUString > XMLSignature_MSCryptImpl :: impl_getSupportedServiceNames() {
::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ; ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
Sequence< OUString > seqServiceNames( 1 ) ; Sequence< OUString > seqServiceNames( 1 ) ;
seqServiceNames.getArray()[0] = OUString("com.sun.star.xml.crypto.XMLSignature") ; seqServiceNames[0] = "com.sun.star.xml.crypto.XMLSignature";
return seqServiceNames ; return seqServiceNames ;
} }
......
...@@ -180,7 +180,7 @@ Sequence< OUString > SAL_CALL SecurityEnvironment_NssImpl :: getSupportedService ...@@ -180,7 +180,7 @@ Sequence< OUString > SAL_CALL SecurityEnvironment_NssImpl :: getSupportedService
Sequence< OUString > SecurityEnvironment_NssImpl :: impl_getSupportedServiceNames() { Sequence< OUString > SecurityEnvironment_NssImpl :: impl_getSupportedServiceNames() {
::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ; ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
Sequence< OUString > seqServiceNames( 1 ) ; Sequence< OUString > seqServiceNames( 1 ) ;
seqServiceNames.getArray()[0] = OUString("com.sun.star.xml.crypto.SecurityEnvironment") ; seqServiceNames[0] = "com.sun.star.xml.crypto.SecurityEnvironment";
return seqServiceNames ; return seqServiceNames ;
} }
......
...@@ -331,7 +331,7 @@ Sequence< OUString > SAL_CALL XMLEncryption_NssImpl :: getSupportedServiceNames( ...@@ -331,7 +331,7 @@ Sequence< OUString > SAL_CALL XMLEncryption_NssImpl :: getSupportedServiceNames(
Sequence< OUString > XMLEncryption_NssImpl :: impl_getSupportedServiceNames() { Sequence< OUString > XMLEncryption_NssImpl :: impl_getSupportedServiceNames() {
::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ; ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
Sequence< OUString > seqServiceNames( 1 ) ; Sequence< OUString > seqServiceNames( 1 ) ;
seqServiceNames.getArray()[0] = OUString("com.sun.star.xml.crypto.XMLEncryption") ; seqServiceNames[0] = "com.sun.star.xml.crypto.XMLEncryption";
return seqServiceNames ; return seqServiceNames ;
} }
......
...@@ -154,7 +154,7 @@ Sequence< OUString > SAL_CALL XMLSecurityContext_NssImpl :: getSupportedServiceN ...@@ -154,7 +154,7 @@ Sequence< OUString > SAL_CALL XMLSecurityContext_NssImpl :: getSupportedServiceN
Sequence< OUString > XMLSecurityContext_NssImpl :: impl_getSupportedServiceNames() { Sequence< OUString > XMLSecurityContext_NssImpl :: impl_getSupportedServiceNames() {
::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ; ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
Sequence< OUString > seqServiceNames( 1 ) ; Sequence< OUString > seqServiceNames( 1 ) ;
seqServiceNames.getArray()[0] = OUString("com.sun.star.xml.crypto.XMLSecurityContext") ; seqServiceNames[0] = "com.sun.star.xml.crypto.XMLSecurityContext";
return seqServiceNames ; return seqServiceNames ;
} }
......
...@@ -296,7 +296,7 @@ Sequence< OUString > SAL_CALL XMLSignature_NssImpl :: getSupportedServiceNames() ...@@ -296,7 +296,7 @@ Sequence< OUString > SAL_CALL XMLSignature_NssImpl :: getSupportedServiceNames()
Sequence< OUString > XMLSignature_NssImpl :: impl_getSupportedServiceNames() { Sequence< OUString > XMLSignature_NssImpl :: impl_getSupportedServiceNames() {
::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ; ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
Sequence< OUString > seqServiceNames( 1 ) ; Sequence< OUString > seqServiceNames( 1 ) ;
seqServiceNames.getArray()[0] = OUString("com.sun.star.xml.crypto.XMLSignature") ; seqServiceNames[0] = "com.sun.star.xml.crypto.XMLSignature";
return seqServiceNames ; return seqServiceNames ;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment