xmlsecurity: sal_Bool->bool

Change-Id: I4f32fe3b5133e13dab88ca1c9acd021d84dc59a9

32 files changed, 51 insertions, 79 deletions

diff --git a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
index f9ad5de65cd5..c417eef17334 100644
--- a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
+++ b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
@@ -116,11 +116,11 @@ private:
 public:
     DigitalSignaturesDialog( Window* pParent, cssu::Reference<
         cssu::XComponentContext >& rxCtx, DocumentSignatureMode eMode,
-        sal_Bool bReadOnly, const OUString& sODFVersion, bool bHasDocumentSignature);
+        bool bReadOnly, const OUString& sODFVersion, bool bHasDocumentSignature);
     virtual ~DigitalSignaturesDialog();
 
     // Initialize the dialog and the security environment, returns TRUE on success
-    sal_Bool    Init();
+    bool    Init();
 
             // Set the storage which should be signed or verified
     void    SetStorage( const cssu::Reference < css::embed::XStorage >& rxStore );
@@ -130,7 +130,7 @@ public:
     short       Execute() SAL_OVERRIDE;
 
                 // Did signatures change?
-    sal_Bool    SignaturesChanged() const { return mbSignaturesChanged; }
+    bool    SignaturesChanged() const { return mbSignaturesChanged; }
 };
 
 #endif // INCLUDED_XMLSECURITY_INC_XMLSECURITY_DIGITALSIGNATURESDIALOG_HXX
diff --git a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
index dfe9c76325aa..22429ecb0456 100644
--- a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
+++ b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
@@ -167,7 +167,7 @@ public:
 
     void        SetDateTime( sal_Int32 nSecurityId, const Date& rDate, const Time& rTime );
 
-    void        AddForSigning( sal_Int32 securityId, const OUString& uri, const OUString& objectURL, sal_Bool bBinary );
+    void        AddForSigning( sal_Int32 securityId, const OUString& uri, const OUString& objectURL, bool bBinary );
     bool        CreateAndWriteSignature( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xDocumentHandler );
     bool        ReadAndVerifySignature( const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& xInputStream );
 
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:
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx
index e86ba42d6a3d..d8fb708eaa34 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -132,7 +132,7 @@ void CertificateChooser::ImplInitialize()
         for( sal_Int32 nCert = nCertificates; nCert; )
         {
             uno::Reference< security::XCertificate > xCert = maCerts[ --nCert ];
-            sal_Bool bIgnoreThis = false;
+            bool bIgnoreThis = false;
 
             // Do we already use that?
             if( nCertificatesToIgnore )
@@ -194,7 +194,7 @@ uno::Reference< css::security::XCertificate > CertificateChooser::GetSelectedCer
 
 IMPL_LINK_NOARG(CertificateChooser, CertificateHighlightHdl)
 {
-    sal_Bool bEnable = GetSelectedCertificate().is();
+    bool bEnable = GetSelectedCertificate().is();
     m_pViewBtn->Enable( bEnable );
     m_pOKBtn->Enable( bEnable );
     return 0;
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index 212f2996a3f3..d43e4c05881f 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -187,7 +187,7 @@ CertificateViewerGeneralTP::CertificateViewerGeneralTP( Window* _pParent, Certif
     XmlSec::AlignAfterImage( maKeyImg, maHintCorrespPrivKeyFI, 12 );
 
     // Check if we have the private key...
-    sal_Bool bHasPrivateKey = sal_False;
+    bool bHasPrivateKey = false;
     // #i41270# Check only if we have that certificate in our security environment
     if ( _pDlg->mbCheckForPrivateKey )
     {
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 9f277cc7e12d..1e471d95cdb4 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -163,7 +163,7 @@ bool DigitalSignaturesDialog::isXML(const OUString& rURI )
 DigitalSignaturesDialog::DigitalSignaturesDialog(
     Window* pParent,
     uno::Reference< uno::XComponentContext >& rxCtx, DocumentSignatureMode eMode,
-    sal_Bool bReadOnly, const OUString& sODFVersion, bool bHasDocumentSignature)
+    bool bReadOnly, const OUString& sODFVersion, bool bHasDocumentSignature)
     : ModalDialog(pParent, "DigitalSignaturesDialog", "xmlsec/ui/digitalsignaturesdialog.ui")
     , mxCtx(rxCtx)
     , maSignatureHelper(rxCtx)
@@ -235,7 +235,7 @@ DigitalSignaturesDialog::~DigitalSignaturesDialog()
     delete m_pSignaturesLB;
 }
 
-sal_Bool DigitalSignaturesDialog::Init()
+bool DigitalSignaturesDialog::Init()
 {
     bool bInit = maSignatureHelper.Init();
 
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index 62c054ce7dfe..3c9eaebe0c6d 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -109,7 +109,7 @@ MacroSecurityLevelTP::MacroSecurityLevelTP(Window* _pParent, MacroSecurity* _pDl
     m_pVeryHighRB->SetClickHdl( LINK( this, MacroSecurityLevelTP, RadioButtonHdl ) );
 
     mnCurLevel = (sal_uInt16) mpDlg->maSecOptions.GetMacroSecurityLevel();
-    sal_Bool bReadonly = mpDlg->maSecOptions.IsReadOnly( SvtSecurityOptions::E_MACRO_SECLEVEL );
+    bool bReadonly = mpDlg->maSecOptions.IsReadOnly( SvtSecurityOptions::E_MACRO_SECLEVEL );
 
     RadioButton* pCheck = 0;
     FixedImage* pImage = 0;
diff --git a/xmlsecurity/source/framework/decryptorimpl.hxx b/xmlsecurity/source/framework/decryptorimpl.hxx
index 9f6aab4c4d5d..1833d07a91dd 100644
--- a/xmlsecurity/source/framework/decryptorimpl.hxx
+++ b/xmlsecurity/source/framework/decryptorimpl.hxx
@@ -96,9 +96,6 @@ public:
 OUString DecryptorImpl_getImplementationName()
     throw ( com::sun::star::uno::RuntimeException );
 
-sal_Bool SAL_CALL DecryptorImpl_supportsService( const OUString& ServiceName )
-    throw ( com::sun::star::uno::RuntimeException );
-
 com::sun::star::uno::Sequence< OUString > SAL_CALL DecryptorImpl_getSupportedServiceNames(  )
     throw ( com::sun::star::uno::RuntimeException );
 
diff --git a/xmlsecurity/source/framework/encryptorimpl.hxx b/xmlsecurity/source/framework/encryptorimpl.hxx
index 1b0ce327d0ad..dc6df452cd71 100644
--- a/xmlsecurity/source/framework/encryptorimpl.hxx
+++ b/xmlsecurity/source/framework/encryptorimpl.hxx
@@ -111,9 +111,6 @@ public:
 OUString EncryptorImpl_getImplementationName()
     throw ( com::sun::star::uno::RuntimeException );
 
-sal_Bool SAL_CALL EncryptorImpl_supportsService( const OUString& ServiceName )
-    throw ( com::sun::star::uno::RuntimeException );
-
 com::sun::star::uno::Sequence< OUString > SAL_CALL EncryptorImpl_getSupportedServiceNames(  )
     throw ( com::sun::star::uno::RuntimeException );
 
diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
index 7617589b5565..240f9ec41886 100644
--- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
+++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
@@ -1233,7 +1233,7 @@ void SAL_CALL SAXEventKeeperImpl::startElement(
 void SAL_CALL SAXEventKeeperImpl::endElement( const OUString& aName )
     throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
-        sal_Bool bIsCurrent = m_xXMLDocument->isCurrent(m_pCurrentBufferNode->getXMLElement());
+        bool bIsCurrent = m_xXMLDocument->isCurrent(m_pCurrentBufferNode->getXMLElement());
 
         /*
          * If there is a following handler and no blocking now, then
diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.hxx b/xmlsecurity/source/framework/saxeventkeeperimpl.hxx
index dfdd9ae343b9..fd6539bbdd9f 100644
--- a/xmlsecurity/source/framework/saxeventkeeperimpl.hxx
+++ b/xmlsecurity/source/framework/saxeventkeeperimpl.hxx
@@ -336,9 +336,6 @@ public:
 OUString SAXEventKeeperImpl_getImplementationName()
     throw ( com::sun::star::uno::RuntimeException );
 
-sal_Bool SAL_CALL SAXEventKeeperImpl_supportsService( const OUString& ServiceName )
-    throw ( com::sun::star::uno::RuntimeException );
-
 com::sun::star::uno::Sequence< OUString > SAL_CALL SAXEventKeeperImpl_getSupportedServiceNames(  )
     throw ( com::sun::star::uno::RuntimeException );
 
diff --git a/xmlsecurity/source/framework/securityengine.cxx b/xmlsecurity/source/framework/securityengine.cxx
index 1139ac9f0406..84a3e637b54d 100644
--- a/xmlsecurity/source/framework/securityengine.cxx
+++ b/xmlsecurity/source/framework/securityengine.cxx
@@ -54,7 +54,7 @@ void SAL_CALL SecurityEngine::setKeyId( sal_Int32 id )
 sal_Bool SAL_CALL SecurityEngine::endMission(  )
     throw (com::sun::star::uno::RuntimeException, std::exception)
 {
-    sal_Bool rc = m_bMissionDone;
+    bool rc = m_bMissionDone;
 
     if (!rc)
     {
diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.hxx b/xmlsecurity/source/framework/signaturecreatorimpl.hxx
index dc278f9ab26b..e913283e6071 100644
--- a/xmlsecurity/source/framework/signaturecreatorimpl.hxx
+++ b/xmlsecurity/source/framework/signaturecreatorimpl.hxx
@@ -108,9 +108,6 @@ public:
 OUString SignatureCreatorImpl_getImplementationName()
     throw ( com::sun::star::uno::RuntimeException );
 
-sal_Bool SAL_CALL SignatureCreatorImpl_supportsService( const OUString& ServiceName )
-    throw ( com::sun::star::uno::RuntimeException );
-
 com::sun::star::uno::Sequence< OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceNames(  )
     throw ( com::sun::star::uno::RuntimeException );
 
diff --git a/xmlsecurity/source/framework/signatureverifierimpl.hxx b/xmlsecurity/source/framework/signatureverifierimpl.hxx
index 1d0db05cbf35..382c7c6a6fc6 100644
--- a/xmlsecurity/source/framework/signatureverifierimpl.hxx
+++ b/xmlsecurity/source/framework/signatureverifierimpl.hxx
@@ -99,9 +99,6 @@ public:
 OUString SignatureVerifierImpl_getImplementationName()
     throw ( com::sun::star::uno::RuntimeException );
 
-sal_Bool SAL_CALL SignatureVerifierImpl_supportsService( const OUString& ServiceName )
-    throw ( com::sun::star::uno::RuntimeException );
-
 com::sun::star::uno::Sequence< OUString > SAL_CALL SignatureVerifierImpl_getSupportedServiceNames(  )
     throw ( com::sun::star::uno::RuntimeException );
 
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
index e32721046306..9b5b5f1c47ca 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
@@ -134,7 +134,7 @@ void XMLSignatureHelper::SetDateTime( sal_Int32 nSecurityId, const Date& rDate,
     mpXSecController->setDate( nSecurityId, stDateTime );
 }
 
-void XMLSignatureHelper::AddForSigning( sal_Int32 nSecurityId, const OUString& uri, const OUString& objectURL, sal_Bool bBinary )
+void XMLSignatureHelper::AddForSigning( sal_Int32 nSecurityId, const OUString& uri, const OUString& objectURL, bool bBinary )
 {
     mpXSecController->signAStream( nSecurityId, uri, objectURL, bBinary );
 }
diff --git a/xmlsecurity/source/helper/xsecctl.hxx b/xmlsecurity/source/helper/xsecctl.hxx
index c750c9e2e01a..8971cc594adc 100644
--- a/xmlsecurity/source/helper/xsecctl.hxx
+++ b/xmlsecurity/source/helper/xsecctl.hxx
@@ -422,7 +422,7 @@ public:
     /*
      * For signature generation
      */
-    void signAStream( sal_Int32 securityId, const OUString& uri, const OUString& objectURL, sal_Bool isBinary);
+    void signAStream( sal_Int32 securityId, const OUString& uri, const OUString& objectURL, bool isBinary);
 
 
     /** sets data that describes the certificate.
diff --git a/xmlsecurity/source/helper/xsecsign.cxx b/xmlsecurity/source/helper/xsecsign.cxx
index b7660d9347c0..baedd74150ac 100644
--- a/xmlsecurity/source/helper/xsecsign.cxx
+++ b/xmlsecurity/source/helper/xsecsign.cxx
@@ -183,9 +183,9 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
     return xReferenceResolvedListener;
 }
 
-void XSecController::signAStream( sal_Int32 securityId, const OUString& uri, const OUString& /*objectURL*/, sal_Bool isBinary)
+void XSecController::signAStream( sal_Int32 securityId, const OUString& uri, const OUString& /*objectURL*/, bool isBinary)
 {
-        sal_Int32 type = ((isBinary==sal_True)?TYPE_BINARYSTREAM_REFERENCE:TYPE_XMLSTREAM_REFERENCE);
+    sal_Int32 type = isBinary ? TYPE_BINARYSTREAM_REFERENCE : TYPE_XMLSTREAM_REFERENCE;
 
     int index = findSignatureInfor( securityId );
 
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 );