[Libreoffice-commits] core.git: basctl/source cui/source extensions/source include/sal xmlsecurity/source
Noel Grandin
noel at peralex.com
Mon Jun 13 08:27:26 UTC 2016
basctl/source/basicide/basides1.cxx | 2 +-
basctl/source/basicide/sbxitem.cxx | 2 +-
cui/source/dialogs/hyphen.cxx | 2 +-
cui/source/dialogs/insdlg.cxx | 2 +-
cui/source/tabpages/numpages.cxx | 2 +-
extensions/source/dbpilots/listcombowizard.cxx | 2 +-
include/sal/log-areas.dox | 1 +
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 +-
16 files changed, 27 insertions(+), 26 deletions(-)
New commits:
commit 9f4e283fc8af97c4599e21006ad73b73fc141f81
Author: Noel Grandin <noel at peralex.com>
Date: Mon Jun 13 09:21:03 2016 +0200
loplugin:sallogareas
Change-Id: I6ce045db236b81aa8bc7bce2a0e20c4132c5931f
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index d9fcf8d..8bd711b 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -1166,7 +1166,7 @@ VclPtr<ModulWindow> Shell::ShowActiveModuleWindow( StarBASIC* pBasic )
}
}
else
- SAL_WARN( "basctl", "No BASIC!");
+ SAL_WARN( "basctl.basicide", "No BASIC!");
if (BasicManager* pBasicMgr = FindBasicManager(pBasic))
StartListening( *pBasicMgr, true /* log on only once */ );
return pWin;
diff --git a/basctl/source/basicide/sbxitem.cxx b/basctl/source/basicide/sbxitem.cxx
index b68cadf..c94fa24 100644
--- a/basctl/source/basicide/sbxitem.cxx
+++ b/basctl/source/basicide/sbxitem.cxx
@@ -21,7 +21,7 @@
namespace basctl
{
-SfxPoolItem* SbxItem::CreateDefault() { SAL_WARN( "basctl", "No SbxItem factory available"); return nullptr; }
+SfxPoolItem* SbxItem::CreateDefault() { SAL_WARN( "basctl.basicide", "No SbxItem factory available"); return nullptr; }
SbxItem::SbxItem (
sal_uInt16 nWhichItem,
ScriptDocument const& rDocument,
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index efcfd92..8d19026 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -366,7 +366,7 @@ IMPL_LINK_NOARG_TYPED( SvxHyphenWordDialog, HyphenateAllHdl_Impl, Button *, void
catch (uno::Exception &e)
{
(void) e;
- SAL_WARN( "cui", "Hyphenate All failed" );
+ SAL_WARN( "cui.dialogs", "Hyphenate All failed" );
}
}
}
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index bc88e0c..c98baa8 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -120,7 +120,7 @@ IMPL_LINK_NOARG_TYPED(SvInsertOleDlg, BrowseHdl, Button*, void)
}
catch( const IllegalArgumentException& )
{
- SAL_WARN( "cui", "caught IllegalArgumentException when registering filter\n" );
+ SAL_WARN( "cui.dialogs", "caught IllegalArgumentException when registering filter\n" );
}
if( xFilePicker->execute() == ExecutableDialogResults::OK )
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 36efe21..5c5eed2 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -3236,7 +3236,7 @@ void SvxNumPositionTabPage::InitPosAndSpaceMode()
{
if ( pActNum == nullptr )
{
- SAL_WARN( "cui",
+ SAL_WARN( "cui.tabpages",
"<SvxNumPositionTabPage::InitPosAndSpaceMode()> - misusage of method -> <pAktNum> has to be already set!" );
return;
}
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index 73f094d..d7a764b 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -254,7 +254,7 @@ namespace dbp
}
catch(const Exception&)
{
- SAL_WARN( "extensions", "OLinkFieldsPage::initializePage: caught an exception while retrieving the columns!");
+ SAL_WARN( "extensions.dbpilots", "OLinkFieldsPage::initializePage: caught an exception while retrieving the columns!");
}
}
return aColumnNames;
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 2de5d4f..25588df 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -504,6 +504,7 @@ certain functionality.
@section xmlsecurity
+ at li @c xmlsecurity.comp - xml security component
@li @c xmlsecurity.dialogs - xml security dialogs
@li @c xmlsecurity.helper
@li @c xmlsecurity.xmlsec - xmlsec wrapper
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index 0692192..eb39caf 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<css::security::DocumentSignatureInformation>();
}
// 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 b20be6c..196ccb0 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 36e4c61..d73123e 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 7886153..365f690 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 b4dd0c1..a79a982 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 85d607c..aa2528a 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 f823a7e..ac3eddf 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 a048fbb..c91c467 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 7651e4a..f0801a0 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;
More information about the Libreoffice-commits
mailing list