diff options
Diffstat (limited to 'xmlsecurity/source/xmlsec')
12 files changed, 19 insertions, 32 deletions
diff --git a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx index 551fbe3b90e4..e3d0d7c09e46 100644 --- a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx +++ b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx @@ -29,7 +29,7 @@ using namespace ::com::sun::star::uno ; using ::com::sun::star::security::XCertificateExtension ; CertificateExtension_XmlSecImpl :: CertificateExtension_XmlSecImpl() : - m_critical( sal_False ) , + m_critical( false ) , m_xExtnId() , m_xExtnValue() { @@ -52,7 +52,7 @@ sal_Bool SAL_CALL CertificateExtension_XmlSecImpl :: isCritical() throw( ::com:: return m_xExtnValue ; } -void CertificateExtension_XmlSecImpl :: setCertExtn( unsigned char* value, unsigned int vlen, unsigned char* id, unsigned int idlen, sal_Bool critical ) { +void CertificateExtension_XmlSecImpl :: setCertExtn( unsigned char* value, unsigned int vlen, unsigned char* id, unsigned int idlen, bool critical ) { unsigned int i ; if( value != NULL && vlen != 0 ) { Sequence< sal_Int8 > extnv( vlen ) ; diff --git a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx index f3bb28e96b53..eb5140e01393 100644 --- a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx +++ b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx @@ -32,7 +32,7 @@ class CertificateExtension_XmlSecImpl : public ::cppu::WeakImplHelper1< ::com::sun::star::security::XCertificateExtension > { private : - sal_Bool m_critical ; + bool m_critical ; ::com::sun::star::uno::Sequence< sal_Int8 > m_xExtnId ; ::com::sun::star::uno::Sequence< sal_Int8 > m_xExtnValue ; @@ -47,7 +47,7 @@ class CertificateExtension_XmlSecImpl : public ::cppu::WeakImplHelper1< virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getExtensionValue() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; - void setCertExtn( unsigned char* value, unsigned int vlen, unsigned char* id, unsigned int idlen, sal_Bool critical ) ; + void setCertExtn( unsigned char* value, unsigned int vlen, unsigned char* id, unsigned int idlen, bool critical ) ; } ; #endif // INCLUDED_XMLSECURITY_SOURCE_XMLSEC_CERTIFICATEEXTENSION_XMLSECIMPL_HXX diff --git a/xmlsecurity/source/xmlsec/diagnose.cxx b/xmlsecurity/source/xmlsec/diagnose.cxx index 0e24b6dd1cd6..34db25b2b9a4 100644 --- a/xmlsecurity/source/xmlsec/diagnose.cxx +++ b/xmlsecurity/source/xmlsec/diagnose.cxx @@ -30,9 +30,8 @@ struct UseDiagnose : public rtl::StaticWithInit< bool, UseDiagnose> bool operator () () const { OUString value; - sal_Bool res = rtl::Bootstrap::get( - OUString("XMLSECURITY_TRACE"), value); - return res == sal_True ? true : false; + bool res = rtl::Bootstrap::get( OUString("XMLSECURITY_TRACE"), value); + return res; } }; diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx index 73e8a21a2762..d4f44f9ae4c1 100644 --- a/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx +++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx @@ -66,9 +66,6 @@ public: OUString ONSSInitializer_getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ); -sal_Bool SAL_CALL ONSSInitializer_supportsService( const OUString& ServiceName ) - throw ( ::com::sun::star::uno::RuntimeException ); - com::sun::star::uno::Sequence< OUString > SAL_CALL ONSSInitializer_getSupportedServiceNames() throw ( ::com::sun::star::uno::RuntimeException ); diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx index 513f4893852e..aca47a2da855 100644 --- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx @@ -41,7 +41,7 @@ using ::com::sun::star::security::XCertificateExtension ; SanExtensionImpl :: SanExtensionImpl() : -m_critical( sal_False ) +m_critical( false ) { } diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx index d5d8bd7a6758..2932cbbc1e3d 100644 --- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx @@ -34,7 +34,7 @@ class SanExtensionImpl : public ::cppu::WeakImplHelper1< ::com::sun::star::security::XSanExtension > { private : - sal_Bool m_critical ; + bool m_critical ; ::com::sun::star::uno::Sequence< sal_Int8 > m_xExtnId ; ::com::sun::star::uno::Sequence< sal_Int8 > m_xExtnValue ; ::com::sun::star::uno::Sequence< com::sun::star::security::CertAltNameEntry > m_Entries; @@ -57,7 +57,7 @@ class SanExtensionImpl : public ::cppu::WeakImplHelper1< virtual ::com::sun::star::uno::Sequence< com::sun::star::security::CertAltNameEntry > SAL_CALL getAlternativeNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; //Helper method - void setCertExtn( unsigned char* value, unsigned int vlen, unsigned char* id, unsigned int idlen, sal_Bool critical ) ; + void setCertExtn( unsigned char* value, unsigned int vlen, unsigned char* id, unsigned int idlen, bool critical ) ; } ; #endif // INCLUDED_XMLSECURITY_SOURCE_XMLSEC_NSS_SANEXTENSION_NSSIMPL_HXX diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx index a88edc2548f7..732d70650101 100644 --- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx @@ -63,9 +63,6 @@ public: OUString SEInitializer_NssImpl_getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ); -sal_Bool SAL_CALL SEInitializer_NssImpl_supportsService( const OUString& ServiceName ) - throw ( ::com::sun::star::uno::RuntimeException ); - com::sun::star::uno::Sequence< OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceNames( ) throw ( ::com::sun::star::uno::RuntimeException ); diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx index 452d1a130637..6f66266305f8 100644 --- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx @@ -178,7 +178,7 @@ OUString SAL_CALL X509Certificate_NssImpl :: getSubjectName() throw ( ::com::sun if( m_pCert != NULL && m_pCert->extensions != NULL ) { CERTCertExtension** extns ; CertificateExtension_XmlSecImpl* pExtn ; - sal_Bool crit ; + bool crit ; int len ; for( len = 0, extns = m_pCert->extensions; *extns != NULL; len ++, extns ++ ) ; @@ -202,7 +202,7 @@ OUString SAL_CALL X509Certificate_NssImpl :: getSubjectName() throw ( ::com::sun pExtn = new CertificateExtension_XmlSecImpl() ; if( (*extns)->critical.data == NULL ) - crit = sal_False ; + crit = false ; else crit = ( (*extns)->critical.data[0] == 0xFF ) ? sal_True : sal_False ; pExtn->setCertExtn( (*extns)->value.data, (*extns)->value.len, (unsigned char*)objID.getStr(), objID.getLength(), crit ) ; @@ -221,7 +221,7 @@ OUString SAL_CALL X509Certificate_NssImpl :: getSubjectName() throw ( ::com::sun CertificateExtension_XmlSecImpl* pExtn ; CERTCertExtension** extns ; SECItem idItem ; - sal_Bool crit ; + bool crit ; idItem.data = ( unsigned char* )&oid[0] ; idItem.len = oid.getLength() ; @@ -236,7 +236,7 @@ OUString SAL_CALL X509Certificate_NssImpl :: getSubjectName() throw ( ::com::sun else pExtn = new CertificateExtension_XmlSecImpl() ; if( (*extns)->critical.data == NULL ) - crit = sal_False ; + crit = false ; else crit = ( (*extns)->critical.data[0] == 0xFF ) ? sal_True : sal_False ; pExtn->setCertExtn( (*extns)->value.data, (*extns)->value.len, (*extns)->id.data, (*extns)->id.len, crit ) ; diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx index 4c47f8a15c8f..aaa6f27656f4 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx @@ -125,7 +125,7 @@ SAL_CALL XMLEncryption_NssImpl :: encrypt( } //remember the position of the element to be signed - sal_Bool isParentRef = sal_True; + bool isParentRef = true; pEncryptedData = pTemplate->getNativeElement(); xmlNodePtr pParent = pEncryptedData->parent; @@ -138,7 +138,7 @@ SAL_CALL XMLEncryption_NssImpl :: encrypt( else { referenceNode = pEncryptedData->prev; - isParentRef = sal_False; + isParentRef = false; } setErrorRecorder( ); @@ -226,7 +226,7 @@ SAL_CALL XMLEncryption_NssImpl :: decrypt( pEncryptedData = pTemplate->getNativeElement() ; //remember the position of the element to be signed - sal_Bool isParentRef = sal_True; + bool isParentRef = true; xmlNodePtr pParent = pEncryptedData->parent; xmlNodePtr referenceNode; @@ -237,7 +237,7 @@ SAL_CALL XMLEncryption_NssImpl :: decrypt( else { referenceNode = pEncryptedData->prev; - isParentRef = sal_False; + isParentRef = false; } setErrorRecorder( ); diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx index 9b5d78357658..baac544ba738 100644 --- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx +++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx @@ -768,11 +768,11 @@ sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl::isCurrent( const cssu::Referenc sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl::isCurrentElementEmpty( ) throw (cssu::RuntimeException, std::exception) { - sal_Bool rc = sal_False; + bool rc = false; if (m_pCurrentElement->children == NULL) { - rc = sal_True; + rc = true; } return rc; diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx index 756302128c52..a5c4446b7d16 100644 --- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx +++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx @@ -257,9 +257,6 @@ public: OUString XMLDocumentWrapper_XmlSecImpl_getImplementationName() throw ( com::sun::star::uno::RuntimeException ); -sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl_supportsService( const OUString& ServiceName ) - throw ( com::sun::star::uno::RuntimeException ); - com::sun::star::uno::Sequence< OUString > SAL_CALL XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames( ) throw ( com::sun::star::uno::RuntimeException ); diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx index 749c8318740b..b9018a0d6f72 100644 --- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx +++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx @@ -84,9 +84,6 @@ public: OUString XMLElementWrapper_XmlSecImpl_getImplementationName() throw ( com::sun::star::uno::RuntimeException ); -sal_Bool SAL_CALL XMLElementWrapper_XmlSecImpl_supportsService( const OUString& ServiceName ) - throw ( com::sun::star::uno::RuntimeException ); - com::sun::star::uno::Sequence< OUString > SAL_CALL XMLElementWrapper_XmlSecImpl_getSupportedServiceNames( ) throw ( com::sun::star::uno::RuntimeException ); |