summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-08-15 15:56:55 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-08-16 13:31:26 +0200
commit889dc7bffa02236bf2ad56b382997771f0fcf3c6 (patch)
treee7fc2c8748972bb1ed4acb98fd92ff08a8670f7b /slideshow
parent9a97a26511584f41c3753fa9536e1c4a8dce637a (diff)
use more TOOLS_WARN_EXCEPTION
Change-Id: Ic21ea11ff106e0732bb8fa600ef39a549d7bda86 Reviewed-on: https://gerrit.libreoffice.org/77569 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/activitiesqueue.cxx2
-rw-r--r--slideshow/source/engine/animationnodes/animationbasenode.cxx2
-rw-r--r--slideshow/source/engine/eventqueue.cxx2
-rw-r--r--slideshow/source/engine/pointersymbol.cxx2
-rw-r--r--slideshow/source/engine/shapes/drawinglayeranimation.cxx2
-rw-r--r--slideshow/source/engine/shapes/externalshapebase.cxx2
-rw-r--r--slideshow/source/engine/shapes/viewbackgroundshape.cxx2
-rw-r--r--slideshow/source/engine/shapes/viewmediashape.cxx4
-rw-r--r--slideshow/source/engine/slide/layermanager.cxx2
-rw-r--r--slideshow/source/engine/slide/slideanimations.cxx2
-rw-r--r--slideshow/source/engine/slide/slideimpl.cxx6
-rw-r--r--slideshow/source/engine/slidebitmap.cxx2
-rw-r--r--slideshow/source/engine/slideshowimpl.cxx2
-rw-r--r--slideshow/source/engine/soundplayer.cxx2
-rw-r--r--slideshow/source/engine/waitsymbol.cxx2
15 files changed, 18 insertions, 18 deletions
diff --git a/slideshow/source/engine/activitiesqueue.cxx b/slideshow/source/engine/activitiesqueue.cxx
index 191d2ef09981..3181e92175ff 100644
--- a/slideshow/source/engine/activitiesqueue.cxx
+++ b/slideshow/source/engine/activitiesqueue.cxx
@@ -118,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", exceptionToString(cppu::getCaughtException()) );
+ TOOLS_WARN_EXCEPTION( "slideshow", "" );
}
catch( SlideShowException& )
{
diff --git a/slideshow/source/engine/animationnodes/animationbasenode.cxx b/slideshow/source/engine/animationnodes/animationbasenode.cxx
index ed4d157c526f..a302b171c36c 100644
--- a/slideshow/source/engine/animationnodes/animationbasenode.cxx
+++ b/slideshow/source/engine/animationnodes/animationbasenode.cxx
@@ -210,7 +210,7 @@ bool AnimationBaseNode::init_st()
mpActivity = createActivity();
}
catch (uno::Exception const&) {
- SAL_WARN( "slideshow", exceptionToString(cppu::getCaughtException()) );
+ TOOLS_WARN_EXCEPTION( "slideshow", "" );
// 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.
diff --git a/slideshow/source/engine/eventqueue.cxx b/slideshow/source/engine/eventqueue.cxx
index a5609ae47a5c..d5596cdb7036 100644
--- a/slideshow/source/engine/eventqueue.cxx
+++ b/slideshow/source/engine/eventqueue.cxx
@@ -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", exceptionToString( cppu::getCaughtException() ) );
+ TOOLS_WARN_EXCEPTION( "slideshow", "" );
}
catch( SlideShowException& )
{
diff --git a/slideshow/source/engine/pointersymbol.cxx b/slideshow/source/engine/pointersymbol.cxx
index dbc7fed055d3..050e392d805d 100644
--- a/slideshow/source/engine/pointersymbol.cxx
+++ b/slideshow/source/engine/pointersymbol.cxx
@@ -127,7 +127,7 @@ void PointerSymbol::viewAdded( const UnoViewSharedPtr& rView )
}
catch( uno::Exception& )
{
- SAL_WARN( "slideshow", exceptionToString( cppu::getCaughtException() ) );
+ TOOLS_WARN_EXCEPTION( "slideshow", "" );
}
maViews.emplace_back( rView, sprite );
diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
index c8e21b5c8e15..ef931979c643 100644
--- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx
+++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
@@ -935,7 +935,7 @@ std::shared_ptr<Activity> createDrawingLayerAnimActivity(
catch( uno::Exception& )
{
// translate any error into empty factory product.
- SAL_WARN( "slideshow", exceptionToString( cppu::getCaughtException() ) );
+ TOOLS_WARN_EXCEPTION( "slideshow", "" );
}
return pActivity;
diff --git a/slideshow/source/engine/shapes/externalshapebase.cxx b/slideshow/source/engine/shapes/externalshapebase.cxx
index 00ba2bb2c37b..6e557bb456de 100644
--- a/slideshow/source/engine/shapes/externalshapebase.cxx
+++ b/slideshow/source/engine/shapes/externalshapebase.cxx
@@ -108,7 +108,7 @@ namespace slideshow
}
catch (uno::Exception &)
{
- SAL_WARN( "slideshow", exceptionToString( cppu::getCaughtException() ) );
+ TOOLS_WARN_EXCEPTION( "slideshow", "" );
}
}
diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.cxx b/slideshow/source/engine/shapes/viewbackgroundshape.cxx
index a7cf3c26fd2f..cdfd10bad100 100644
--- a/slideshow/source/engine/shapes/viewbackgroundshape.cxx
+++ b/slideshow/source/engine/shapes/viewbackgroundshape.cxx
@@ -185,7 +185,7 @@ namespace slideshow
}
catch( uno::Exception& )
{
- SAL_WARN( "slideshow", exceptionToString( cppu::getCaughtException() ) );
+ TOOLS_WARN_EXCEPTION( "slideshow", "" );
return false;
}
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx
index 491b773fde02..057b508437ae 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -317,7 +317,7 @@ namespace slideshow
}
catch( uno::Exception& )
{
- SAL_WARN( "slideshow", exceptionToString( cppu::getCaughtException() ) );
+ TOOLS_WARN_EXCEPTION( "slideshow", "" );
}
}
}
@@ -478,7 +478,7 @@ namespace slideshow
}
catch( uno::Exception& )
{
- SAL_WARN( "slideshow", exceptionToString( cppu::getCaughtException() ) );
+ TOOLS_WARN_EXCEPTION( "slideshow", "" );
}
}
}
diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx
index caca994dabe4..595dd6abe757 100644
--- a/slideshow/source/engine/slide/layermanager.cxx
+++ b/slideshow/source/engine/slide/layermanager.cxx
@@ -635,7 +635,7 @@ namespace slideshow
{
// TODO(E1): Might be superfluous. Nowadays,
// addViewLayer swallows all errors, anyway.
- SAL_WARN( "slideshow", exceptionToString( cppu::getCaughtException() ) );
+ TOOLS_WARN_EXCEPTION( "slideshow", "" );
// at least one shape could not be rendered
bRet = false;
}
diff --git a/slideshow/source/engine/slide/slideanimations.cxx b/slideshow/source/engine/slide/slideanimations.cxx
index fca312a51802..4cdf99ee671c 100644
--- a/slideshow/source/engine/slide/slideanimations.cxx
+++ b/slideshow/source/engine/slide/slideanimations.cxx
@@ -56,7 +56,7 @@ namespace slideshow
}
catch (uno::Exception &)
{
- SAL_WARN( "slideshow", exceptionToString(cppu::getCaughtException() ) );
+ TOOLS_WARN_EXCEPTION( "slideshow", "" );
}
}
diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx
index 911f9866074d..f49e884b3d67 100644
--- a/slideshow/source/engine/slide/slideimpl.cxx
+++ b/slideshow/source/engine/slide/slideimpl.cxx
@@ -776,7 +776,7 @@ bool SlideImpl::implPrefetchShow()
}
catch( uno::Exception& )
{
- SAL_WARN( "slideshow", exceptionToString(cppu::getCaughtException()) );
+ TOOLS_WARN_EXCEPTION( "slideshow", "" );
// TODO(E2): Error handling. For now, bail out
}
@@ -1023,7 +1023,7 @@ bool SlideImpl::loadShapes()
}
catch( uno::Exception& )
{
- SAL_WARN( "slideshow", exceptionToString( cppu::getCaughtException() ) );
+ TOOLS_WARN_EXCEPTION( "slideshow", "" );
return false;
}
}
@@ -1062,7 +1062,7 @@ bool SlideImpl::loadShapes()
}
catch( uno::Exception& )
{
- SAL_WARN( "slideshow", exceptionToString( cppu::getCaughtException() ) );
+ TOOLS_WARN_EXCEPTION( "slideshow", "" );
return false;
}
diff --git a/slideshow/source/engine/slidebitmap.cxx b/slideshow/source/engine/slidebitmap.cxx
index 4a92633924d6..7acd82207748 100644
--- a/slideshow/source/engine/slidebitmap.cxx
+++ b/slideshow/source/engine/slidebitmap.cxx
@@ -85,7 +85,7 @@ namespace slideshow
}
catch( uno::Exception& )
{
- SAL_WARN( "slideshow", exceptionToString( cppu::getCaughtException() ) );
+ TOOLS_WARN_EXCEPTION( "slideshow", "" );
return false;
}
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 5830c56c2c91..e5bfcc5146be 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -2078,7 +2078,7 @@ sal_Bool SlideShowImpl::update( double & nNextTimeout )
}
catch( uno::Exception& )
{
- SAL_WARN( "slideshow", exceptionToString( cppu::getCaughtException() ) );
+ TOOLS_WARN_EXCEPTION( "slideshow", "" );
}
}
diff --git a/slideshow/source/engine/soundplayer.cxx b/slideshow/source/engine/soundplayer.cxx
index 5a602ac921bc..5381b829425f 100644
--- a/slideshow/source/engine/soundplayer.cxx
+++ b/slideshow/source/engine/soundplayer.cxx
@@ -127,7 +127,7 @@ namespace slideshow
dispose();
}
catch (uno::Exception &) {
- SAL_WARN( "slideshow", exceptionToString( cppu::getCaughtException() ) );
+ TOOLS_WARN_EXCEPTION( "slideshow", "" );
}
}
diff --git a/slideshow/source/engine/waitsymbol.cxx b/slideshow/source/engine/waitsymbol.cxx
index 22fd912d3af7..4612262358f7 100644
--- a/slideshow/source/engine/waitsymbol.cxx
+++ b/slideshow/source/engine/waitsymbol.cxx
@@ -131,7 +131,7 @@ void WaitSymbol::viewAdded( const UnoViewSharedPtr& rView )
}
catch( uno::Exception& )
{
- SAL_WARN( "slideshow", exceptionToString( cppu::getCaughtException() ) );
+ TOOLS_WARN_EXCEPTION( "slideshow", "" );
}
maViews.emplace_back( rView, sprite );