loplugin:logexceptionnicely in various

Change-Id: I207d21e674366046e2663ebaf7f5161cde2c5fab
Reviewed-on: https://gerrit.libreoffice.org/74336
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2019-06-09 13:48:35 +02:00
parent edca548f86
commit ef73fefd02
4 changed files with 28 additions and 25 deletions

View File

@ -129,7 +129,7 @@ public:
}
};
static Plugin::Registration<LogExceptionNicely> X("logexceptionnicely", false);
static Plugin::Registration<LogExceptionNicely> X("logexceptionnicely");
} // namespace

View File

@ -12,6 +12,7 @@
#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/awt/XWindow.hpp>
#include <sal/log.hxx>
#include <tools/diagnose_ex.h>
#include <libwps/libwps.h>
@ -83,9 +84,9 @@ bool MSWorksImportFilter::doImportDocument(weld::Window* pParent,
return false;
}
}
catch (css::uno::Exception& e)
catch (css::uno::Exception&)
{
SAL_WARN("writerperfect", "ignoring " << e);
TOOLS_WARN_EXCEPTION("writerperfect", "ignoring");
}
return libwps::WPS_OK
== libwps::WPSDocument::parse(&rInput, &rGenerator, "", fileEncoding.c_str());

View File

@ -32,6 +32,7 @@
#include <com/sun/star/xml/sax/SAXException.hpp>
#include <cppuhelper/implementationentry.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <tools/diagnose_ex.h>
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
@ -294,24 +295,24 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& /
m_xHandler->endDocument();
}
}
catch ( const container::NoSuchElementException& e )
catch ( const container::NoSuchElementException& )
{
SAL_INFO("xmlscript.xmlflat", "XMLBasicExporterBase::filter: caught NoSuchElementException reason " << e );
TOOLS_INFO_EXCEPTION("xmlscript.xmlflat", "XMLBasicExporterBase::filter" );
bReturn = false;
}
catch ( const lang::IllegalArgumentException& e )
catch ( const lang::IllegalArgumentException& )
{
SAL_INFO("xmlscript.xmlflat", "XMLBasicExporterBase::filter: caught IllegalArgumentException reason " << e );
TOOLS_INFO_EXCEPTION("xmlscript.xmlflat", "XMLBasicExporterBase::filter" );
bReturn = false;
}
catch ( const lang::WrappedTargetException& e )
catch ( const lang::WrappedTargetException& )
{
SAL_INFO("xmlscript.xmlflat", "XMLBasicExporterBase::filter: caught WrappedTargetException reason " << e );
TOOLS_INFO_EXCEPTION("xmlscript.xmlflat", "XMLBasicExporterBase::filter:" );
bReturn = false;
}
catch ( const xml::sax::SAXException& e )
catch ( const xml::sax::SAXException& )
{
SAL_INFO("xmlscript.xmlflat", "XMLBasicExporterBase::filter: caught SAXException reason " << e );
TOOLS_INFO_EXCEPTION("xmlscript.xmlflat", "XMLBasicExporterBase::filter:" );
bReturn = false;
}

View File

@ -30,6 +30,7 @@
#include <com/sun/star/xml/sax/SAXException.hpp>
#include <cppuhelper/implementationentry.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <tools/diagnose_ex.h>
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
@ -174,13 +175,13 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
if ( xLib.is() )
xElement.set( new BasicElementBase( rLocalName, xAttributes, this, m_xImport.get() ) );
}
catch ( const container::ElementExistException& e )
catch ( const container::ElementExistException& )
{
SAL_INFO("xmlscript.xmlflat", "BasicLibrariesElement::startChildElement: caught ElementExceptionExist reason " << e );
TOOLS_INFO_EXCEPTION("xmlscript.xmlflat", "BasicLibrariesElement::startChildElement" );
}
catch ( const lang::IllegalArgumentException& e )
catch ( const lang::IllegalArgumentException& )
{
SAL_INFO("xmlscript.xmlflat", "BasicLibrariesElement::startChildElement: caught IllegalArgumentException reason " << e );
TOOLS_INFO_EXCEPTION("xmlscript.xmlflat", "BasicLibrariesElement::startChildElement" );
}
}
}
@ -214,9 +215,9 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
if ( xLib.is() )
xElement.set( new BasicEmbeddedLibraryElement( rLocalName, xAttributes, this, m_xImport.get(), m_xLibContainer, aName, bReadOnly ) );
}
catch ( const lang::IllegalArgumentException& e )
catch ( const lang::IllegalArgumentException& )
{
SAL_INFO("xmlscript.xmlflat", "BasicLibrariesElement::startChildElement: caught IllegalArgumentException reason " << e );
TOOLS_INFO_EXCEPTION("xmlscript.xmlflat", "BasicLibrariesElement::startChildElement" );
}
}
}
@ -250,9 +251,9 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
if ( m_xLibContainer.is() && m_xLibContainer->hasByName( m_aLibName ) )
m_xLibContainer->getByName( m_aLibName ) >>= m_xLib;
}
catch ( const lang::WrappedTargetException& e )
catch ( const lang::WrappedTargetException& )
{
SAL_INFO("xmlscript.xmlflat", "BasicEmbeddedLibraryElement CTOR: caught WrappedTargetException reason " << e );
TOOLS_INFO_EXCEPTION("xmlscript.xmlflat", "BasicEmbeddedLibraryElement::CTOR:" );
}
}
@ -370,17 +371,17 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
m_xLib->insertByName( m_aName, aElement );
}
}
catch ( const container::ElementExistException& e )
catch ( const container::ElementExistException& )
{
SAL_INFO("xmlscript.xmlflat", "BasicSourceCodeElement::endElement: caught ElementExceptionExist reason " << e );
TOOLS_INFO_EXCEPTION("xmlscript.xmlflat", "BasicSourceCodeElement::endElement" );
}
catch ( const lang::IllegalArgumentException& e )
catch ( const lang::IllegalArgumentException& )
{
SAL_INFO("xmlscript.xmlflat", "BasicSourceCodeElement::endElement: caught IllegalArgumentException reason " << e );
TOOLS_INFO_EXCEPTION("xmlscript.xmlflat", "BasicSourceCodeElement::endElement" );
}
catch ( const lang::WrappedTargetException& e )
catch ( const lang::WrappedTargetException& )
{
SAL_INFO("xmlscript.xmlflat", "BasicSourceCodeElement::endElement: caught WrappedTargetException reason " << e );
TOOLS_INFO_EXCEPTION("xmlscript.xmlflat", "BasicSourceCodeElement::endElement" );
}
}