summaryrefslogtreecommitdiff
path: root/xmlscript/source
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-06-09 13:48:35 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-06-20 10:38:48 +0200
commitef73fefd023372ec0157683ed9ab349ff551a67c (patch)
tree7f5b129e567bfca263b333a00d6c3814f49f681d /xmlscript/source
parentedca548f865f4c19f213c1386905ec3591326461 (diff)
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>
Diffstat (limited to 'xmlscript/source')
-rw-r--r--xmlscript/source/xmlflat_imexp/xmlbas_export.cxx17
-rw-r--r--xmlscript/source/xmlflat_imexp/xmlbas_import.cxx29
2 files changed, 24 insertions, 22 deletions
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
index 74db5079a8cc..02a1f900e390 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
@@ -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;
}
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
index 9a143c6567e1..4c7b4bf39876 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
@@ -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" );
}
}