From 9f4e283fc8af97c4599e21006ad73b73fc141f81 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 13 Jun 2016 09:21:03 +0200 Subject: loplugin:sallogareas Change-Id: I6ce045db236b81aa8bc7bce2a0e20c4132c5931f --- xmlsecurity/source/component/documentdigitalsignatures.cxx | 8 ++++---- xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 8 ++++---- xmlsecurity/source/dialogs/macrosecurity.cxx | 2 +- xmlsecurity/source/helper/documentsignaturehelper.cxx | 2 +- xmlsecurity/source/helper/xmlsignaturehelper.cxx | 10 +++++----- xmlsecurity/source/helper/xsecctl.cxx | 4 ++-- xmlsecurity/source/helper/xsecparser.cxx | 2 +- xmlsecurity/source/helper/xsecsign.cxx | 2 +- xmlsecurity/source/helper/xsecverify.cxx | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) (limited to 'xmlsecurity') diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx index 06921922f5f7..eb39cafa9397 100644 --- a/xmlsecurity/source/component/documentdigitalsignatures.cxx +++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx @@ -224,7 +224,7 @@ bool DocumentDigitalSignatures::ImplViewSignatures( nullptr, mxCtx, eMode, bReadOnly, m_sODFVersion, m_bHasDocumentSignature); bool bInit = aSignaturesDialog->Init(); - SAL_WARN_IF( !bInit, "xmlsecurity", "Error initializing security context!" ); + SAL_WARN_IF( !bInit, "xmlsecurity.comp", "Error initializing security context!" ); if ( bInit ) { aSignaturesDialog->SetStorage( rxStorage ); @@ -259,7 +259,7 @@ DocumentDigitalSignatures::ImplVerifySignatures( { if (!rxStorage.is()) { - SAL_WARN( "xmlsecurity", "Error, no XStorage provided"); + SAL_WARN( "xmlsecurity.comp", "Error, no XStorage provided"); return Sequence(); } // First check for the InputStream, to avoid unnecessary initialization of the security environment... @@ -281,7 +281,7 @@ DocumentDigitalSignatures::ImplVerifySignatures( bool bInit = aSignatureHelper.Init(); - SAL_WARN_IF( !bInit, "xmlsecurity", "Error initializing security context!" ); + SAL_WARN_IF( !bInit, "xmlsecurity.comp", "Error initializing security context!" ); if ( !bInit ) return Sequence< css::security::DocumentSignatureInformation >(0); @@ -404,7 +404,7 @@ void DocumentDigitalSignatures::showCertificate( bool bInit = aSignatureHelper.Init(); - SAL_WARN_IF( !bInit, "xmlsecurity", "Error initializing security context!" ); + SAL_WARN_IF( !bInit, "xmlsecurity.comp", "Error initializing security context!" ); if ( bInit ) { diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index b20be6cb01b3..196ccb01fdb5 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -201,7 +201,7 @@ bool DigitalSignaturesDialog::Init() { bool bInit = maSignatureManager.maSignatureHelper.Init(); - SAL_WARN_IF( !bInit, "xmlsecurity", "Error initializing security context!" ); + SAL_WARN_IF( !bInit, "xmlsecurity.dialogs", "Error initializing security context!" ); if ( bInit ) { @@ -447,7 +447,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox() //in the digital signature dialog. //Comparing the X509IssuerName with the one from the X509Certificate in order //to find out if the X509IssuerName was modified does not work. See #i62684 - SAL_WARN( "xmlsecurity", "Could not find embedded certificate!"); + SAL_WARN( "xmlsecurity.dialogs", "Could not find embedded certificate!"); } //In case there is no embedded certificate we try to get it from a local store @@ -455,7 +455,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox() if (!xCert.is()) xCert = xSecEnv->getCertificate( rInfo.ouX509IssuerName, xSerialNumberAdapter->toSequence( rInfo.ouX509SerialNumber ) ); - SAL_WARN_IF( !xCert.is(), "xmlsecurity", "Certificate not found and can't be created!" ); + SAL_WARN_IF( !xCert.is(), "xmlsecurity.dialogs", "Certificate not found and can't be created!" ); OUString aSubject; OUString aIssuer; @@ -587,7 +587,7 @@ void DigitalSignaturesDialog::ImplShowSignaturesDetails() if (!xCert.is()) xCert = xSecEnv->getCertificate( rInfo.ouX509IssuerName, xSerialNumberAdapter->toSequence( rInfo.ouX509SerialNumber ) ); - SAL_WARN_IF( !xCert.is(), "xmlsecurity", "Error getting Certificate!" ); + SAL_WARN_IF( !xCert.is(), "xmlsecurity.dialogs", "Error getting Certificate!" ); if ( xCert.is() ) { ScopedVclPtrInstance< CertificateViewer > aViewer( this, maSignatureManager.maSignatureHelper.GetSecurityEnvironment(), xCert, false ); diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index 36e4c614a4a8..d73123ea7ba5 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -230,7 +230,7 @@ IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, ViewCertPBHdl, Button*, voi if ( !xCert.is() ) xCert = mpDlg->mxSecurityEnvironment->createCertificateFromAscii( maTrustedAuthors[nSelected][2] ) ; - SAL_WARN_IF( !xCert.is(), "xmlsecurity", "*MacroSecurityTrustedSourcesTP::ViewCertPBHdl(): Certificate not found and can't be created!" ); + SAL_WARN_IF( !xCert.is(), "xmlsecurity.dialogs", "*MacroSecurityTrustedSourcesTP::ViewCertPBHdl(): Certificate not found and can't be created!" ); if ( xCert.is() ) { diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx index 7886153574ed..365f690edb7e 100644 --- a/xmlsecurity/source/helper/documentsignaturehelper.cxx +++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx @@ -383,7 +383,7 @@ SignatureStreamHelper DocumentSignatureHelper::OpenSignatureStream( catch(css::io::IOException& ) { // Doesn't have to exist... - SAL_WARN_IF( nOpenMode != css::embed::ElementModes::READ, "xmlsecurity", "Error creating signature stream..." ); + SAL_WARN_IF( nOpenMode != css::embed::ElementModes::READ, "xmlsecurity.helper", "Error creating signature stream..." ); } } else if(xNameAccess->hasByName("[Content_Types].xml")) diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx index b4dd0c181a5c..a79a98213c10 100644 --- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx +++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx @@ -74,8 +74,8 @@ XMLSignatureHelper::~XMLSignatureHelper() bool XMLSignatureHelper::Init() { - SAL_WARN_IF( mxSEInitializer.is(), "xmlsecurity", "XMLSignatureHelper::Init - mxSEInitializer already set!" ); - SAL_WARN_IF( mxSecurityContext.is(), "xmlsecurity", "XMLSignatureHelper::Init - mxSecurityContext already set!" ); + SAL_WARN_IF( mxSEInitializer.is(), "xmlsecurity.helper", "XMLSignatureHelper::Init - mxSEInitializer already set!" ); + SAL_WARN_IF( mxSecurityContext.is(), "xmlsecurity.helper", "XMLSignatureHelper::Init - mxSecurityContext already set!" ); mxSEInitializer = css::xml::crypto::SEInitializer::create( mxCtx ); @@ -89,9 +89,9 @@ void XMLSignatureHelper::SetStorage( const Reference < css::embed::XStorage >& rxStorage, const OUString& sODFVersion) { - SAL_WARN_IF( mxUriBinding.is(), "xmlsecurity", "SetStorage - UriBinding already set!" ); + SAL_WARN_IF( mxUriBinding.is(), "xmlsecurity.helper", "SetStorage - UriBinding already set!" ); mxUriBinding = new UriBindingHelper( rxStorage ); - SAL_WARN_IF(!rxStorage.is(), "xmlsecurity", "SetStorage - empty storage!"); + SAL_WARN_IF(!rxStorage.is(), "xmlsecurity.helper", "SetStorage - empty storage!"); mbODFPre1_2 = DocumentSignatureHelper::isODFPre_1_2(sODFVersion); } @@ -256,7 +256,7 @@ bool XMLSignatureHelper::ReadAndVerifySignature( const css::uno::Reference< css: { mbError = false; - SAL_WARN_IF(!xInputStream.is(), "xmlsecurity", "input stream missing"); + SAL_WARN_IF(!xInputStream.is(), "xmlsecurity.helper", "input stream missing"); /* * prepare ParserInputSrouce diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx index 85d607c8fde1..aa2528ac4583 100644 --- a/xmlsecurity/source/helper/xsecctl.cxx +++ b/xmlsecurity/source/helper/xsecctl.cxx @@ -417,7 +417,7 @@ cssu::Reference< css::io::XInputStream > { cssu::Reference< css::io::XInputStream > xObjectInputStream; - SAL_WARN_IF( !m_xUriBinding.is(), "xmlsecurity", "Need XUriBinding!" ); + SAL_WARN_IF( !m_xUriBinding.is(), "xmlsecurity.helper", "Need XUriBinding!" ); xObjectInputStream = m_xUriBinding->getUriBinding(objectURL); @@ -864,7 +864,7 @@ SignatureInformation XSecController::getSignatureInformation( sal_Int32 nSecurit { SignatureInformation aInf( 0 ); int nIndex = findSignatureInfor(nSecurityId); - SAL_WARN_IF( nIndex == -1, "xmlsecurity", "getSignatureInformation - SecurityId is invalid!" ); + SAL_WARN_IF( nIndex == -1, "xmlsecurity.helper", "getSignatureInformation - SecurityId is invalid!" ); if ( nIndex != -1) { aInf = m_vInternalSignatureInformations[nIndex].signatureInfor; diff --git a/xmlsecurity/source/helper/xsecparser.cxx b/xmlsecurity/source/helper/xsecparser.cxx index f823a7ec4e39..ac3eddfedeed 100644 --- a/xmlsecurity/source/helper/xsecparser.cxx +++ b/xmlsecurity/source/helper/xsecparser.cxx @@ -107,7 +107,7 @@ void SAL_CALL XSecParser::startElement( else if ( aName == TAG_REFERENCE ) { OUString ouUri = xAttribs->getValueByName(ATTR_URI); - SAL_WARN_IF( ouUri == nullptr, "xmlsecurity", "URI == NULL" ); + SAL_WARN_IF( ouUri == nullptr, "xmlsecurity.helper", "URI == NULL" ); if (ouUri.startsWith(CHAR_FRAGMENT)) { diff --git a/xmlsecurity/source/helper/xsecsign.cxx b/xmlsecurity/source/helper/xsecsign.cxx index a048fbb7b213..c91c46784ac2 100644 --- a/xmlsecurity/source/helper/xsecsign.cxx +++ b/xmlsecurity/source/helper/xsecsign.cxx @@ -306,7 +306,7 @@ bool XSecController::WriteSignature( { bool rc = false; - SAL_WARN_IF( !xDocumentHandler.is(), "xmlsecurity", "I really need a document handler!" ); + SAL_WARN_IF( !xDocumentHandler.is(), "xmlsecurity.helper", "I really need a document handler!" ); /* * chain the SAXEventKeeper to the SAX chain diff --git a/xmlsecurity/source/helper/xsecverify.cxx b/xmlsecurity/source/helper/xsecverify.cxx index 7651e4ae0b4b..f0801a09e23a 100644 --- a/xmlsecurity/source/helper/xsecverify.cxx +++ b/xmlsecurity/source/helper/xsecverify.cxx @@ -392,7 +392,7 @@ void XSecController::collectToVerify( const OUString& referenceId ) void XSecController::addSignature( sal_Int32 nSignatureId ) { - SAL_WARN_IF( !m_xSecParser.is(), "xmlsecurity", "No XSecParser initialized" ); + SAL_WARN_IF( !m_xSecParser.is(), "xmlsecurity.helper", "No XSecParser initialized" ); m_nReservedSignatureId = nSignatureId; m_bVerifyCurrentSignature = true; -- cgit