summaryrefslogtreecommitdiff
path: root/xmlsecurity/source/component
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-04-23 13:44:07 +0200
committerNoel Grandin <noel@peralex.com>2014-04-24 10:53:16 +0200
commite4e654e40575300eaab429a6b94348bf43b9d7ce (patch)
tree3e44e5429c9e6ddecae45e47154733ac882d9564 /xmlsecurity/source/component
parent2ff8ae7c9e9b36d187abef9e163f47a740d51214 (diff)
xmlsecurity: sal_Bool->bool
Change-Id: I4f32fe3b5133e13dab88ca1c9acd021d84dc59a9
Diffstat (limited to 'xmlsecurity/source/component')
-rw-r--r--xmlsecurity/source/component/certificatecontainer.cxx10
-rw-r--r--xmlsecurity/source/component/certificatecontainer.hxx6
-rw-r--r--xmlsecurity/source/component/documentdigitalsignatures.cxx12
-rw-r--r--xmlsecurity/source/component/documentdigitalsignatures.hxx4
4 files changed, 16 insertions, 16 deletions
diff --git a/xmlsecurity/source/component/certificatecontainer.cxx b/xmlsecurity/source/component/certificatecontainer.cxx
index 54ff5cefaec6..958a7b4babc9 100644
--- a/xmlsecurity/source/component/certificatecontainer.cxx
+++ b/xmlsecurity/source/component/certificatecontainer.cxx
@@ -26,16 +26,16 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
-sal_Bool
+bool
CertificateContainer::searchMap( const OUString & url, const OUString & certificate_name, Map &_certMap )
{
Map::iterator p = _certMap.find(url);
- sal_Bool ret = sal_False;
+ bool ret = false;
while( p != _certMap.end() )
{
- ret = (sal_Bool) (*p).second.equals(certificate_name);
+ ret = (*p).second.equals(certificate_name);
if( ret )
break;
++p;
@@ -44,14 +44,14 @@ CertificateContainer::searchMap( const OUString & url, const OUString & certific
return ret;
}
-sal_Bool
+bool
CertificateContainer::isTemporaryCertificate ( const OUString & url, const OUString & certificate_name )
throw(::com::sun::star::uno::RuntimeException)
{
return searchMap( url, certificate_name, certMap);
}
-sal_Bool
+bool
CertificateContainer::isCertificateTrust ( const OUString & url, const OUString & certificate_name )
throw(::com::sun::star::uno::RuntimeException)
{
diff --git a/xmlsecurity/source/component/certificatecontainer.hxx b/xmlsecurity/source/component/certificatecontainer.hxx
index f08c238b01b5..32ab15b51f9a 100644
--- a/xmlsecurity/source/component/certificatecontainer.hxx
+++ b/xmlsecurity/source/component/certificatecontainer.hxx
@@ -39,9 +39,9 @@ class CertificateContainer : public ::cppu::WeakImplHelper2< css::lang::XService
Map certMap;
Map certTrustMap;
- sal_Bool SAL_CALL searchMap( const OUString & url, const OUString & certificate_name, Map &_certMap );
- virtual sal_Bool SAL_CALL isTemporaryCertificate( const OUString & url, const OUString & certificate_name ) throw(css::uno::RuntimeException);
- virtual sal_Bool SAL_CALL isCertificateTrust( const OUString & url, const OUString & certificate_name ) throw(css::uno::RuntimeException);
+ bool SAL_CALL searchMap( const OUString & url, const OUString & certificate_name, Map &_certMap );
+ virtual bool SAL_CALL isTemporaryCertificate( const OUString & url, const OUString & certificate_name ) throw(css::uno::RuntimeException);
+ virtual bool SAL_CALL isCertificateTrust( const OUString & url, const OUString & certificate_name ) throw(css::uno::RuntimeException);
public:
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index 63755065eb44..38239788fa66 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -186,7 +186,7 @@ OUString DocumentDigitalSignatures::getPackageSignatureDefaultStreamName( )
}
-sal_Bool DocumentDigitalSignatures::ImplViewSignatures(
+bool DocumentDigitalSignatures::ImplViewSignatures(
const Reference< css::embed::XStorage >& rxStorage,
const Reference< css::io::XInputStream >& xSignStream,
DocumentSignatureMode eMode, bool bReadOnly ) throw (RuntimeException)
@@ -197,11 +197,11 @@ sal_Bool DocumentDigitalSignatures::ImplViewSignatures(
return ImplViewSignatures( rxStorage, xStream, eMode, bReadOnly );
}
-sal_Bool DocumentDigitalSignatures::ImplViewSignatures(
+bool DocumentDigitalSignatures::ImplViewSignatures(
const Reference< css::embed::XStorage >& rxStorage, const Reference< css::io::XStream >& xSignStream,
DocumentSignatureMode eMode, bool bReadOnly ) throw (RuntimeException)
{
- sal_Bool bChanges = sal_False;
+ bool bChanges = false;
DigitalSignaturesDialog aSignaturesDialog(
NULL, mxCtx, eMode, bReadOnly, m_sODFVersion, m_bHasDocumentSignature);
bool bInit = aSignaturesDialog.Init();
@@ -214,7 +214,7 @@ sal_Bool DocumentDigitalSignatures::ImplViewSignatures(
{
if ( aSignaturesDialog.SignaturesChanged() )
{
- bChanges = sal_True;
+ bChanges = true;
// If we have a storage and no stream, we are responsible for commit
if ( rxStorage.is() && !xSignStream.is() )
{
@@ -390,7 +390,7 @@ void DocumentDigitalSignatures::showCertificate(
sal_Bool DocumentDigitalSignatures::isAuthorTrusted(
const Reference< css::security::XCertificate >& Author ) throw (RuntimeException, std::exception)
{
- sal_Bool bFound = sal_False;
+ bool bFound = false;
Reference<security::XSerialNumberAdapter> xSerialNumberAdapter =
::com::sun::star::security::SerialNumberAdapter::create(mxCtx);
@@ -405,7 +405,7 @@ sal_Bool DocumentDigitalSignatures::isAuthorTrusted(
SvtSecurityOptions::Certificate aAuthor = *pAuthors;
if ( ( aAuthor[0] == Author->getIssuerName() ) && ( aAuthor[1] == sSerialNum ) )
{
- bFound = sal_True;
+ bFound = true;
break;
}
}
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.hxx b/xmlsecurity/source/component/documentdigitalsignatures.hxx
index 0ed0fff32c8e..5b00d6de7e07 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.hxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.hxx
@@ -50,8 +50,8 @@ private:
//Indicates if the document already contains a document signature
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);
+ 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);
+ 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);
public: