Kaydet (Commit) 183debd7 authored tarafından Noel Grandin's avatar Noel Grandin

pretty up logging of exceptions

Add exceptionToString() and getCaughtExceptionAsString() methods in
tools.

Use the new methods in DbgUnhandledException()

Add special-case case code for most of the exceptions that contain extra
fields, so all of the relevant data ends up in the log

Change-Id: I376f6549b4d7bd480202f8bff17a454657c75ece
Reviewed-on: https://gerrit.libreoffice.org/67857
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 9c1383e4
......@@ -913,7 +913,7 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL,
"basic",
"couldn't open sub storage for library \""
<< rLib.aName << "\". Exception: "
<< comphelper::anyToString(aError));
<< exceptionToString(aError));
#endif
}
}
......@@ -1943,7 +1943,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
"basic",
"couldn't create sub storage for library \""
<< rLib.aName << "\". Exception: "
<< comphelper::anyToString(aError));
<< exceptionToString(aError));
throw;
}
#endif
......@@ -2353,8 +2353,7 @@ void SAL_CALL SfxLibraryContainer::loadLibrary( const OUString& Name )
SAL_WARN(
"basic",
"couldn't open sub storage for library \"" << Name
<< "\". Exception: "
<< comphelper::anyToString(aError));
<< "\". Exception: " << exceptionToString(aError));
throw;
}
#endif
......
......@@ -26,6 +26,7 @@
#include <comphelper/anytostring.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <osl/diagnose.h>
#include <tools/diagnose_ex.h>
#include "dx_config.hxx"
......@@ -83,7 +84,7 @@ namespace dxcanvas
}
catch( const uno::Exception& )
{
SAL_WARN( "canvas", comphelper::anyToString( cppu::getCaughtException() ) );
SAL_WARN( "canvas", exceptionToString( cppu::getCaughtException() ) );
}
}
......@@ -114,7 +115,7 @@ namespace dxcanvas
}
catch( const uno::Exception& )
{
SAL_WARN( "canvas", comphelper::anyToString( cppu::getCaughtException() ) );
SAL_WARN( "canvas", exceptionToString( cppu::getCaughtException() ) );
}
}
......
......@@ -30,7 +30,6 @@
#include <cppuhelper/exc_hlp.hxx>
#include <osl/diagnose.h>
#include <osl/thread.h>
#include <sal/log.hxx>
namespace comphelper {
......@@ -147,6 +146,7 @@ namespace comphelper {
}
catch ( const Exception& )
{
// Cannot use tools::exceptionToString here, because the tools module depends on the comphelper module
css::uno::Any caught( ::cppu::getCaughtException() );
css::uno::Exception exception;
caught >>= exception;
......
......@@ -69,6 +69,7 @@
#include <com/sun/star/xml/xpath/XXPathAPI.hpp>
#include <com/sun/star/deployment/XPackageManager.hpp>
#include <boost/optional.hpp>
#include <tools/diagnose_ex.h>
#include <algorithm>
#include <memory>
......@@ -845,8 +846,7 @@ void BackendImpl::PackageImpl::processPackage_(
}
catch (const Exception &)
{
SAL_WARN( "desktop", ::comphelper::anyToString(
::cppu::getCaughtException() ) );
SAL_WARN( "desktop", exceptionToString( cppu::getCaughtException() ) );
// ignore any errors of rollback
}
}
......@@ -933,7 +933,7 @@ OUString BackendImpl::PackageImpl::getDescription()
}
catch ( const css::deployment::DeploymentException& )
{
SAL_WARN( "desktop", ::comphelper::anyToString( ::cppu::getCaughtException() ) );
SAL_WARN( "desktop", exceptionToString( cppu::getCaughtException() ) );
}
}
......@@ -1055,8 +1055,7 @@ void BackendImpl::PackageImpl::exportTo(
}
// xxx todo: think about exception specs:
catch (const deployment::DeploymentException &) {
SAL_WARN( "desktop", ::comphelper::anyToString(
::cppu::getCaughtException() ) );
SAL_WARN( "desktop", exceptionToString( cppu::getCaughtException() ) );
}
catch (const lang::IllegalArgumentException & exc) {
SAL_WARN( "desktop", exc );
......
......@@ -129,6 +129,10 @@ inline css::uno::Any DbgGetCaughtException()
return; \
}
/** Convert a caught exception to a string suitable for logging.
*/
TOOLS_DLLPUBLIC OString exceptionToString(css::uno::Any const & caughtEx);
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -23,6 +23,7 @@
#include <osl/diagnose.h>
#include <sal/log.hxx>
#include <tools/multisel.hxx>
#include <tools/diagnose_ex.h>
#include <com/sun/star/drawing/XMasterPagesSupplier.hpp>
#include <com/sun/star/drawing/XDrawPages.hpp>
......@@ -442,7 +443,7 @@ void PresentationFragmentHandler::importSlide(sal_uInt32 nSlide, bool bFirstPage
catch( uno::Exception& )
{
SAL_WARN( "oox", "oox::ppt::PresentationFragmentHandler::EndDocument(), "
"exception caught: " << comphelper::anyToString( cppu::getCaughtException() ) );
"exception caught: " << exceptionToString( cppu::getCaughtException() ) );
}
}
......@@ -493,7 +494,7 @@ void PresentationFragmentHandler::finalizeImport()
catch( uno::Exception& )
{
SAL_WARN( "oox", "oox::ppt::PresentationFragmentHandler::finalizeImport(), "
"exception caught: " << comphelper::anyToString( cppu::getCaughtException() ) );
"exception caught: " << exceptionToString( cppu::getCaughtException() ) );
}
// todo error handling;
if ( rxStatusIndicator.is() )
......
......@@ -24,6 +24,7 @@
#include <com/sun/star/container/XNamed.hpp>
#include <osl/diagnose.h>
#include <sal/log.hxx>
#include <tools/diagnose_ex.h>
#include <oox/helper/attributelist.hxx>
#include <oox/helper/propertyset.hxx>
......@@ -251,7 +252,7 @@ void SlideFragmentHandler::finalizeImport()
catch( uno::Exception& )
{
SAL_WARN( "oox", "oox::ppt::SlideFragmentHandler::EndElement(), "
"exception caught: " << comphelper::anyToString( cppu::getCaughtException() ) );
"exception caught: " << exceptionToString( cppu::getCaughtException() ) );
}
}
......
......@@ -26,6 +26,7 @@ $(eval $(call gb_Library_use_libraries,xstor,\
cppuhelper \
sal \
salhelper \
tl \
))
$(eval $(call gb_Library_add_exception_objects,xstor,\
......
......@@ -48,6 +48,7 @@
#include <rtl/digest.h>
#include <rtl/instance.hxx>
#include <tools/diagnose_ex.h>
#include <PackageConstants.hxx>
......@@ -2360,10 +2361,10 @@ void SAL_CALL OWriteStream::dispose()
m_pImpl->Revert();
}
}
catch( const uno::Exception& rException )
catch( const uno::Exception& )
{
SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
SAL_INFO("package.xstor", "Rethrow: " << exceptionToString(aCaught));
throw lang::WrappedTargetRuntimeException("Can not commit/revert the storage!",
static_cast< OWeakObject* >( this ),
aCaught );
......@@ -2489,10 +2490,10 @@ sal_Bool SAL_CALL OWriteStream::hasEncryptionData()
SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch( const uno::Exception& rException )
catch( const uno::Exception& )
{
SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
SAL_INFO("package.xstor", "Rethrow: " << exceptionToString(aCaught));
throw lang::WrappedTargetRuntimeException( "Problems on hasEncryptionData!",
static_cast< ::cppu::OWeakObject* >( this ),
aCaught );
......@@ -3169,10 +3170,10 @@ void SAL_CALL OWriteStream::commit()
SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch( const uno::Exception& rException )
catch( const uno::Exception& )
{
SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
SAL_INFO("package.xstor", "Rethrow: " << exceptionToString(aCaught));
throw embed::StorageWrappedTargetException( "Problems on commit!",
static_cast< ::cppu::OWeakObject* >( this ),
aCaught );
......@@ -3224,10 +3225,10 @@ void SAL_CALL OWriteStream::revert()
SAL_INFO("package.xstor", "Rethrow: " << rRuntimeException);
throw;
}
catch( const uno::Exception& rException )
catch( const uno::Exception& )
{
SAL_INFO("package.xstor", "Rethrow: " << rException);
uno::Any aCaught( ::cppu::getCaughtException() );
SAL_INFO("package.xstor", "Rethrow: " << exceptionToString(aCaught));
throw embed::StorageWrappedTargetException( "Problems on revert!",
static_cast< ::cppu::OWeakObject* >( this ),
aCaught );
......
......@@ -36,6 +36,7 @@
#include <cppuhelper/exc_hlp.hxx>
#include <sal/log.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <animations/animationnodehelper.hxx>
#include <svx/svditer.hxx>
......@@ -123,7 +124,7 @@ namespace sd
catch( Exception& )
{
SAL_WARN( "sd", "sd::CustomAnimationClonerImpl::Clone(), "
"exception caught: " << comphelper::anyToString( cppu::getCaughtException() ) );
"exception caught: " << exceptionToString( cppu::getCaughtException() ) );
Reference< XAnimationNode > xEmpty;
return xEmpty;
}
......@@ -200,7 +201,7 @@ namespace sd
{
SAL_WARN( "sd", "sd::CustomAnimationClonerImpl::transformNode(), "
"exception caught: "
<< comphelper::anyToString( cppu::getCaughtException() ) );
<< exceptionToString( cppu::getCaughtException() ) );
}
}
......@@ -271,7 +272,7 @@ namespace sd
{
SAL_WARN( "sd", "sd::CustomAnimationClonerImpl::transformValue(), "
"exception caught: "
<< comphelper::anyToString( cppu::getCaughtException() ) );
<< exceptionToString( cppu::getCaughtException() ) );
}
return rValue;
......
......@@ -75,6 +75,7 @@
#include <comphelper/anytostring.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <tools/diagnose_ex.h>
#include <drawdoc.hxx>
#include <DrawDocShell.hxx>
......@@ -3056,7 +3057,7 @@ bool HtmlExport::checkFileExists( Reference< css::ucb::XSimpleFileAccess3 > cons
catch( css::uno::Exception& )
{
SAL_WARN( "sd", "sd::HtmlExport::checkFileExists(), exception caught: "
<< comphelper::anyToString( cppu::getCaughtException() ) );
<< exceptionToString( cppu::getCaughtException() ) );
}
return false;
......@@ -3107,7 +3108,7 @@ bool HtmlExport::checkForExistingFiles()
catch( Exception& )
{
SAL_WARN( "sd", "sd::HtmlExport::checkForExistingFiles(), exception caught: "
<< comphelper::anyToString( cppu::getCaughtException() ) );
<< exceptionToString( cppu::getCaughtException() ) );
bFound = false;
}
......
......@@ -23,6 +23,7 @@
#include <sal/log.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <vcl/svapp.hxx>
#include <tools/diagnose_ex.h>
using namespace sd;
using namespace ::osl;
......@@ -147,7 +148,7 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand )
catch ( Exception& )
{
SAL_WARN( "sdremote", "sd::SlideShowImpl::setPointerPosition(), "
"exception caught: " << comphelper::anyToString( cppu::getCaughtException() ));
"exception caught: " << exceptionToString( cppu::getCaughtException() ));
}
if (xSlideShow.is()) try
......@@ -161,7 +162,7 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand )
catch ( Exception& )
{
SAL_WARN( "sdremote", "sd::SlideShowImpl::setPointerMode(), "
"exception caught: " << comphelper::anyToString( cppu::getCaughtException() ));
"exception caught: " << exceptionToString( cppu::getCaughtException() ));
}
SAL_INFO( "sdremote", "Pointer started, we display the pointer on screen" );
......@@ -180,7 +181,7 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand )
catch ( Exception& )
{
SAL_WARN( "sdremote", "sd::SlideShowImpl::setPointerMode(), "
"exception caught: " << comphelper::anyToString( cppu::getCaughtException() ));
"exception caught: " << exceptionToString( cppu::getCaughtException() ));
}
SAL_INFO( "sdremote", "Pointer dismissed, we hide the pointer on screen" );
......@@ -205,7 +206,7 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand )
catch ( Exception& )
{
SAL_WARN( "sdremote", "sd::SlideShowImpl::setPointerPosition(), "
"exception caught: " << comphelper::anyToString( cppu::getCaughtException() ));
"exception caught: " << exceptionToString( cppu::getCaughtException() ));
}
}
else if ( aCommand[0] == "presentation_resume" )
......
......@@ -43,6 +43,7 @@
#include <basic/sbstar.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/diagnose_ex.h>
#include <sfx2/infobar.hxx>
#include <sfx2/request.hxx>
......@@ -326,7 +327,7 @@ bool AnimationSlideController::getSlideAPI( sal_Int32 nSlideNumber, Reference< X
{
SAL_WARN( "sd", "sd::AnimationSlideController::getSlideAPI(), "
"exception caught: "
<< comphelper::anyToString( cppu::getCaughtException() ) );
<< exceptionToString( cppu::getCaughtException() ) );
}
return false;
......@@ -619,7 +620,7 @@ void SAL_CALL SlideshowImpl::disposing()
catch( Exception& )
{
SAL_WARN( "sd", "sd::SlideshowImpl::stop(), exception caught: "
<< comphelper::anyToString( cppu::getCaughtException() ) );
<< exceptionToString( cppu::getCaughtException() ) );
}
mxShow.clear();
......@@ -833,7 +834,7 @@ bool SlideshowImpl::startPreview(
catch( Exception& )
{
SAL_WARN( "sd", "sd::SlideshowImpl::startPreview(), exception caught: "
<< comphelper::anyToString( cppu::getCaughtException() ) );
<< exceptionToString( cppu::getCaughtException() ) );
bRet = false;
}
......@@ -1033,7 +1034,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx const * pPresSettings )
catch (const Exception&)
{
SAL_WARN( "sd", "sd::SlideshowImpl::startShow(), exception caught: "
<< comphelper::anyToString( cppu::getCaughtException() ) );
<< exceptionToString( cppu::getCaughtException() ) );
bRet = false;
}
......@@ -1103,7 +1104,7 @@ bool SlideshowImpl::startShowImpl( const Sequence< beans::PropertyValue >& aProp
catch( Exception& )
{
SAL_WARN( "sd", "sd::SlideshowImpl::startShowImpl(), exception caught: "
<< comphelper::anyToString( cppu::getCaughtException() ) );
<< exceptionToString( cppu::getCaughtException() ) );
return false;
}
}
......@@ -1137,7 +1138,7 @@ void SlideshowImpl::paint()
catch( Exception& )
{
SAL_WARN( "sd", "sd::SlideshowImpl::paint(), exception caught: "
<< comphelper::anyToString( cppu::getCaughtException() ) );
<< exceptionToString( cppu::getCaughtException() ) );
}
}
......@@ -1212,7 +1213,7 @@ void SlideshowImpl::removeShapeEvents()
catch( Exception& )
{
SAL_WARN( "sd", "sd::SlideshowImpl::removeShapeEvents(), exception caught: "
<< comphelper::anyToString( cppu::getCaughtException() ) );
<< exceptionToString( cppu::getCaughtException() ) );
}
}
......@@ -1244,7 +1245,7 @@ void SlideshowImpl::registerShapeEvents(sal_Int32 nSlideNumber)
catch( Exception& )
{
SAL_WARN( "sd", "sd::SlideshowImpl::registerShapeEvents(), exception caught: "
<< comphelper::anyToString( cppu::getCaughtException() ) );
<< exceptionToString( cppu::getCaughtException() ) );
}
}
......@@ -1316,7 +1317,7 @@ void SlideshowImpl::registerShapeEvents( Reference< XShapes > const & xShapes )
catch( Exception& )
{
SAL_WARN( "sd", "sd::SlideshowImpl::registerShapeEvents(), exception caught: "
<< comphelper::anyToString( cppu::getCaughtException() ) );
<< exceptionToString( cppu::getCaughtException() ) );
}
}
......@@ -1385,7 +1386,7 @@ void SAL_CALL SlideshowImpl::pause()
catch( Exception& )
{
SAL_WARN( "sd", "sd::SlideshowImpl::pause(), exception caught: "
<< comphelper::anyToString( cppu::getCaughtException() ) );
<< exceptionToString( cppu::getCaughtException() ) );
}
}
......@@ -1415,7 +1416,7 @@ void SAL_CALL SlideshowImpl::resume()
catch( Exception& )
{
SAL_WARN( "sd", "sd::SlideshowImpl::resume(), exception caught: "
<< comphelper::anyToString( cppu::getCaughtException() ) );
<< exceptionToString( cppu::getCaughtException() ) );
}
#ifdef ENABLE_SDREMOTE
RemoteServer::presentationStarted( this );
......@@ -1719,7 +1720,7 @@ void SlideshowImpl::updateSlideShow()
catch( Exception& )
{
SAL_WARN( "sd", "sd::SlideshowImpl::updateSlideShow(), exception caught: "
<< comphelper::anyToString( cppu::getCaughtException() ) );
<< exceptionToString( cppu::getCaughtException() ) );
}
}
......@@ -1844,7 +1845,7 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt)
{
bRet = false;
SAL_WARN( "sd", "sd::SlideshowImpl::keyInput(), exception caught: "
<< comphelper::anyToString( cppu::getCaughtException() ) );
<< exceptionToString( cppu::getCaughtException() ) );
}
return bRet;
......@@ -2225,7 +2226,7 @@ Reference< XSlideShow > SlideshowImpl::createSlideShow()
catch( uno::Exception& )
{
SAL_WARN( "sd", "sd::SlideshowImpl::createSlideShow(), exception caught: "
<< comphelper::anyToString( cppu::getCaughtException() ) );
<< exceptionToString( cppu::getCaughtException() ) );
}
return xShow;
......@@ -2404,7 +2405,7 @@ void SlideshowImpl::resize( const Size& rSize )
catch( Exception& )
{
SAL_WARN( "sd", "sd::SlideshowImpl::resize(), exception caught: "
<< comphelper::anyToString( cppu::getCaughtException() ) );
<< exceptionToString( cppu::getCaughtException() ) );
}
}
......@@ -2671,7 +2672,7 @@ void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen )
catch( Exception& )
{
SAL_WARN( "sd", "sd::SlideshowImpl::setUsePen(), exception caught: "
<< comphelper::anyToString( cppu::getCaughtException() ) );
<< exceptionToString( cppu::getCaughtException() ) );
}
}
......@@ -2720,7 +2721,7 @@ void SlideshowImpl::setEraseAllInk(bool bEraseAllInk)
catch( Exception& )
{
SAL_WARN( "sd.slideshow", "sd::SlideshowImpl::setEraseAllInk(), "
"exception caught: " << comphelper::anyToString( cppu::getCaughtException() ));
"exception caught: " << exceptionToString( cppu::getCaughtException() ));
}
}
......@@ -2920,7 +2921,7 @@ void SlideshowImpl::gotoPreviousSlide (const bool bSkipAllMainSequenceEffects)
catch( Exception& )
{
SAL_WARN( "sd", "sd::SlideshowImpl::gotoPreviousSlide(), exception caught: "
<< comphelper::anyToString( cppu::getCaughtException() ) );
<< exceptionToString( cppu::getCaughtException() ) );
}
}
......@@ -3005,7 +3006,7 @@ void SAL_CALL SlideshowImpl::stopSound( )
catch( Exception& )
{
SAL_WARN( "sd", "sd::SlideshowImpl::stopSound(), exception caught: "
<< comphelper::anyToString( cppu::getCaughtException() ) );
<< exceptionToString( cppu::getCaughtException() ) );
}
}
......
......@@ -44,6 +44,7 @@
#include <svx/fmglob.hxx>
#include <editeng/outliner.hxx>
#include <svx/dialogs.hrc>
#include <tools/diagnose_ex.h>
#include <view/viewoverlaymanager.hxx>
......@@ -245,7 +246,7 @@ void DrawViewShell::SelectionHasChanged()
catch( css::uno::Exception& )
{
SAL_WARN( "sd", "sd::DrawViewShell::SelectionHasChanged(), exception caught: "
<< comphelper::anyToString( cppu::getCaughtException() ) );
<< exceptionToString( cppu::getCaughtException() ) );
}
if( HasCurrentFunction() )
......
......@@ -18,8 +18,7 @@
*/
#include <comphelper/anytostring.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <tools/diagnose_ex.h>
#include <osl/diagnose.h>
#include <sal/log.hxx>
......@@ -119,7 +118,7 @@ namespace slideshow
// since this will also capture segmentation
// violations and the like. In such a case, we
// still better let our clients now...
SAL_WARN( "slideshow", comphelper::anyToString( cppu::getCaughtException() ) );
SAL_WARN( "slideshow", exceptionToString(cppu::getCaughtException()) );
}
catch( SlideShowException& )
{
......
......@@ -208,7 +208,7 @@ bool AnimationBaseNode::init_st()
mpActivity = createActivity();
}
catch (uno::Exception const&) {
SAL_WARN( "slideshow", comphelper::anyToString(cppu::getCaughtException()) );
SAL_WARN( "slideshow", exceptionToString(cppu::getCaughtException()) );
// catch and ignore. We later handle empty activities, but for
// other nodes to function properly, the core functionality of
// this node must remain up and running.
......
......@@ -234,7 +234,7 @@ namespace slideshow
// since this will also capture segmentation
// violations and the like. In such a case, we
// still better let our clients now...
SAL_WARN( "slideshow", comphelper::anyToString( cppu::getCaughtException() ) );
SAL_WARN( "slideshow", exceptionToString( cppu::getCaughtException() ) );
}
catch( SlideShowException& )
{
......
......@@ -29,6 +29,7 @@
#include <com/sun/star/rendering/XCanvas.hpp>
#include <com/sun/star/presentation/XSlideShowView.hpp>
#include <tools/diagnose_ex.h>
#include "pointersymbol.hxx"
#include <eventmultiplexer.hxx>
......@@ -126,7 +127,7 @@ void PointerSymbol::viewAdded( const UnoViewSharedPtr& rView )
}
catch( uno::Exception& )
{
SAL_WARN( "slideshow", comphelper::anyToString( cppu::getCaughtException() ) );
SAL_WARN( "slideshow", exceptionToString( cppu::getCaughtException() ) );
}
maViews.emplace_back( rView, sprite );
......
......@@ -935,7 +935,7 @@ std::shared_ptr<Activity> createDrawingLayerAnimActivity(
catch( uno::Exception& )
{
// translate any error into empty factory product.
SAL_WARN( "slideshow", comphelper::anyToString( cppu::getCaughtException() ) );
SAL_WARN( "slideshow", exceptionToString( cppu::getCaughtException() ) );
}
return pActivity;
......
......@@ -108,7 +108,7 @@ namespace slideshow
}
catch (uno::Exception &)
{
SAL_WARN( "slideshow", comphelper::anyToString( cppu::getCaughtException() ) );
SAL_WARN( "slideshow", exceptionToString( cppu::getCaughtException() ) );
}
}
......
......@@ -185,7 +185,7 @@ namespace slideshow
}
catch( uno::Exception& )
{
SAL_WARN( "slideshow", comphelper::anyToString( cppu::getCaughtException() ) );
SAL_WARN( "slideshow", exceptionToString( cppu::getCaughtException() ) );
return false;
}
......
......@@ -321,7 +321,7 @@ namespace slideshow
}
catch( uno::Exception& )
{
SAL_WARN( "slideshow", comphelper::anyToString( cppu::getCaughtException() ) );
SAL_WARN( "slideshow", exceptionToString( cppu::getCaughtException() ) );
}
}
}
......@@ -484,7 +484,7 @@ namespace slideshow
}
catch( uno::Exception& )
{
SAL_WARN( "slideshow", comphelper::anyToString( cppu::getCaughtException() ) );
SAL_WARN( "slideshow", exceptionToString( cppu::getCaughtException() ) );
}
}
}
......
......@@ -635,7 +635,7 @@ namespace slideshow
{
// TODO(E1): Might be superfluous. Nowadays,
// addViewLayer swallows all errors, anyway.
SAL_WARN( "slideshow", comphelper::anyToString( cppu::getCaughtException() ) );
SAL_WARN( "slideshow", exceptionToString( cppu::getCaughtException() ) );
// at least one shape could not be rendered
bRet = false;
}
......
......@@ -56,7 +56,7 @@ namespace slideshow
}
catch (uno::Exception &)
{
SAL_WARN( "slideshow", comphelper::anyToString(cppu::getCaughtException() ) );
SAL_WARN( "slideshow", exceptionToString(cppu::getCaughtException() ) );
}
}
......
......@@ -776,7 +776,7 @@ bool SlideImpl::implPrefetchShow()
}
catch( uno::Exception& )
{
SAL_WARN( "slideshow", comphelper::anyToString(cppu::getCaughtException()) );
SAL_WARN( "slideshow", exceptionToString(cppu::getCaughtException()) );
// TODO(E2): Error handling. For now, bail out
}
......@@ -1026,7 +1026,7 @@ bool SlideImpl::loadShapes()
}
catch( uno::Exception& )
{
SAL_WARN( "slideshow", comphelper::anyToString( cppu::getCaughtException() ) );
SAL_WARN( "slideshow", exceptionToString( cppu::getCaughtException() ) );
return false;
}
}
......@@ -1065,7 +1065,7 @@ bool SlideImpl::loadShapes()
}
catch( uno::Exception& )
{
SAL_WARN( "slideshow", comphelper::anyToString( cppu::getCaughtException() ) );
SAL_WARN( "slideshow", exceptionToString( cppu::getCaughtException() ) );
return false;
}
......
......@@ -85,7 +85,7 @@ namespace slideshow
}
catch( uno::Exception& )
{
SAL_WARN( "slideshow", comphelper::anyToString( cppu::getCaughtException() ) );
SAL_WARN( "slideshow", exceptionToString( cppu::getCaughtException() ) );
return false;
}
......
......@@ -2084,7 +2084,7 @@ sal_Bool SlideShowImpl::update( double & nNextTimeout )
}
catch( uno::Exception& )
{
SAL_WARN( "slideshow", comphelper::anyToString( cppu::getCaughtException() ) );
SAL_WARN( "slideshow", exceptionToString( cppu::getCaughtException() ) );
}
}
......
......@@ -128,7 +128,7 @@ namespace slideshow
dispose();
}
catch (uno::Exception &) {
SAL_WARN( "slideshow", comphelper::anyToString( cppu::getCaughtException() ) );
SAL_WARN( "slideshow", exceptionToString( cppu::getCaughtException() ) );
}
}
......