1 files changed, 19 insertions, 39 deletions

diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 88a235965f5c..9749dc1e1590 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -333,9 +333,7 @@ bool AnimationSlideController::getSlideAPI( sal_Int32 nSlideNumber, Reference< X
     }
     catch( Exception& )
     {
-        SAL_WARN( "sd", "sd::AnimationSlideController::getSlideAPI(), "
-                    "exception caught: "
-                    << exceptionToString( cppu::getCaughtException() ) );
+        TOOLS_WARN_EXCEPTION( "sd", "sd::AnimationSlideController::getSlideAPI()" );
     }
 
     return false;
@@ -627,8 +625,7 @@ void SAL_CALL SlideshowImpl::disposing()
     }
     catch( Exception& )
     {
-        SAL_WARN( "sd", "sd::SlideshowImpl::stop(), exception caught: "
-                    << exceptionToString( cppu::getCaughtException() ) );
+        TOOLS_WARN_EXCEPTION( "sd", "sd::SlideshowImpl::stop()" );
     }
 
     mxShow.clear();
@@ -839,8 +836,7 @@ bool SlideshowImpl::startPreview(
     }
     catch( Exception& )
     {
-        SAL_WARN( "sd", "sd::SlideshowImpl::startPreview(), exception caught: "
-                    << exceptionToString( cppu::getCaughtException() ) );
+        TOOLS_WARN_EXCEPTION( "sd", "sd::SlideshowImpl::startPreview()" );
         bRet = false;
     }
 
@@ -1039,8 +1035,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx const * pPresSettings )
     }
     catch (const Exception&)
     {
-        SAL_WARN( "sd", "sd::SlideshowImpl::startShow(), exception caught: "
-                    << exceptionToString( cppu::getCaughtException() ) );
+        TOOLS_WARN_EXCEPTION( "sd", "sd::SlideshowImpl::startShow()" );
         bRet = false;
     }
 
@@ -1107,8 +1102,7 @@ bool SlideshowImpl::startShowImpl( const Sequence< beans::PropertyValue >& aProp
     }
     catch( Exception& )
     {
-        SAL_WARN( "sd", "sd::SlideshowImpl::startShowImpl(), exception caught: "
-                    << exceptionToString( cppu::getCaughtException() ) );
+        TOOLS_WARN_EXCEPTION( "sd", "sd::SlideshowImpl::startShowImpl()" );
         return false;
     }
 }
@@ -1141,8 +1135,7 @@ void SlideshowImpl::paint()
     }
     catch( Exception& )
     {
-        SAL_WARN( "sd", "sd::SlideshowImpl::paint(), exception caught: "
-                    << exceptionToString( cppu::getCaughtException() ) );
+        TOOLS_WARN_EXCEPTION( "sd", "sd::SlideshowImpl::paint()" );
     }
 }
 
@@ -1216,8 +1209,7 @@ void SlideshowImpl::removeShapeEvents()
     }
     catch( Exception& )
     {
-        SAL_WARN( "sd", "sd::SlideshowImpl::removeShapeEvents(), exception caught: "
-                    << exceptionToString( cppu::getCaughtException() ) );
+        TOOLS_WARN_EXCEPTION( "sd", "sd::SlideshowImpl::removeShapeEvents()" );
     }
 }
 
@@ -1248,8 +1240,7 @@ void SlideshowImpl::registerShapeEvents(sal_Int32 nSlideNumber)
     }
     catch( Exception& )
     {
-        SAL_WARN( "sd", "sd::SlideshowImpl::registerShapeEvents(), exception caught: "
-                    << exceptionToString( cppu::getCaughtException() ) );
+        TOOLS_WARN_EXCEPTION( "sd", "sd::SlideshowImpl::registerShapeEvents()" );
     }
 }
 
@@ -1320,8 +1311,7 @@ void SlideshowImpl::registerShapeEvents( Reference< XShapes > const & xShapes )
     }
     catch( Exception& )
     {
-        SAL_WARN( "sd", "sd::SlideshowImpl::registerShapeEvents(), exception caught: "
-                    << exceptionToString( cppu::getCaughtException() ) );
+        TOOLS_WARN_EXCEPTION( "sd", "sd::SlideshowImpl::registerShapeEvents()" );
     }
 }
 
@@ -1389,8 +1379,7 @@ void SAL_CALL SlideshowImpl::pause()
     }
     catch( Exception& )
     {
-        SAL_WARN( "sd", "sd::SlideshowImpl::pause(), exception caught: "
-                    << exceptionToString( cppu::getCaughtException() ) );
+        TOOLS_WARN_EXCEPTION( "sd", "sd::SlideshowImpl::pause()" );
     }
 }
 
@@ -1419,8 +1408,7 @@ void SAL_CALL SlideshowImpl::resume()
     }
     catch( Exception& )
     {
-        SAL_WARN( "sd", "sd::SlideshowImpl::resume(), exception caught: "
-                    << exceptionToString( cppu::getCaughtException() ) );
+        TOOLS_WARN_EXCEPTION( "sd", "sd::SlideshowImpl::resume()" );
     }
 #ifdef ENABLE_SDREMOTE
     RemoteServer::presentationStarted( this );
@@ -1728,8 +1716,7 @@ void SlideshowImpl::updateSlideShow()
     }
     catch( Exception& )
     {
-        SAL_WARN( "sd", "sd::SlideshowImpl::updateSlideShow(), exception caught: "
-                    << exceptionToString( cppu::getCaughtException() ) );
+        TOOLS_WARN_EXCEPTION( "sd", "sd::SlideshowImpl::updateSlideShow()" );
     }
 }
 
@@ -1853,8 +1840,7 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt)
     catch( Exception& )
     {
         bRet = false;
-        SAL_WARN( "sd", "sd::SlideshowImpl::keyInput(), exception caught: "
-                    << exceptionToString( cppu::getCaughtException() ) );
+        TOOLS_WARN_EXCEPTION( "sd", "sd::SlideshowImpl::keyInput()" );
     }
 
     return bRet;
@@ -2234,8 +2220,7 @@ Reference< XSlideShow > SlideshowImpl::createSlideShow()
     }
     catch( uno::Exception& )
     {
-        SAL_WARN( "sd", "sd::SlideshowImpl::createSlideShow(), exception caught: "
-                    << exceptionToString( cppu::getCaughtException() ) );
+        TOOLS_WARN_EXCEPTION( "sd", "sd::SlideshowImpl::createSlideShow()" );
     }
 
     return xShow;
@@ -2413,8 +2398,7 @@ void SlideshowImpl::resize( const Size& rSize )
     }
     catch( Exception& )
     {
-        SAL_WARN( "sd", "sd::SlideshowImpl::resize(), exception caught: "
-                    << exceptionToString( cppu::getCaughtException() ) );
+        TOOLS_WARN_EXCEPTION( "sd", "sd::SlideshowImpl::resize()" );
     }
 }
 
@@ -2680,8 +2664,7 @@ void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen )
     }
     catch( Exception& )
     {
-        SAL_WARN( "sd", "sd::SlideshowImpl::setUsePen(), exception caught: "
-                    << exceptionToString( cppu::getCaughtException() ) );
+        TOOLS_WARN_EXCEPTION( "sd", "sd::SlideshowImpl::setUsePen()" );
     }
 }
 
@@ -2729,8 +2712,7 @@ void SlideshowImpl::setEraseAllInk(bool bEraseAllInk)
     }
     catch( Exception& )
     {
-        SAL_WARN( "sd.slideshow", "sd::SlideshowImpl::setEraseAllInk(), "
-            "exception caught: " << exceptionToString( cppu::getCaughtException() ));
+        TOOLS_WARN_EXCEPTION( "sd.slideshow", "sd::SlideshowImpl::setEraseAllInk()" );
     }
 }
 
@@ -2929,8 +2911,7 @@ void SlideshowImpl::gotoPreviousSlide (const bool bSkipAllMainSequenceEffects)
     }
     catch( Exception& )
     {
-        SAL_WARN( "sd", "sd::SlideshowImpl::gotoPreviousSlide(), exception caught: "
-                    << exceptionToString( cppu::getCaughtException() ) );
+        TOOLS_WARN_EXCEPTION( "sd", "sd::SlideshowImpl::gotoPreviousSlide()" );
     }
 }
 
@@ -3014,8 +2995,7 @@ void SAL_CALL SlideshowImpl::stopSound(  )
     }
     catch( Exception& )
     {
-        SAL_WARN( "sd", "sd::SlideshowImpl::stopSound(), exception caught: "
-                    << exceptionToString( cppu::getCaughtException() ) );
+        TOOLS_WARN_EXCEPTION( "sd", "sd::SlideshowImpl::stopSound()" );
     }
 }