diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-05-06 16:32:22 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-05-06 16:51:45 +0200 |
commit | e2e2cc61144cb22227eebfadff0ea24b51ccfbd0 (patch) | |
tree | 8063275cabcdf32e30c37451a32d96db5929561a /xmlsecurity/source/xmlsec | |
parent | d01768c31a0658c8a74e0dd3a95b2d781639d18e (diff) |
remove usage of RTL_CONSTASCII_USTRINGPARAM
Mechanical removal of usage together with OUString ctor, done
by compiler plugin.
Change-Id: I554227f76df0dac620b1b46fca32516f78b462c5
Diffstat (limited to 'xmlsecurity/source/xmlsec')
-rw-r--r-- | xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | 6 | ||||
-rw-r--r-- | xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx | 10 | ||||
-rw-r--r-- | xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx index b91e1db8569d..123978769d3a 100644 --- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx +++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx @@ -303,7 +303,7 @@ bool nsscrypto_initialize( const css::uno::Reference< css::uno::XComponentContex deleteRootsModule(); #if defined SYSTEM_NSS - OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("libnssckbi" SAL_DLLEXTENSION)); + OUString rootModule("libnssckbi" SAL_DLLEXTENSION); #else OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("${LO_LIB_DIR}/libnssckbi" SAL_DLLEXTENSION)); #endif @@ -479,7 +479,7 @@ OUString ONSSInitializer_getImplementationName () throw (cssu::RuntimeException) { - return OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); + return OUString ( IMPLEMENTATION_NAME ); } sal_Bool SAL_CALL ONSSInitializer_supportsService( const OUString& ServiceName ) @@ -493,7 +493,7 @@ cssu::Sequence< OUString > SAL_CALL ONSSInitializer_getSupportedServiceNames( ) { cssu::Sequence < OUString > aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( NSS_SERVICE_NAME ) ); + pArray[0] = OUString ( NSS_SERVICE_NAME ); return aRet; } diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx index aaa21295a663..015f6560ecfb 100644 --- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx @@ -79,12 +79,12 @@ uno::Reference< cssxc::XXMLSecurityContext > SAL_CALL try { /* Build XML Security Context */ - const OUString sSecyrutyContext ( RTL_CONSTASCII_USTRINGPARAM( SECURITY_CONTEXT ) ); + const OUString sSecyrutyContext ( SECURITY_CONTEXT ); uno::Reference< cssxc::XXMLSecurityContext > xSecCtx( m_xContext->getServiceManager()->createInstanceWithContext(sSecyrutyContext, m_xContext), uno::UNO_QUERY ); if( !xSecCtx.is() ) return NULL; - const OUString sSecyrutyEnvironment ( RTL_CONSTASCII_USTRINGPARAM( SECURITY_ENVIRONMENT ) ); + const OUString sSecyrutyEnvironment ( SECURITY_ENVIRONMENT ); uno::Reference< cssxc::XSecurityEnvironment > xSecEnv( m_xContext->getServiceManager()->createInstanceWithContext(sSecyrutyEnvironment, m_xContext), uno::UNO_QUERY ); uno::Reference< cssl::XUnoTunnel > xEnvTunnel( xSecEnv , uno::UNO_QUERY ) ; if( !xEnvTunnel.is() ) @@ -123,7 +123,7 @@ OUString SEInitializer_NssImpl_getImplementationName () throw (uno::RuntimeException) { - return OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); + return OUString ( IMPLEMENTATION_NAME ); } sal_Bool SAL_CALL SEInitializer_NssImpl_supportsService( const OUString& ServiceName ) @@ -137,8 +137,8 @@ uno::Sequence< OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceName { uno::Sequence < OUString > aRet(2); OUString* pArray = aRet.getArray(); - pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SE_SERVICE_NAME ) ); - pArray[1] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( NSS_SERVICE_NAME ) ); + pArray[0] = OUString ( SE_SERVICE_NAME ); + pArray[1] = OUString ( NSS_SERVICE_NAME ); return aRet; } diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx index de4570134736..6dd1853486f8 100644 --- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx +++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx @@ -73,7 +73,7 @@ sal_Int64 SAL_CALL XMLElementWrapper_XmlSecImpl::getSomething( const cssu::Seque OUString XMLElementWrapper_XmlSecImpl_getImplementationName () throw (cssu::RuntimeException) { - return OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); + return OUString ( IMPLEMENTATION_NAME ); } sal_Bool SAL_CALL XMLElementWrapper_XmlSecImpl_supportsService( const OUString& ServiceName ) @@ -87,7 +87,7 @@ cssu::Sequence< OUString > SAL_CALL XMLElementWrapper_XmlSecImpl_getSupportedSer { cssu::Sequence < OUString > aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); + pArray[0] = OUString ( SERVICE_NAME ); return aRet; } #undef SERVICE_NAME |