diff options
Diffstat (limited to 'xmlsecurity/source/component')
6 files changed, 69 insertions, 69 deletions
diff --git a/xmlsecurity/source/component/certificatecontainer.cxx b/xmlsecurity/source/component/certificatecontainer.cxx index 7759ad731686..a7a41601b66b 100644 --- a/xmlsecurity/source/component/certificatecontainer.cxx +++ b/xmlsecurity/source/component/certificatecontainer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,13 +28,13 @@ #include "precompiled_xmlsecurity.hxx" #include <certificatecontainer.hxx> - + #include <sal/config.h> using namespace ::com::sun::star::uno; -sal_Bool +sal_Bool CertificateContainer::searchMap( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name, Map &_certMap ) { Map::iterator p = _certMap.find(url); @@ -44,7 +44,7 @@ CertificateContainer::searchMap( const ::rtl::OUString & url, const ::rtl::OUStr while( p != _certMap.end() ) { ret = (sal_Bool) (*p).second.equals(certificate_name); - if( ret ) + if( ret ) break; p++; } @@ -53,7 +53,7 @@ CertificateContainer::searchMap( const ::rtl::OUString & url, const ::rtl::OUStr } // ------------------------------------------------------------------- -sal_Bool +sal_Bool CertificateContainer::isTemporaryCertificate ( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException) { @@ -62,7 +62,7 @@ CertificateContainer::isTemporaryCertificate ( const ::rtl::OUString & url, cons // ------------------------------------------------------------------- -sal_Bool +sal_Bool CertificateContainer::isCertificateTrust ( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException) { @@ -70,21 +70,21 @@ CertificateContainer::isCertificateTrust ( const ::rtl::OUString & url, const :: } // ------------------------------------------------------------------- -sal_Bool +sal_Bool CertificateContainer::addCertificate( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name, ::sal_Bool trust ) throw(::com::sun::star::uno::RuntimeException) { certMap.insert( Map::value_type( url, certificate_name ) ); - + //remember that the cert is trusted if (trust) certTrustMap.insert( Map::value_type( url, certificate_name ) ); - + return true; } //------------------------------------------------------------------------- -::security::CertificateContainerStatus +::security::CertificateContainerStatus CertificateContainer::hasCertificate( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException) { if ( isTemporaryCertificate( url, certificate_name ) ) @@ -100,8 +100,8 @@ CertificateContainer::hasCertificate( const ::rtl::OUString & url, const ::rtl:: } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL -CertificateContainer::getImplementationName( ) +::rtl::OUString SAL_CALL +CertificateContainer::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) { return impl_getStaticImplementationName(); @@ -109,8 +109,8 @@ CertificateContainer::getImplementationName( ) //------------------------------------------------------------------------- -sal_Bool SAL_CALL -CertificateContainer::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL +CertificateContainer::supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException) { if ( ServiceName.compareToAscii("com.sun.star.security.CertificateContainer") == 0 ) @@ -121,8 +121,8 @@ CertificateContainer::supportsService( const ::rtl::OUString& ServiceName ) //------------------------------------------------------------------------- -Sequence< ::rtl::OUString > SAL_CALL -CertificateContainer::getSupportedServiceNames( ) +Sequence< ::rtl::OUString > SAL_CALL +CertificateContainer::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { return impl_getStaticSupportedServiceNames(); @@ -130,8 +130,8 @@ CertificateContainer::getSupportedServiceNames( ) //------------------------------------------------------------------------- -Sequence< ::rtl::OUString > SAL_CALL -CertificateContainer::impl_getStaticSupportedServiceNames( ) +Sequence< ::rtl::OUString > SAL_CALL +CertificateContainer::impl_getStaticSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { Sequence< ::rtl::OUString > aRet(1); @@ -141,8 +141,8 @@ CertificateContainer::impl_getStaticSupportedServiceNames( ) //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL -CertificateContainer::impl_getStaticImplementationName() +::rtl::OUString SAL_CALL +CertificateContainer::impl_getStaticImplementationName() throw(::com::sun::star::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("com.sun.star.security.CertificateContainer"); @@ -150,7 +150,7 @@ CertificateContainer::impl_getStaticImplementationName() //------------------------------------------------------------------------- -Reference< XInterface > SAL_CALL CertificateContainer::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager ) +Reference< XInterface > SAL_CALL CertificateContainer::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager ) throw( RuntimeException ) { return Reference< XInterface >( *new CertificateContainer( xServiceManager ) ); @@ -158,16 +158,16 @@ Reference< XInterface > SAL_CALL CertificateContainer::impl_createInstance( cons //------------------------------------------------------------------------- -Reference< XSingleServiceFactory > SAL_CALL -CertificateContainer::impl_createFactory( const Reference< XMultiServiceFactory >& ServiceManager ) +Reference< XSingleServiceFactory > SAL_CALL +CertificateContainer::impl_createFactory( const Reference< XMultiServiceFactory >& ServiceManager ) throw(RuntimeException) { - Reference< XSingleServiceFactory > xReturn( ::cppu::createOneInstanceFactory( ServiceManager, + Reference< XSingleServiceFactory > xReturn( ::cppu::createOneInstanceFactory( ServiceManager, CertificateContainer::impl_getStaticImplementationName(), CertificateContainer::impl_createInstance, CertificateContainer::impl_getStaticSupportedServiceNames())); - return xReturn; + return xReturn; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/component/certificatecontainer.hxx b/xmlsecurity/source/component/certificatecontainer.hxx index abea11bf61f0..0a0c88c6285d 100644 --- a/xmlsecurity/source/component/certificatecontainer.hxx +++ b/xmlsecurity/source/component/certificatecontainer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,43 +51,43 @@ using namespace ::com::sun::star::lang; class CertificateContainer : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::security::XCertificateContainer > { private: - typedef std::map< ::rtl::OUString, ::rtl::OUString > Map; + typedef std::map< ::rtl::OUString, ::rtl::OUString > Map; Map certMap; Map certTrustMap; - + ::sal_Bool SAL_CALL searchMap( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name, Map &_certMap ); virtual ::sal_Bool SAL_CALL isTemporaryCertificate( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isCertificateTrust( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException); - + public: - + CertificateContainer(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ) {}; virtual ~CertificateContainer(){}; - + virtual ::sal_Bool SAL_CALL addCertificate( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name, ::sal_Bool trust ) throw(::com::sun::star::uno::RuntimeException); - virtual ::security::CertificateContainerStatus SAL_CALL hasCertificate( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException); + virtual ::security::CertificateContainerStatus SAL_CALL hasCertificate( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException); // provide factory - static ::rtl::OUString SAL_CALL + static ::rtl::OUString SAL_CALL impl_getStaticImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - + static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL impl_getStaticSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); - + static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL impl_createFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ServiceManager ) throw(::com::sun::star::uno::RuntimeException); - + static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) throw( ::com::sun::star::uno::RuntimeException ); - + // XServiceInfo - virtual ::rtl::OUString SAL_CALL + virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL + virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); - + }; diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx index f5930feb7308..ba0d11d00ced 100644 --- a/xmlsecurity/source/component/documentdigitalsignatures.cxx +++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -441,7 +441,7 @@ void DocumentDigitalSignatures::showCertificate( //warning free code //if ( aLocObj.GetProtocol() == INET_PROT_FILE && ( pBroker = ::ucbhelper::ContentBroker::get() ) ) - // xContentProvider = pBroker->getContentProviderInterface(); + // xContentProvider = pBroker->getContentProviderInterface(); if ( aLocObj.GetProtocol() == INET_PROT_FILE) { pBroker = ::ucbhelper::ContentBroker::get(); diff --git a/xmlsecurity/source/component/documentdigitalsignatures.hxx b/xmlsecurity/source/component/documentdigitalsignatures.hxx index 3525370d10b5..204f53cf7f67 100644 --- a/xmlsecurity/source/component/documentdigitalsignatures.hxx +++ b/xmlsecurity/source/component/documentdigitalsignatures.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,15 +37,15 @@ #include <com/sun/star/io/XInputStream.hpp> #include <xmlsecurity/documentsignaturehelper.hxx> -namespace com { namespace sun { namespace star { - +namespace com { namespace sun { namespace star { + namespace uno { class XComponentContext; } }}} -class DocumentDigitalSignatures : public cppu::WeakImplHelper2 -< +class DocumentDigitalSignatures : public cppu::WeakImplHelper2 +< com::sun::star::security::XDocumentDigitalSignatures, com::sun::star::lang::XInitialization > @@ -57,8 +57,8 @@ private: //The number of arguments which were passed in XInitialization::initialize int m_nArgumentsCount; //Indicates if the document already contains a document signature - bool m_bHasDocumentSignature; - + bool m_bHasDocumentSignature; + sal_Bool ImplViewSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rxStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xSignStream, DocumentSignatureMode eMode, bool bReadOnly ) throw (::com::sun::star::uno::RuntimeException); sal_Bool ImplViewSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rxStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignStream, DocumentSignatureMode eMode, bool bReadOnly ) throw (::com::sun::star::uno::RuntimeException); com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation > ImplVerifySignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rxStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignStream, DocumentSignatureMode eMode ) throw (::com::sun::star::uno::RuntimeException); @@ -67,11 +67,11 @@ public: DocumentDigitalSignatures( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext>& rxCtx ); // for service registration... - static ::rtl::OUString GetImplementationName() throw (com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence < ::rtl::OUString > GetSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); - + static ::rtl::OUString GetImplementationName() throw (com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence < ::rtl::OUString > GetSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); + //XInitialization - void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) + void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XDocumentDigitalSignatures @@ -96,7 +96,7 @@ public: }; -com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL DocumentDigitalSignatures_CreateInstance( +com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL DocumentDigitalSignatures_CreateInstance( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rCtx) throw ( com::sun::star::uno::Exception ); #endif // _XMLSECURITY_DOCUMENTDIGITALSIGNATURES_HXX diff --git a/xmlsecurity/source/component/registerservices.cxx b/xmlsecurity/source/component/registerservices.cxx index c9f7475abb83..36bddc967aa3 100644 --- a/xmlsecurity/source/component/registerservices.cxx +++ b/xmlsecurity/source/component/registerservices.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,10 +57,10 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistr // SERVICE DocumentDigitalSignatures nPos = 0; uno::Reference< registry::XRegistryKey > xNewKey( - reinterpret_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( DocumentDigitalSignatures::GetImplementationName() ) ); - + reinterpret_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( DocumentDigitalSignatures::GetImplementationName() ) ); + xNewKey = xNewKey->createKey( rtl::OUString::createFromAscii( "/UNO/SERVICES" ) ); - + const uno::Sequence< rtl::OUString >& rSNL = DocumentDigitalSignatures::GetSupportedServiceNames(); const rtl::OUString* pArray = rSNL.getConstArray(); for ( nPos = rSNL.getLength(); nPos--; ) @@ -69,16 +69,16 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistr // SERVICE CertificateContainer nPos = 0; uno::Reference< registry::XRegistryKey > xNewKeyCertificateContainer( - reinterpret_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( CertificateContainer::impl_getStaticImplementationName() ) ); + reinterpret_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( CertificateContainer::impl_getStaticImplementationName() ) ); xNewKeyCertificateContainer = xNewKeyCertificateContainer->createKey( rtl::OUString::createFromAscii( "/UNO/SERVICES" ) ); - + const uno::Sequence< rtl::OUString >& rSNLCertificateContainer = CertificateContainer::impl_getStaticSupportedServiceNames(); const rtl::OUString* pArrayCertificateContainer = rSNLCertificateContainer.getConstArray(); for ( nPos = rSNLCertificateContainer.getLength(); nPos--; ) - xNewKeyCertificateContainer->createKey( pArrayCertificateContainer[nPos] ); - + xNewKeyCertificateContainer->createKey( pArrayCertificateContainer[nPos] ); + //----------------------------- - + return sal_True; } catch (registry::InvalidRegistryException &) @@ -93,10 +93,10 @@ void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pService { void* pRet = 0; uno::Reference< XInterface > xFactory; - + //Decryptor rtl::OUString implName = rtl::OUString::createFromAscii( pImplName ); - + if ( pServiceManager && implName.equals( DocumentDigitalSignatures::GetImplementationName() ) ) { // DocumentDigitalSignatures @@ -110,11 +110,11 @@ void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pService // CertificateContainer xFactory = cppu::createOneInstanceFactory( reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ), - rtl::OUString::createFromAscii( pImplName ), - CertificateContainer::impl_createInstance, + rtl::OUString::createFromAscii( pImplName ), + CertificateContainer::impl_createInstance, CertificateContainer::impl_getStaticSupportedServiceNames() ); } - + if (xFactory.is()) { xFactory->acquire(); diff --git a/xmlsecurity/source/component/warnbox.src b/xmlsecurity/source/component/warnbox.src index dd55cad7558b..814952d82010 100644 --- a/xmlsecurity/source/component/warnbox.src +++ b/xmlsecurity/source/component/warnbox.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite |