From 8d487ceba1995b5831755bb5b37a82afc2125c0f Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 18 Dec 2014 13:41:18 +0100 Subject: xmlsecurity: Use appropriate OUString functions on string constants Change-Id: I18370f6203455cf7568e48e49b7093d114656619 --- xmlsecurity/source/framework/decryptorimpl.cxx | 4 +--- xmlsecurity/source/framework/encryptorimpl.cxx | 4 +--- xmlsecurity/source/framework/saxeventkeeperimpl.cxx | 4 +--- xmlsecurity/source/framework/signaturecreatorimpl.cxx | 4 +--- xmlsecurity/source/framework/signatureverifierimpl.cxx | 4 +--- 5 files changed, 5 insertions(+), 15 deletions(-) (limited to 'xmlsecurity/source/framework') diff --git a/xmlsecurity/source/framework/decryptorimpl.cxx b/xmlsecurity/source/framework/decryptorimpl.cxx index 08914954392b..bb41a3dce52f 100644 --- a/xmlsecurity/source/framework/decryptorimpl.cxx +++ b/xmlsecurity/source/framework/decryptorimpl.cxx @@ -32,7 +32,6 @@ namespace cssl = com::sun::star::lang; namespace cssxc = com::sun::star::xml::crypto; namespace cssxw = com::sun::star::xml::wrapper; -#define SERVICE_NAME "com.sun.star.xml.crypto.sax.Decryptor" #define IMPLEMENTATION_NAME "com.sun.star.xml.security.framework.DecryptorImpl" DecryptorImpl::DecryptorImpl(const Reference< XComponentContext > & xContext) : DecryptorImpl_Base(xContext) @@ -190,10 +189,9 @@ cssu::Sequence< OUString > SAL_CALL DecryptorImpl_getSupportedServiceNames( ) { cssu::Sequence < OUString > aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString ( SERVICE_NAME ); + pArray[0] = "com.sun.star.xml.crypto.sax.Decryptor"; return aRet; } -#undef SERVICE_NAME cssu::Reference< cssu::XInterface > SAL_CALL DecryptorImpl_createInstance( const cssu::Reference< cssl::XMultiServiceFactory >& xMSF) throw( cssu::Exception ) diff --git a/xmlsecurity/source/framework/encryptorimpl.cxx b/xmlsecurity/source/framework/encryptorimpl.cxx index 9d42d447928e..776b5327f3a6 100644 --- a/xmlsecurity/source/framework/encryptorimpl.cxx +++ b/xmlsecurity/source/framework/encryptorimpl.cxx @@ -31,7 +31,6 @@ namespace cssl = com::sun::star::lang; namespace cssxc = com::sun::star::xml::crypto; namespace cssxw = com::sun::star::xml::wrapper; -#define SERVICE_NAME "com.sun.star.xml.crypto.sax.Encryptor" #define IMPLEMENTATION_NAME "com.sun.star.xml.security.framework.EncryptorImpl" EncryptorImpl::EncryptorImpl(const Reference & xContext) : EncryptorImpl_Base(xContext) @@ -224,10 +223,9 @@ Sequence< OUString > SAL_CALL EncryptorImpl_getSupportedServiceNames( ) { Sequence < OUString > aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString ( SERVICE_NAME ); + pArray[0] = "com.sun.star.xml.crypto.sax.Encryptor"; return aRet; } -#undef SERVICE_NAME Reference< XInterface > SAL_CALL EncryptorImpl_createInstance( const Reference< cssl::XMultiServiceFactory >& xMSF) diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx index be60a3255757..6013f2dbf369 100644 --- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx +++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx @@ -32,7 +32,6 @@ namespace cssxcsax = com::sun::star::xml::csax; namespace cssxw = com::sun::star::xml::wrapper; namespace cssxs = com::sun::star::xml::sax; -#define SERVICE_NAME "com.sun.star.xml.crypto.sax.SAXEventKeeper" #define IMPLEMENTATION_NAME "com.sun.star.xml.security.framework.SAXEventKeeperImpl" #define _USECOMPRESSEDDOCUMENTHANDLER @@ -1371,10 +1370,9 @@ cssu::Sequence< OUString > SAL_CALL SAXEventKeeperImpl_getSupportedServiceNames( { cssu::Sequence < OUString > aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString ( SERVICE_NAME ); + pArray[0] = "com.sun.star.xml.crypto.sax.SAXEventKeeper"; return aRet; } -#undef SERVICE_NAME cssu::Reference< cssu::XInterface > SAL_CALL SAXEventKeeperImpl_createInstance( const cssu::Reference< cssl::XMultiServiceFactory > &) diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.cxx b/xmlsecurity/source/framework/signaturecreatorimpl.cxx index 300d1599ddc4..68f0025bde7c 100644 --- a/xmlsecurity/source/framework/signaturecreatorimpl.cxx +++ b/xmlsecurity/source/framework/signaturecreatorimpl.cxx @@ -32,7 +32,6 @@ namespace cssl = com::sun::star::lang; namespace cssxc = com::sun::star::xml::crypto; namespace cssxw = com::sun::star::xml::wrapper; -#define SERVICE_NAME "com.sun.star.xml.crypto.sax.SignatureCreator" #define IMPLEMENTATION_NAME "com.sun.star.xml.security.framework.SignatureCreatorImpl" SignatureCreatorImpl::SignatureCreatorImpl( const Reference & xContext ) @@ -238,10 +237,9 @@ cssu::Sequence< OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceName { cssu::Sequence < OUString > aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString ( SERVICE_NAME ); + pArray[0] = "com.sun.star.xml.crypto.sax.SignatureCreator"; return aRet; } -#undef SERVICE_NAME cssu::Reference< cssu::XInterface > SAL_CALL SignatureCreatorImpl_createInstance( const cssu::Reference< cssl::XMultiServiceFactory >& xMSF ) diff --git a/xmlsecurity/source/framework/signatureverifierimpl.cxx b/xmlsecurity/source/framework/signatureverifierimpl.cxx index 0db81535a28e..6ef0bedc79c3 100644 --- a/xmlsecurity/source/framework/signatureverifierimpl.cxx +++ b/xmlsecurity/source/framework/signatureverifierimpl.cxx @@ -30,7 +30,6 @@ namespace cssu = com::sun::star::uno; namespace cssl = com::sun::star::lang; namespace cssxc = com::sun::star::xml::crypto; -#define SERVICE_NAME "com.sun.star.xml.crypto.sax.SignatureVerifier" #define IMPLEMENTATION_NAME "com.sun.star.xml.security.framework.SignatureVerifierImpl" SignatureVerifierImpl::SignatureVerifierImpl( const cssu::Reference< css::uno::XComponentContext >& xContext) @@ -184,10 +183,9 @@ cssu::Sequence< OUString > SAL_CALL SignatureVerifierImpl_getSupportedServiceNam { cssu::Sequence < OUString > aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString ( SERVICE_NAME ); + pArray[0] = "com.sun.star.xml.crypto.sax.SignatureVerifier"; return aRet; } -#undef SERVICE_NAME cssu::Reference< cssu::XInterface > SAL_CALL SignatureVerifierImpl_createInstance( const cssu::Reference< cssl::XMultiServiceFactory >& rSMgr) -- cgit