targeted string re-work

Change-Id: I6ce76c22118586b213161a0e307a53b22b318004

25 files changed, 114 insertions, 116 deletions

diff --git a/xmlsecurity/source/component/certificatecontainer.cxx b/xmlsecurity/source/component/certificatecontainer.cxx
index 35e2acafbcad..c4eec2d216b9 100644
--- a/xmlsecurity/source/component/certificatecontainer.cxx
+++ b/xmlsecurity/source/component/certificatecontainer.cxx
@@ -134,7 +134,7 @@ CertificateContainer::impl_getStaticSupportedServiceNames(  )
     throw(::com::sun::star::uno::RuntimeException)
 {
     Sequence< ::rtl::OUString > aRet(1);
-    *aRet.getArray() = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.security.CertificateContainer"));
+    *aRet.getArray() = ::rtl::OUString("com.sun.star.security.CertificateContainer");
     return aRet;
 }
 
@@ -144,7 +144,7 @@ CertificateContainer::impl_getStaticSupportedServiceNames(  )
 CertificateContainer::impl_getStaticImplementationName()
     throw(::com::sun::star::uno::RuntimeException)
 {
-    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.security.CertificateContainer"));
+    return ::rtl::OUString("com.sun.star.security.CertificateContainer");
 }
 
 //-------------------------------------------------------------------------
diff --git a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx
index 1dedd518776a..2b031b0b2537 100644
--- a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx
+++ b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx
@@ -119,12 +119,12 @@ 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(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLEncryptionTemplate")) ;
+    seqServiceNames.getArray()[0] = OUString("com.sun.star.xml.crypto.XMLEncryptionTemplate") ;
     return seqServiceNames ;
 }
 
 OUString XMLEncryptionTemplateImpl :: impl_getImplementationName() throw( RuntimeException ) {
-    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.framework.XMLEncryptionTemplateImpl")) ;
+    return OUString("com.sun.star.xml.security.framework.XMLEncryptionTemplateImpl") ;
 }
 
 //Helper for registry
diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
index d5c15c1a0f11..61b65d8d892e 100644
--- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
+++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
@@ -144,12 +144,12 @@ 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(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLSignatureTemplate")) ;
+    seqServiceNames.getArray()[0] = OUString("com.sun.star.xml.crypto.XMLSignatureTemplate") ;
     return seqServiceNames ;
 }
 
 OUString XMLSignatureTemplateImpl :: impl_getImplementationName() throw( RuntimeException ) {
-    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.framework.XMLSignatureTemplateImpl")) ;
+    return OUString("com.sun.star.xml.security.framework.XMLSignatureTemplateImpl") ;
 }
 
 //Helper for registry
diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx
index 8b10f0307b85..66c0d71356b5 100644
--- a/xmlsecurity/source/helper/documentsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx
@@ -91,9 +91,9 @@ void ImplFillElementList(
     const ::rtl::OUString rRootStorageName, const bool bRecursive,
     const DocumentSignatureAlgorithm mode)
 {
-    ::rtl::OUString aMetaInfName( RTL_CONSTASCII_USTRINGPARAM( "META-INF" ) );
-    ::rtl::OUString sMimeTypeName (RTL_CONSTASCII_USTRINGPARAM("mimetype"));
-    ::rtl::OUString aSep( RTL_CONSTASCII_USTRINGPARAM( "/" ) );
+    ::rtl::OUString aMetaInfName(  "META-INF"  );
+    ::rtl::OUString sMimeTypeName ("mimetype");
+    ::rtl::OUString aSep(  "/"  );
 
     Reference < css::container::XNameAccess > xElements( rxStore, UNO_QUERY );
     Sequence< ::rtl::OUString > aElements = xElements->getElementNames();
@@ -115,7 +115,7 @@ void ImplFillElementList(
                 rtl_UriEncodeStrict, RTL_TEXTENCODING_UTF8);
             if (sEncName.isEmpty() && !pNames[n].isEmpty())
                 throw css::uno::Exception(::rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM("Failed to encode element name of XStorage")), 0);
+                "Failed to encode element name of XStorage"), 0);
 
             if ( rxStore->isStreamElement( pNames[n] ) )
             {
@@ -149,7 +149,7 @@ bool DocumentSignatureHelper::isODFPre_1_2(const ::rtl::OUString & sVersion)
 
 bool DocumentSignatureHelper::isOOo3_2_Signature(const SignatureInformation & sigInfo)
 {
-    ::rtl::OUString sManifestURI(RTL_CONSTASCII_USTRINGPARAM("META-INF/manifest.xml"));
+    ::rtl::OUString sManifestURI("META-INF/manifest.xml");
     bool bOOo3_2 = false;
     typedef ::std::vector< SignatureReferenceInformation >::const_iterator CIT;
     for (CIT i = sigInfo.vSignatureReferenceInfors.begin();
@@ -202,7 +202,7 @@ DocumentSignatureHelper::CreateElementList(
     const DocumentSignatureAlgorithm mode)
 {
     std::vector< rtl::OUString > aElements;
-    ::rtl::OUString aSep( RTL_CONSTASCII_USTRINGPARAM( "/" ) );
+    ::rtl::OUString aSep(  "/"  );
 
     switch ( eMode )
     {
@@ -214,7 +214,7 @@ DocumentSignatureHelper::CreateElementList(
                 ImplFillElementList(aElements, rxStore, ::rtl::OUString(), false, mode);
 
                 // 2) Pictures...
-                rtl::OUString aSubStorageName( RTL_CONSTASCII_USTRINGPARAM("Pictures") );
+                rtl::OUString aSubStorageName( "Pictures" );
                 try
                 {
                     Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ );
@@ -225,7 +225,7 @@ DocumentSignatureHelper::CreateElementList(
                     ; // Doesn't have to exist...
                 }
                 // 3) OLE....
-                aSubStorageName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ObjectReplacements"));
+                aSubStorageName = rtl::OUString("ObjectReplacements");
                 try
                 {
                     Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ );
@@ -233,7 +233,7 @@ DocumentSignatureHelper::CreateElementList(
                     xSubStore.clear();
 
                     // Object folders...
-                    rtl::OUString aMatchStr( RTL_CONSTASCII_USTRINGPARAM("Object ") );
+                    rtl::OUString aMatchStr( "Object " );
                     Reference < css::container::XNameAccess > xElements( rxStore, UNO_QUERY );
                     Sequence< ::rtl::OUString > aElementNames = xElements->getElementNames();
                     sal_Int32 nElements = aElementNames.getLength();
@@ -262,7 +262,7 @@ DocumentSignatureHelper::CreateElementList(
         case SignatureModeMacros:
         {
             // 1) Macros
-            rtl::OUString aSubStorageName( RTL_CONSTASCII_USTRINGPARAM("Basic") );
+            rtl::OUString aSubStorageName( "Basic" );
             try
             {
                 Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ );
@@ -274,7 +274,7 @@ DocumentSignatureHelper::CreateElementList(
             }
 
             // 2) Dialogs
-            aSubStorageName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Dialogs")) ;
+            aSubStorageName = rtl::OUString("Dialogs") ;
             try
             {
                 Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ );
@@ -285,7 +285,7 @@ DocumentSignatureHelper::CreateElementList(
                 ; // Doesn't have to exist...
             }
             // 3) Scripts
-            aSubStorageName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scripts")) ;
+            aSubStorageName = rtl::OUString("Scripts") ;
             try
             {
                 Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ );
@@ -319,7 +319,7 @@ SignatureStreamHelper DocumentSignatureHelper::OpenSignatureStream(
 
     try
     {
-        ::rtl::OUString aSIGStoreName( RTL_CONSTASCII_USTRINGPARAM( "META-INF" ) );
+        ::rtl::OUString aSIGStoreName(  "META-INF"  );
         aHelper.xSignatureStorage = rxStore->openStorageElement( aSIGStoreName, nSubStorageOpenMode );
         if ( aHelper.xSignatureStorage.is() )
         {
@@ -446,17 +446,17 @@ bool DocumentSignatureHelper::equalsReferenceUriManifestPath(
 
 ::rtl::OUString DocumentSignatureHelper::GetDocumentContentSignatureDefaultStreamName()
 {
-    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "documentsignatures.xml" ) );
+    return ::rtl::OUString(  "documentsignatures.xml"  );
 }
 
 ::rtl::OUString DocumentSignatureHelper::GetScriptingContentSignatureDefaultStreamName()
 {
-    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "macrosignatures.xml" ) );
+    return ::rtl::OUString(  "macrosignatures.xml"  );
 }
 
 ::rtl::OUString DocumentSignatureHelper::GetPackageSignatureDefaultStreamName()
 {
-    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "packagesignatures.xml" ) );
+    return ::rtl::OUString(  "packagesignatures.xml"  );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
index f1e5b0cb12ec..fbaea804728f 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
@@ -200,12 +200,12 @@ 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(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.SecurityEnvironment")) ;
+    seqServiceNames.getArray()[0] = OUString("com.sun.star.xml.crypto.SecurityEnvironment") ;
     return seqServiceNames ;
 }
 
 OUString SecurityEnvironment_MSCryptImpl :: impl_getImplementationName() throw( RuntimeException ) {
-    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl")) ;
+    return OUString("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl") ;
 }
 
 //Helper for registry
@@ -1177,7 +1177,7 @@ X509Certificate_MSCryptImpl* MswcryCertContextToXCert( PCCERT_CONTEXT cert )
 
 ::rtl::OUString SecurityEnvironment_MSCryptImpl::getSecurityEnvironmentInformation() throw( ::com::sun::star::uno::RuntimeException )
 {
-    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Microsoft Crypto API"));
+    return rtl::OUString("Microsoft Crypto API");
 }
 
 /* Native methods */
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
index fa8cd71c0a49..05bf52af7bc3 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
@@ -361,12 +361,12 @@ 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(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLEncryption")) ;
+    seqServiceNames.getArray()[0] = OUString("com.sun.star.xml.crypto.XMLEncryption") ;
     return seqServiceNames ;
 }
 
 OUString XMLEncryption_MSCryptImpl :: impl_getImplementationName() throw( RuntimeException ) {
-    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_MSCryptImpl")) ;
+    return OUString("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_MSCryptImpl") ;
 }
 
 //Helper for registry
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
index 1d9f0c0b66b5..b7da6ca26c79 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
@@ -159,12 +159,12 @@ 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(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLSecurityContext")) ;
+    seqServiceNames.getArray()[0] = OUString("com.sun.star.xml.crypto.XMLSecurityContext") ;
     return seqServiceNames ;
 }
 
 OUString XMLSecurityContext_MSCryptImpl :: impl_getImplementationName() throw( RuntimeException ) {
-    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl")) ;
+    return OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl") ;
 }
 
 //Helper for registry
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
index e979d7947990..234bc7371c9b 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
@@ -290,12 +290,12 @@ 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(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLSignature")) ;
+    seqServiceNames.getArray()[0] = OUString("com.sun.star.xml.crypto.XMLSignature") ;
     return seqServiceNames ;
 }
 
 OUString XMLSignature_MSCryptImpl :: impl_getImplementationName() throw( RuntimeException ) {
-    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_MSCryptImpl")) ;
+    return OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_MSCryptImpl") ;
 }
 
 //Helper for registry
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index aa53a607ac46..0b25615ab8a4 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -120,7 +120,7 @@ char* GetPasswordFunction( PK11SlotInfo* pSlot, PRBool bRetry, void* /*arg*/ )
     if ( xMSF.is() )
     {
         uno::Reference < task::XInteractionHandler > xInteractionHandler(
-            xMSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler")) ), uno::UNO_QUERY );
+            xMSF->createInstance( rtl::OUString("com.sun.star.task.InteractionHandler") ), uno::UNO_QUERY );
 
         if ( xInteractionHandler.is() )
         {
@@ -214,12 +214,12 @@ 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(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.SecurityEnvironment")) ;
+    seqServiceNames.getArray()[0] = OUString("com.sun.star.xml.crypto.SecurityEnvironment") ;
     return seqServiceNames ;
 }
 
 OUString SecurityEnvironment_NssImpl :: impl_getImplementationName() throw( RuntimeException ) {
-    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl")) ;
+    return OUString("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl") ;
 }
 
 //Helper for registry
diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
index 513400814616..5a176055bfd6 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
@@ -359,12 +359,12 @@ 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(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLEncryption")) ;
+    seqServiceNames.getArray()[0] = OUString("com.sun.star.xml.crypto.XMLEncryption") ;
     return seqServiceNames ;
 }
 
 OUString XMLEncryption_NssImpl :: impl_getImplementationName() throw( RuntimeException ) {
-    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_NssImpl")) ;
+    return OUString("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_NssImpl") ;
 }
 
 //Helper for registry
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
index b0be09b81eb0..0be3443cd1fc 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
@@ -177,12 +177,12 @@ 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(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLSecurityContext")) ;
+    seqServiceNames.getArray()[0] = OUString("com.sun.star.xml.crypto.XMLSecurityContext") ;
     return seqServiceNames ;
 }
 
 OUString XMLSecurityContext_NssImpl :: impl_getImplementationName() throw( RuntimeException ) {
-    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl")) ;
+    return OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl") ;
 }
 
 //Helper for registry
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
index 68f9064d5867..6184a39a3b0b 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
@@ -319,12 +319,12 @@ 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(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLSignature")) ;
+    seqServiceNames.getArray()[0] = OUString("com.sun.star.xml.crypto.XMLSignature") ;
     return seqServiceNames ;
 }
 
 OUString XMLSignature_NssImpl :: impl_getImplementationName() throw( RuntimeException ) {
-    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_NssImpl")) ;
+    return OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_NssImpl") ;
 }
 
 //Helper for registry
diff --git a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
index 096320806987..9d44e71e5507 100644
--- a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
+++ b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
@@ -67,8 +67,7 @@ class SerialNumberAdapterImpl : public WeakImplHelper1<
 OUString SerialNumberAdapterImpl_getImplementationName()
     throw (RuntimeException)
 {
-    return OUString(RTL_CONSTASCII_USTRINGPARAM(
-        "com.sun.star.security.SerialNumberAdapter"));
+    return OUString( "com.sun.star.security.SerialNumberAdapter");
 }
 
 Sequence< OUString > SerialNumberAdapterImpl_getSupportedServiceNames()
@@ -76,8 +75,7 @@ Sequence< OUString > SerialNumberAdapterImpl_getSupportedServiceNames()
 {
     Sequence < OUString > aRet(1);
     OUString* pArray = aRet.getArray();
-    pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(
-        "com.sun.star.security.SerialNumberAdapter" ) );
+    pArray[0] = OUString( "com.sun.star.security.SerialNumberAdapter"  );
     return aRet;
 }
 
diff --git a/xmlsecurity/tools/standalone/csfit/certmngr.cxx b/xmlsecurity/tools/standalone/csfit/certmngr.cxx
index 82d8d5b9e4e2..fee45be658e3 100644
--- a/xmlsecurity/tools/standalone/csfit/certmngr.cxx
+++ b/xmlsecurity/tools/standalone/csfit/certmngr.cxx
@@ -104,7 +104,7 @@ int SAL_CALL main( int argc, char **argv )
         Reference< XMultiComponentFactory > xManager = NULL ;
         Reference< XComponentContext > xContext = NULL ;
 
-        xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[2] ) ) ;
+        xManager = serviceManager( xContext , OUString("local"), OUString::createFromAscii( argv[2] ) ) ;
         OSL_ENSURE( xManager.is() ,
             "ServicesManager - "
             "Cannot get service manager" ) ;
@@ -112,7 +112,7 @@ int SAL_CALL main( int argc, char **argv )
         //Create security environment
         //Build Security Environment
         Reference< XInterface > xsecenv =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl")), xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl"), xContext ) ;
         OSL_ENSURE( xsecenv.is() ,
             "Signer - "
             "Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ;
diff --git a/xmlsecurity/tools/standalone/csfit/decrypter.cxx b/xmlsecurity/tools/standalone/csfit/decrypter.cxx
index a39352c629ce..a8019720ab55 100644
--- a/xmlsecurity/tools/standalone/csfit/decrypter.cxx
+++ b/xmlsecurity/tools/standalone/csfit/decrypter.cxx
@@ -134,11 +134,11 @@ int SAL_CALL main( int argc, char **argv )
         Reference< XMultiComponentFactory > xManager = NULL ;
         Reference< XComponentContext > xContext = NULL ;
 
-        xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[4] ) ) ;
+        xManager = serviceManager( xContext , OUString("local"), OUString::createFromAscii( argv[4] ) ) ;
 
         //Create encryption template
         Reference< XInterface > tplElement =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl") , xContext ) ;
         OSL_ENSURE( tplElement.is() ,
             "Decryptor - "
             "Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ;
@@ -162,7 +162,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Build XML Encryption template
         Reference< XInterface > enctpl =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLEncryptionTemplate")), xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.crypto.XMLEncryptionTemplate"), xContext ) ;
         OSL_ENSURE( enctpl.is() ,
             "Decryptor - "
             "Cannot get service instance of \"xsec.XMLEncryptionTemplate\"" ) ;
@@ -178,7 +178,7 @@ int SAL_CALL main( int argc, char **argv )
         //Create security environment
         //Build Security Environment
         Reference< XInterface > xsecenv =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl")), xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl"), xContext ) ;
         OSL_ENSURE( xsecenv.is() ,
             "Decryptor - "
             "Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ;
@@ -205,7 +205,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Build XML Security Context
         Reference< XInterface > xmlsecctx =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl")), xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl"), xContext ) ;
         OSL_ENSURE( xmlsecctx.is() ,
             "Decryptor - "
             "Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ;
@@ -220,7 +220,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Get encrypter
         Reference< XInterface > xmlencrypter =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_NssImpl")), xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_NssImpl"), xContext ) ;
         OSL_ENSURE( xmlencrypter.is() ,
             "Decryptor - "
             "Cannot get service instance of \"xsec.XMLEncryption\"" ) ;
diff --git a/xmlsecurity/tools/standalone/csfit/encrypter.cxx b/xmlsecurity/tools/standalone/csfit/encrypter.cxx
index bcf9c275eaaf..31c5b90a3e76 100644
--- a/xmlsecurity/tools/standalone/csfit/encrypter.cxx
+++ b/xmlsecurity/tools/standalone/csfit/encrypter.cxx
@@ -142,11 +142,11 @@ int SAL_CALL main( int argc, char **argv )
         Reference< XMultiComponentFactory > xManager = NULL ;
         Reference< XComponentContext > xContext = NULL ;
 
-        xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[6] ) ) ;
+        xManager = serviceManager( xContext , OUString("local"), OUString::createFromAscii( argv[6] ) ) ;
 
         //Create encryption template
         Reference< XInterface > tplElement =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl") , xContext ) ;
         OSL_ENSURE( tplElement.is() ,
             "Encryptor - "
             "Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ;
@@ -170,7 +170,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Create encryption target element
         Reference< XInterface > tarElement =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl") , xContext ) ;
         OSL_ENSURE( tarElement.is() ,
             "Encryptor - "
             "Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ;
@@ -195,7 +195,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Build XML Encryption template
         Reference< XInterface > enctpl =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLEncryptionTemplate")), xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.crypto.XMLEncryptionTemplate"), xContext ) ;
         OSL_ENSURE( enctpl.is() ,
             "Encryptor - "
             "Cannot get service instance of \"xsec.XMLEncryptionTemplate\"" ) ;
@@ -212,7 +212,7 @@ int SAL_CALL main( int argc, char **argv )
         //Create security environment
         //Build Security Environment
         Reference< XInterface > xsecenv =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl")), xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl"), xContext ) ;
         OSL_ENSURE( xsecenv.is() ,
             "Encryptor - "
             "Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ;
@@ -240,7 +240,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Build XML Security Context
         Reference< XInterface > xmlsecctx =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl")), xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl"), xContext ) ;
         OSL_ENSURE( xmlsecctx.is() ,
             "Encryptor - "
             "Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ;
@@ -254,7 +254,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Get encrypter
         Reference< XInterface > xmlencrypter =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_NssImpl")), xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_NssImpl"), xContext ) ;
         OSL_ENSURE( xmlencrypter.is() ,
             "Encryptor - "
             "Cannot get service instance of \"xsec.XMLEncryption\"" ) ;
diff --git a/xmlsecurity/tools/standalone/csfit/helper.cxx b/xmlsecurity/tools/standalone/csfit/helper.cxx
index ed06f3973d20..777ffa33216b 100644
--- a/xmlsecurity/tools/standalone/csfit/helper.cxx
+++ b/xmlsecurity/tools/standalone/csfit/helper.cxx
@@ -106,7 +106,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
             "serviceManager - "
             "Cannot create simple registry" ) ;
 
-        //xSimpleRegistry->open(OUString(RTL_CONSTASCII_USTRINGPARAM("xmlsecurity.rdb")), sal_False, sal_False);
+        //xSimpleRegistry->open(OUString("xmlsecurity.rdb"), sal_False, sal_False);
         xSimpleRegistry->open(sRdbUrl, sal_True, sal_False);
         OSL_ENSURE( xSimpleRegistry->isValid() ,
             "serviceManager - "
@@ -135,10 +135,10 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
                 "Cannot get multi-service factory" ) ;
 
             Sequence< Any > args( 2 ) ;
-            args[ 0 ] <<= OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL )) ;
-            args[ 1 ] <<= OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE )) ;
+            args[ 0 ] <<= OUString( UCB_CONFIGURATION_KEY1_LOCAL ) ;
+            args[ 1 ] <<= OUString( UCB_CONFIGURATION_KEY2_OFFICE ) ;
             if( ! ::ucb::ContentBroker::initialize( xSvmg , args ) ) {
-                throw RuntimeException( OUString(RTL_CONSTASCII_USTRINGPARAM("Cannot inlitialize ContentBroker")) , Reference< XInterface >() , Any() ) ;
+                throw RuntimeException( OUString("Cannot inlitialize ContentBroker") , Reference< XInterface >() , Any() ) ;
             }
         }
         ********************************************************************/
@@ -157,7 +157,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
             "Cannot create intial service manager" ) ;
 
         Reference< XInterface > urlResolver =
-            xLocalServiceManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.UnoUrlResolver")) , xLocalComponentContext ) ;
+            xLocalServiceManager->createInstanceWithContext( OUString("com.sun.star.bridge.UnoUrlResolver") , xLocalComponentContext ) ;
         OSL_ENSURE( urlResolver.is() ,
             "serviceManager - "
             "Cannot get service instance of \"bridge.UnoUrlResolver\"" ) ;
@@ -181,7 +181,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
             "Cannot get interface of \"XNamingService\" from URL resolver" ) ;
 
         Reference< XInterface > serviceManager =
-            xNamingService->getRegisteredObject( OUString(RTL_CONSTASCII_USTRINGPARAM("StarOffice.ServiceManager")) ) ;
+            xNamingService->getRegisteredObject( OUString("StarOffice.ServiceManager") ) ;
         OSL_ENSURE( serviceManager.is() ,
             "serviceManager - "
             "Cannot get service instance of \"StarOffice.ServiceManager\"" ) ;
@@ -196,7 +196,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
             "serviceManager - "
             "Cannot get interface of \"XPropertySet\" from service \"StarOffice.ServiceManager\"" ) ;
 
-        xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xUsedComponentContext ;
+        xPropSet->getPropertyValue( OUString("DefaultContext") ) >>= xUsedComponentContext ;
         OSL_ENSURE( xUsedComponentContext.is() ,
             "serviceManager - "
             "Cannot create remote component context" ) ;
@@ -211,7 +211,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
             "serviceManager - "
             "Cannot get interface of \"XPropertySet\" from URL resolver" ) ;
 
-        xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xUsedComponentContext ;
+        xPropSet->getPropertyValue( OUString("DefaultContext") ) >>= xUsedComponentContext ;
         OSL_ENSURE( xUsedComponentContext.is() ,
             "serviceManager - "
             "Cannot create remote component context" ) ;
@@ -235,7 +235,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
             "serviceManager - "
             "Cannot get interface of \"XPropertySet\" from service \"StarOffice.ServiceManager\"" ) ;
 
-        xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xUsedComponentContext ;
+        xPropSet->getPropertyValue( OUString("DefaultContext") ) >>= xUsedComponentContext ;
         OSL_ENSURE( xUsedComponentContext.is() ,
             "serviceManager - "
             "Cannot create remote component context" ) ;
diff --git a/xmlsecurity/tools/standalone/csfit/signer.cxx b/xmlsecurity/tools/standalone/csfit/signer.cxx
index 96cf72d2ae71..6b667f815820 100644
--- a/xmlsecurity/tools/standalone/csfit/signer.cxx
+++ b/xmlsecurity/tools/standalone/csfit/signer.cxx
@@ -219,14 +219,14 @@ int SAL_CALL main( int argc, char **argv )
         Reference< XMultiComponentFactory > xManager = NULL ;
         Reference< XComponentContext > xContext = NULL ;
 
-        xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[4] ) ) ;
+        xManager = serviceManager( xContext , OUString("local"), OUString::createFromAscii( argv[4] ) ) ;
         OSL_ENSURE( xManager.is() ,
             "ServicesManager - "
             "Cannot get service manager" ) ;
 
         //Create signature template
         Reference< XInterface > element =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl") , xContext ) ;
         OSL_ENSURE( element.is() ,
             "Signer - "
             "Cannot get service instance of \"wrapper.XMLElementWrapper\"" ) ;
@@ -251,7 +251,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Build XML Signature template
         Reference< XInterface > signtpl =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLSignatureTemplate")) , xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.crypto.XMLSignatureTemplate") , xContext ) ;
         OSL_ENSURE( signtpl.is() ,
             "Signer - "
             "Cannot get service instance of \"xsec.XMLSignatureTemplate\"" ) ;
@@ -271,7 +271,7 @@ int SAL_CALL main( int argc, char **argv )
         //Create security environment
         //Build Security Environment
         Reference< XInterface > xsecenv =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl")), xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl"), xContext ) ;
         OSL_ENSURE( xsecenv.is() ,
             "Signer - "
             "Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ;
@@ -297,7 +297,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Build XML Security Context
         Reference< XInterface > xmlsecctx =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl")), xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl"), xContext ) ;
         OSL_ENSURE( xsecenv.is() ,
             "Signer - "
             "Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ;
@@ -311,7 +311,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Generate XML signature
         Reference< XInterface > xmlsigner =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_NssImpl")), xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_NssImpl"), xContext ) ;
         OSL_ENSURE( xmlsigner.is() ,
             "Signer - "
             "Cannot get service instance of \"xsec.XMLSignature\"" ) ;
diff --git a/xmlsecurity/tools/standalone/csfit/verifier.cxx b/xmlsecurity/tools/standalone/csfit/verifier.cxx
index a624f793eefd..b2acd1b373ee 100644
--- a/xmlsecurity/tools/standalone/csfit/verifier.cxx
+++ b/xmlsecurity/tools/standalone/csfit/verifier.cxx
@@ -206,11 +206,11 @@ int SAL_CALL main( int argc, char **argv )
         Reference< XMultiComponentFactory > xManager = NULL ;
         Reference< XComponentContext > xContext = NULL ;
 
-        xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")),  OUString::createFromAscii( argv[3] ) ) ;
+        xManager = serviceManager( xContext , OUString("local"),  OUString::createFromAscii( argv[3] ) ) ;
 
         //Create signature template
         Reference< XInterface > element =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl") , xContext ) ;
         OSL_ENSURE( element.is() ,
             "Verifier - "
             "Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ;
@@ -235,7 +235,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Build XML Signature template
         Reference< XInterface > signtpl =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLSignatureTemplate")), xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.crypto.XMLSignatureTemplate"), xContext ) ;
         OSL_ENSURE( signtpl.is() ,
             "Verifier - "
             "Cannot get service instance of \"xsec.XMLSignatureTemplate\"" ) ;
@@ -255,7 +255,7 @@ int SAL_CALL main( int argc, char **argv )
         //Create security environment
         //Build Security Environment
         Reference< XInterface > xsecenv =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl")), xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl"), xContext ) ;
         OSL_ENSURE( xsecenv.is() ,
             "Verifier - "
             "Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ;
@@ -281,7 +281,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Build XML Security Context
         Reference< XInterface > xmlsecctx =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl")), xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl"), xContext ) ;
         OSL_ENSURE( xsecenv.is() ,
             "Verifier - "
             "Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ;
@@ -295,7 +295,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Generate XML signature
         Reference< XInterface > xmlsigner =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_NssImpl")), xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_NssImpl"), xContext ) ;
         OSL_ENSURE( xmlsigner.is() ,
             "Verifier - "
             "Cannot get service instance of \"xsec.XMLSignature\"" ) ;
diff --git a/xmlsecurity/tools/standalone/mscsfit/certmngr.cxx b/xmlsecurity/tools/standalone/mscsfit/certmngr.cxx
index 04ddd9860f7f..bac39988cf4d 100644
--- a/xmlsecurity/tools/standalone/mscsfit/certmngr.cxx
+++ b/xmlsecurity/tools/standalone/mscsfit/certmngr.cxx
@@ -61,7 +61,7 @@ int SAL_CALL main( int argc, char **argv )
         Reference< XMultiComponentFactory > xManager = NULL ;
         Reference< XComponentContext > xContext = NULL ;
 
-        xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[1] ) ) ;
+        xManager = serviceManager( xContext , OUString("local"), OUString::createFromAscii( argv[1] ) ) ;
         OSL_ENSURE( xManager.is() ,
             "ServicesManager - "
             "Cannot get service manager" ) ;
@@ -69,7 +69,7 @@ int SAL_CALL main( int argc, char **argv )
         //Create security environment
         //Build Security Environment
         Reference< XInterface > xsecenv =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl")), xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl"), xContext ) ;
         OSL_ENSURE( xsecenv.is() ,
             "Signer - "
             "Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ;
diff --git a/xmlsecurity/tools/standalone/mscsfit/decrypter.cxx b/xmlsecurity/tools/standalone/mscsfit/decrypter.cxx
index 259d9cef89fa..0006ebc5946c 100644
--- a/xmlsecurity/tools/standalone/mscsfit/decrypter.cxx
+++ b/xmlsecurity/tools/standalone/mscsfit/decrypter.cxx
@@ -108,11 +108,11 @@ int SAL_CALL main( int argc, char **argv )
         Reference< XMultiComponentFactory > xManager = NULL ;
         Reference< XComponentContext > xContext = NULL ;
 
-        xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[4] ) ) ;
+        xManager = serviceManager( xContext , OUString("local"), OUString::createFromAscii( argv[4] ) ) ;
 
         //Create encryption template
         Reference< XInterface > tplElement =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.xsec.XMLElementWrapper")) , xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.xsec.XMLElementWrapper") , xContext ) ;
         OSL_ENSURE( tplElement.is() ,
             "Decryptor - "
             "Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ;
@@ -136,7 +136,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Build XML Encryption template
         Reference< XInterface > enctpl =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.xsec.XMLEncryptionTemplate")), xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.xsec.XMLEncryptionTemplate"), xContext ) ;
         OSL_ENSURE( enctpl.is() ,
             "Decryptor - "
             "Cannot get service instance of \"xsec.XMLEncryptionTemplate\"" ) ;
@@ -152,7 +152,7 @@ int SAL_CALL main( int argc, char **argv )
         //Create security environment
         //Build Security Environment
         Reference< XInterface > xsecenv =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.xsec.SecurityEnvironment")), xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.xsec.SecurityEnvironment"), xContext ) ;
         OSL_ENSURE( xsecenv.is() ,
             "Decryptor - "
             "Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ;
@@ -179,7 +179,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Build XML Security Context
         Reference< XInterface > xmlsecctx =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.xsec.XMLSecurityContext")), xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.xsec.XMLSecurityContext"), xContext ) ;
         OSL_ENSURE( xmlsecctx.is() ,
             "Decryptor - "
             "Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ;
@@ -194,7 +194,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Get encrypter
         Reference< XInterface > xmlencrypter =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.xsec.XMLEncryption")), xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.xsec.XMLEncryption"), xContext ) ;
         OSL_ENSURE( xmlencrypter.is() ,
             "Decryptor - "
             "Cannot get service instance of \"xsec.XMLEncryption\"" ) ;
diff --git a/xmlsecurity/tools/standalone/mscsfit/encrypter.cxx b/xmlsecurity/tools/standalone/mscsfit/encrypter.cxx
index 1645163a1894..0f5ace73527d 100644
--- a/xmlsecurity/tools/standalone/mscsfit/encrypter.cxx
+++ b/xmlsecurity/tools/standalone/mscsfit/encrypter.cxx
@@ -123,11 +123,11 @@ int SAL_CALL main( int argc, char **argv )
         Reference< XMultiComponentFactory > xManager = NULL ;
         Reference< XComponentContext > xContext = NULL ;
 
-        xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[5] ) ) ;
+        xManager = serviceManager( xContext , OUString("local"), OUString::createFromAscii( argv[5] ) ) ;
 
         //Create encryption template
         Reference< XInterface > tplElement =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl") , xContext ) ;
         OSL_ENSURE( tplElement.is() ,
             "Encryptor - "
             "Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ;
@@ -151,7 +151,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Create encryption target element
         Reference< XInterface > tarElement =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl") , xContext ) ;
         OSL_ENSURE( tarElement.is() ,
             "Encryptor - "
             "Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ;
@@ -176,7 +176,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Build XML Encryption template
         Reference< XInterface > enctpl =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLEncryptionTemplate")), xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.crypto.XMLEncryptionTemplate"), xContext ) ;
         OSL_ENSURE( enctpl.is() ,
             "Encryptor - "
             "Cannot get service instance of \"xsec.XMLEncryptionTemplate\"" ) ;
@@ -193,7 +193,7 @@ int SAL_CALL main( int argc, char **argv )
         //Create security environment
         //Build Security Environment
         Reference< XInterface > xsecenv =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl")), xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl"), xContext ) ;
         OSL_ENSURE( xsecenv.is() ,
             "Encryptor - "
             "Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ;
@@ -227,7 +227,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Build XML Security Context
         Reference< XInterface > xmlsecctx =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl")), xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl"), xContext ) ;
         OSL_ENSURE( xmlsecctx.is() ,
             "Encryptor - "
             "Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ;
@@ -241,7 +241,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Get encrypter
         Reference< XInterface > xmlencrypter =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_MSCryptImpl")), xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_MSCryptImpl"), xContext ) ;
         OSL_ENSURE( xmlencrypter.is() ,
             "Encryptor - "
             "Cannot get service instance of \"xsec.XMLEncryption\"" ) ;
diff --git a/xmlsecurity/tools/standalone/mscsfit/helper.cxx b/xmlsecurity/tools/standalone/mscsfit/helper.cxx
index 924270b910b2..ee6844fbe99b 100644
--- a/xmlsecurity/tools/standalone/mscsfit/helper.cxx
+++ b/xmlsecurity/tools/standalone/mscsfit/helper.cxx
@@ -76,7 +76,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
             "serviceManager - "
             "Cannot create simple registry" ) ;
 
-        //xSimpleRegistry->open(OUString(RTL_CONSTASCII_USTRINGPARAM("xmlsecurity.rdb")), sal_False, sal_False);
+        //xSimpleRegistry->open(OUString("xmlsecurity.rdb"), sal_False, sal_False);
         xSimpleRegistry->open(sRdbUrl, sal_True, sal_False);
         OSL_ENSURE( xSimpleRegistry->isValid() ,
             "serviceManager - "
@@ -105,10 +105,10 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
                 "Cannot get multi-service factory" ) ;
 
             Sequence< Any > args( 2 ) ;
-            args[ 0 ] <<= OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL )) ;
-            args[ 1 ] <<= OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE )) ;
+            args[ 0 ] <<= OUString( UCB_CONFIGURATION_KEY1_LOCAL ) ;
+            args[ 1 ] <<= OUString( UCB_CONFIGURATION_KEY2_OFFICE ) ;
             if( ! ::ucb::ContentBroker::initialize( xSvmg , args ) ) {
-                throw RuntimeException( OUString(RTL_CONSTASCII_USTRINGPARAM("Cannot inlitialize ContentBroker")) , Reference< XInterface >() , Any() ) ;
+                throw RuntimeException( OUString("Cannot inlitialize ContentBroker") , Reference< XInterface >() , Any() ) ;
             }
         }
         ********************************************************************/
@@ -128,7 +128,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
             "Cannot create intial service manager" ) ;
 
         Reference< XInterface > urlResolver =
-            xLocalServiceManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.UnoUrlResolver")) , xLocalComponentContext ) ;
+            xLocalServiceManager->createInstanceWithContext( OUString("com.sun.star.bridge.UnoUrlResolver") , xLocalComponentContext ) ;
         OSL_ENSURE( urlResolver.is() ,
             "serviceManager - "
             "Cannot get service instance of \"bridge.UnoUrlResolver\"" ) ;
@@ -152,7 +152,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
             "Cannot get interface of \"XNamingService\" from URL resolver" ) ;
 
         Reference< XInterface > serviceManager =
-            xNamingService->getRegisteredObject( OUString(RTL_CONSTASCII_USTRINGPARAM("StarOffice.ServiceManager")) ) ;
+            xNamingService->getRegisteredObject( OUString("StarOffice.ServiceManager") ) ;
         OSL_ENSURE( serviceManager.is() ,
             "serviceManager - "
             "Cannot get service instance of \"StarOffice.ServiceManager\"" ) ;
@@ -167,7 +167,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
             "serviceManager - "
             "Cannot get interface of \"XPropertySet\" from service \"StarOffice.ServiceManager\"" ) ;
 
-        xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xUsedComponentContext ;
+        xPropSet->getPropertyValue( OUString("DefaultContext") ) >>= xUsedComponentContext ;
         OSL_ENSURE( xUsedComponentContext.is() ,
             "serviceManager - "
             "Cannot create remote component context" ) ;
@@ -182,7 +182,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
             "serviceManager - "
             "Cannot get interface of \"XPropertySet\" from URL resolver" ) ;
 
-        xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xUsedComponentContext ;
+        xPropSet->getPropertyValue( OUString("DefaultContext") ) >>= xUsedComponentContext ;
         OSL_ENSURE( xUsedComponentContext.is() ,
             "serviceManager - "
             "Cannot create remote component context" ) ;
@@ -206,7 +206,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
             "serviceManager - "
             "Cannot get interface of \"XPropertySet\" from service \"StarOffice.ServiceManager\"" ) ;
 
-        xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xUsedComponentContext ;
+        xPropSet->getPropertyValue( OUString("DefaultContext") ) >>= xUsedComponentContext ;
         OSL_ENSURE( xUsedComponentContext.is() ,
             "serviceManager - "
             "Cannot create remote component context" ) ;
diff --git a/xmlsecurity/tools/standalone/mscsfit/signer.cxx b/xmlsecurity/tools/standalone/mscsfit/signer.cxx
index 9e96e4fc40ec..fc71756558cb 100644
--- a/xmlsecurity/tools/standalone/mscsfit/signer.cxx
+++ b/xmlsecurity/tools/standalone/mscsfit/signer.cxx
@@ -176,14 +176,14 @@ int SAL_CALL main( int argc, char **argv )
         Reference< XMultiComponentFactory > xManager = NULL ;
         Reference< XComponentContext > xContext = NULL ;
 
-        xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[3] ) ) ;
+        xManager = serviceManager( xContext , OUString("local"), OUString::createFromAscii( argv[3] ) ) ;
         OSL_ENSURE( xManager.is() ,
             "ServicesManager - "
             "Cannot get service manager" ) ;
 
         //Create signature template
         Reference< XInterface > element =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl") , xContext ) ;
         OSL_ENSURE( element.is() ,
             "Signer - "
             "Cannot get service instance of \"wrapper.XMLElementWrapper\"" ) ;
@@ -208,7 +208,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Build XML Signature template
         Reference< XInterface > signtpl =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLSignatureTemplate")) , xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.crypto.XMLSignatureTemplate") , xContext ) ;
         OSL_ENSURE( signtpl.is() ,
             "Signer - "
             "Cannot get service instance of \"xsec.XMLSignatureTemplate\"" ) ;
@@ -228,7 +228,7 @@ int SAL_CALL main( int argc, char **argv )
         //Create security environment
         //Build Security Environment
         Reference< XInterface > xsecenv =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl")), xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl"), xContext ) ;
         OSL_ENSURE( xsecenv.is() ,
             "Signer - "
             "Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ;
@@ -259,7 +259,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Build XML Security Context
         Reference< XInterface > xmlsecctx =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl")), xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl"), xContext ) ;
         OSL_ENSURE( xsecenv.is() ,
             "Signer - "
             "Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ;
@@ -273,7 +273,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Generate XML signature
         Reference< XInterface > xmlsigner =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_MSCryptImpl")), xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_MSCryptImpl"), xContext ) ;
         OSL_ENSURE( xmlsigner.is() ,
             "Signer - "
             "Cannot get service instance of \"xsec.XMLSignature\"" ) ;
diff --git a/xmlsecurity/tools/standalone/mscsfit/verifier.cxx b/xmlsecurity/tools/standalone/mscsfit/verifier.cxx
index 2278d10db4ef..9b44fa69627d 100644
--- a/xmlsecurity/tools/standalone/mscsfit/verifier.cxx
+++ b/xmlsecurity/tools/standalone/mscsfit/verifier.cxx
@@ -178,11 +178,11 @@ int SAL_CALL main( int argc, char **argv )
         Reference< XMultiComponentFactory > xManager = NULL ;
         Reference< XComponentContext > xContext = NULL ;
 
-        xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")),  OUString::createFromAscii( argv[2] ) ) ;
+        xManager = serviceManager( xContext , OUString("local"),  OUString::createFromAscii( argv[2] ) ) ;
 
         //Create signature template
         Reference< XInterface > element =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl") , xContext ) ;
         OSL_ENSURE( element.is() ,
             "Verifier - "
             "Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ;
@@ -207,7 +207,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Build XML Signature template
         Reference< XInterface > signtpl =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLSignatureTemplate")), xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.crypto.XMLSignatureTemplate"), xContext ) ;
         OSL_ENSURE( signtpl.is() ,
             "Verifier - "
             "Cannot get service instance of \"xsec.XMLSignatureTemplate\"" ) ;
@@ -227,7 +227,7 @@ int SAL_CALL main( int argc, char **argv )
         //Create security environment
         //Build Security Environment
         Reference< XInterface > xsecenv =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl")), xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl"), xContext ) ;
         OSL_ENSURE( xsecenv.is() ,
             "Verifier - "
             "Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ;
@@ -258,7 +258,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Build XML Security Context
         Reference< XInterface > xmlsecctx =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl")), xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl"), xContext ) ;
         OSL_ENSURE( xsecenv.is() ,
             "Verifier - "
             "Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ;
@@ -272,7 +272,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Generate XML signature
         Reference< XInterface > xmlsigner =
-            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_MSCryptImpl")), xContext ) ;
+            xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_MSCryptImpl"), xContext ) ;
         OSL_ENSURE( xmlsigner.is() ,
             "Verifier - "
             "Cannot get service instance of \"xsec.XMLSignature\"" ) ;