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>

14 files changed, 47 insertions, 99 deletions

diff --git a/sd/source/core/CustomAnimationCloner.cxx b/sd/source/core/CustomAnimationCloner.cxx
index 4bad9c2328a2..15b8c377408b 100644
--- a/sd/source/core/CustomAnimationCloner.cxx
+++ b/sd/source/core/CustomAnimationCloner.cxx
@@ -123,8 +123,7 @@ namespace sd
         }
         catch( Exception& )
         {
-            SAL_WARN( "sd", "sd::CustomAnimationClonerImpl::Clone(), "
-                      "exception caught: " << exceptionToString( cppu::getCaughtException() ) );
+            TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationClonerImpl::Clone()" );
             Reference< XAnimationNode > xEmpty;
             return xEmpty;
         }
@@ -199,9 +198,7 @@ namespace sd
         }
         catch( Exception& )
         {
-            SAL_WARN( "sd", "sd::CustomAnimationClonerImpl::transformNode(), "
-                      "exception caught: "
-                      << exceptionToString( cppu::getCaughtException() ) );
+            TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationClonerImpl::transformNode()" );
         }
     }
 
@@ -266,9 +263,7 @@ namespace sd
         }
         catch( Exception& )
         {
-            SAL_WARN( "sd", "sd::CustomAnimationClonerImpl::transformValue(), "
-                      "exception caught: "
-                      << exceptionToString( cppu::getCaughtException() ) );
+            TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationClonerImpl::transformValue()" );
         }
 
         return rValue;
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index c6aabb05b555..91cb60028dff 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -706,8 +706,7 @@ void SAL_CALL SdStyleSheet::release(  ) throw ()
     catch (RuntimeException const&)
     {
         // don't break throw ()
-        css::uno::Any ex(DbgGetCaughtException());
-        SAL_WARN( "sd", exceptionToString(ex) );
+        TOOLS_WARN_EXCEPTION( "sd", "" );
     }
     OSL_ASSERT( mrBHelper.bDisposed );
     SdStyleSheetBase::release();
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index a3ff6259e9ad..c00b7970637c 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -3037,8 +3037,7 @@ bool HtmlExport::checkFileExists( Reference< css::ucb::XSimpleFileAccess3 > cons
     }
     catch( css::uno::Exception& )
     {
-        SAL_WARN( "sd", "sd::HtmlExport::checkFileExists(), exception caught: "
-                    << exceptionToString( cppu::getCaughtException() ) );
+        TOOLS_WARN_EXCEPTION( "sd", "sd::HtmlExport::checkFileExists()" );
     }
 
     return false;
@@ -3088,8 +3087,7 @@ bool HtmlExport::checkForExistingFiles()
     }
     catch( Exception& )
     {
-        SAL_WARN( "sd", "sd::HtmlExport::checkForExistingFiles(), exception caught: "
-                    << exceptionToString( cppu::getCaughtException() ) );
+        TOOLS_WARN_EXCEPTION( "sd", "sd::HtmlExport::checkForExistingFiles()" );
         bFound = false;
     }
 
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index db4c55f538cd..99a78879557c 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -288,20 +288,17 @@ ErrCode ReadThroughComponent(
     }
     catch (const packages::zip::ZipIOException&)
     {
-        css::uno::Any ex( cppu::getCaughtException() );
-        SAL_WARN( "sd.filter", "Zip exception caught while importing: " << exceptionToString(ex));
+        TOOLS_WARN_EXCEPTION( "sd.filter", "Zip exception caught while importing");
         return ERRCODE_IO_BROKENPACKAGE;
     }
     catch (const io::IOException&)
     {
-        css::uno::Any ex( cppu::getCaughtException() );
-        SAL_WARN( "sd.filter", "IO exception caught while importing: " << exceptionToString(ex));
+        TOOLS_WARN_EXCEPTION( "sd.filter", "IO exception caught while importing");
         return SD_XML_READERROR;
     }
     catch (const uno::Exception&)
     {
-        css::uno::Any ex( cppu::getCaughtException() );
-        SAL_WARN( "sd.filter", "uno exception caught while importing: " << exceptionToString(ex));
+        TOOLS_WARN_EXCEPTION( "sd.filter", "uno exception caught while importing");
         return SD_XML_READERROR;
     }
 
@@ -724,8 +721,7 @@ bool SdXMLFilter::Import( ErrCode& nError )
         }
         catch (const Exception&)
         {
-            css::uno::Any ex( cppu::getCaughtException() );
-            SAL_WARN( "sd.filter","sd::SdXMLFilter::Import(), exception during clearing of unused named items " << exceptionToString(ex));
+            TOOLS_WARN_EXCEPTION( "sd.filter","sd::SdXMLFilter::Import(), exception during clearing of unused named items");
         }
     }
 
diff --git a/sd/source/helper/simplereferencecomponent.cxx b/sd/source/helper/simplereferencecomponent.cxx
index acce1c481288..03b3dd84da01 100644
--- a/sd/source/helper/simplereferencecomponent.cxx
+++ b/sd/source/helper/simplereferencecomponent.cxx
@@ -54,8 +54,7 @@ void SimpleReferenceComponent::release()
         }
         catch (RuntimeException const &) // don't break throw ()
         {
-            css::uno::Any ex(DbgGetCaughtException());
-            SAL_WARN( "sd", exceptionToString(ex) );
+            TOOLS_WARN_EXCEPTION( "sd", "" );
         }
     }
 
diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx b/sd/source/ui/accessibility/AccessiblePageShape.cxx
index 34e5e505559c..5e22d74c1c00 100644
--- a/sd/source/ui/accessibility/AccessiblePageShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx
@@ -194,8 +194,7 @@ sal_Int32 SAL_CALL AccessiblePageShape::getBackground()
     }
     catch (const css::beans::UnknownPropertyException&)
     {
-        css::uno::Any ex( cppu::getCaughtException() );
-        SAL_WARN("sd", "caught exception due to unknown property " << exceptionToString(ex));
+        TOOLS_WARN_EXCEPTION("sd", "caught exception due to unknown property");
         // Ignore exception and return default color.
     }
     return nColor;
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 4af7c2f3c5ce..58c7ecd3057d 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -166,8 +166,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, weld::Button&, void)
                 }
                 catch (const css::uno::Exception&)
                 {
-                    css::uno::Any ex( cppu::getCaughtException() );
-                    SAL_WARN( "sd", exceptionToString(ex) );
+                    TOOLS_WARN_EXCEPTION( "sd", "" );
                 }
             }
         }
@@ -231,8 +230,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, weld::Button&, void)
                     }
                     catch (const css::uno::Exception&)
                     {
-                        css::uno::Any ex( cppu::getCaughtException() );
-                        SAL_WARN( "sd", exceptionToString(ex) );
+                        TOOLS_WARN_EXCEPTION( "sd", "" );
                     }
                 }
 
@@ -279,8 +277,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, weld::Button&, void)
                     }
                     catch (const css::uno::Exception&)
                     {
-                        css::uno::Any ex( cppu::getCaughtException() );
-                        SAL_WARN( "sd", exceptionToString(ex) );
+                        TOOLS_WARN_EXCEPTION( "sd", "" );
                     }
                 }
             }
@@ -352,8 +349,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, weld::Button&, void)
                     }
                     catch (const css::uno::Exception&)
                     {
-                        css::uno::Any ex( cppu::getCaughtException() );
-                        SAL_WARN( "sd", exceptionToString(ex) );
+                        TOOLS_WARN_EXCEPTION( "sd", "" );
                     }
                 }
                 if( !sUrl2.isEmpty() )
@@ -396,8 +392,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, weld::Button&, void)
                     }
                     catch (const css::uno::Exception&)
                     {
-                        css::uno::Any ex( cppu::getCaughtException() );
-                        SAL_WARN( "sd", exceptionToString(ex) );
+                        TOOLS_WARN_EXCEPTION( "sd", "" );
                     }
                 }
                 if( !sUrl3.isEmpty() )
@@ -440,8 +435,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, weld::Button&, void)
                     }
                     catch (const css::uno::Exception&)
                     {
-                        css::uno::Any ex( cppu::getCaughtException() );
-                        SAL_WARN( "sd", exceptionToString(ex) );
+                        TOOLS_WARN_EXCEPTION( "sd", "" );
                     }
                 }
                 if( !sUrl4.isEmpty() )
@@ -486,8 +480,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, weld::Button&, void)
                     }
                     catch (const css::uno::Exception&)
                     {
-                        css::uno::Any ex( cppu::getCaughtException() );
-                        SAL_WARN( "sd", exceptionToString(ex) );
+                        TOOLS_WARN_EXCEPTION( "sd", "" );
                     }
                 }
             }
diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx
index 104cb91e152d..3e8c90562590 100644
--- a/sd/source/ui/framework/module/ModuleController.cxx
+++ b/sd/source/ui/framework/module/ModuleController.cxx
@@ -228,8 +228,7 @@ void SAL_CALL ModuleController::requestResource (const OUString& rsResourceURL)
     }
     catch (const Exception&)
     {
-        css::uno::Any ex( cppu::getCaughtException() );
-        SAL_WARN("sd.fwk", "caught exception while creating factory. " << exceptionToString(ex));
+        TOOLS_WARN_EXCEPTION("sd.fwk", "caught exception while creating factory");
     }
 
     // Remember that this factory has been instanced.
diff --git a/sd/source/ui/remotecontrol/Receiver.cxx b/sd/source/ui/remotecontrol/Receiver.cxx
index cd8cadea074e..04128fa74b4f 100644
--- a/sd/source/ui/remotecontrol/Receiver.cxx
+++ b/sd/source/ui/remotecontrol/Receiver.cxx
@@ -146,9 +146,7 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand )
             }
             catch (Exception&)
             {
-                SAL_WARN("sdremote", "sd::SlideShowImpl::setPointerPosition(), "
-                                     "exception caught: "
-                                         << exceptionToString(cppu::getCaughtException()));
+                TOOLS_WARN_EXCEPTION("sdremote", "sd::SlideShowImpl::setPointerPosition()");
             }
 
             try
@@ -158,9 +156,7 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand )
             }
             catch (Exception&)
             {
-                SAL_WARN("sdremote", "sd::SlideShowImpl::setPointerMode(), "
-                                     "exception caught: "
-                                         << exceptionToString(cppu::getCaughtException()));
+                TOOLS_WARN_EXCEPTION("sdremote", "sd::SlideShowImpl::setPointerMode()");
             }
         }
 
@@ -179,8 +175,7 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand )
         }
         catch ( Exception& )
         {
-            SAL_WARN( "sdremote", "sd::SlideShowImpl::setPointerMode(), "
-                "exception caught: " << exceptionToString( cppu::getCaughtException() ));
+            TOOLS_WARN_EXCEPTION( "sdremote", "sd::SlideShowImpl::setPointerMode()" );
         }
 
         SAL_INFO( "sdremote", "Pointer dismissed, we hide the pointer on screen" );
@@ -204,8 +199,7 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand )
         }
         catch ( Exception& )
         {
-            SAL_WARN( "sdremote", "sd::SlideShowImpl::setPointerPosition(), "
-                "exception caught: " << exceptionToString( cppu::getCaughtException() ));
+            TOOLS_WARN_EXCEPTION( "sdremote", "sd::SlideShowImpl::setPointerPosition()" );
         }
     }
     else if ( aCommand[0] == "presentation_resume" )
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()" );
     }
 }
 
diff --git a/sd/source/ui/tools/ConfigurationAccess.cxx b/sd/source/ui/tools/ConfigurationAccess.cxx
index c2623b53ecdd..60599ac0ef91 100644
--- a/sd/source/ui/tools/ConfigurationAccess.cxx
+++ b/sd/source/ui/tools/ConfigurationAccess.cxx
@@ -108,8 +108,7 @@ Any ConfigurationAccess::GetConfigurationNode (
     }
     catch (const Exception&)
     {
-        css::uno::Any ex( cppu::getCaughtException() );
-        SAL_WARN("sd", "caught exception while getting configuration node" << sPathToNode << ": " << exceptionToString(ex));
+        TOOLS_WARN_EXCEPTION("sd", "caught exception while getting configuration node" << sPathToNode);
     }
 
     return Any();
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx
index 65ee9e8cd2ce..2ed605bc2bf9 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -429,8 +429,7 @@ void DrawController::FireSwitchCurrentPage (SdPage* pNewCurrentPage) throw()
     }
     catch (const uno::Exception&)
     {
-        css::uno::Any ex(DbgGetCaughtException());
-        SAL_WARN("sd", "sd::SdUnoDrawView::FireSwitchCurrentPage(), exception caught:  " << exceptionToString(ex));
+        TOOLS_WARN_EXCEPTION("sd", "sd::SdUnoDrawView::FireSwitchCurrentPage()");
     }
 }
 
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index ce0885f79af9..d4a7a150aa1a 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -331,8 +331,7 @@ void SAL_CALL SdXImpressDocument::release() throw ( )
         catch (const uno::RuntimeException&)
         {
             // don't break throw ()
-            css::uno::Any ex(DbgGetCaughtException());
-            SAL_WARN( "sd", exceptionToString(ex) );
+            TOOLS_WARN_EXCEPTION( "sd", "" );
         }
     }
     SfxBaseModel::release();
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 4fb136fa9838..176f337868c0 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -251,8 +251,7 @@ void DrawViewShell::SelectionHasChanged()
     }
     catch( css::uno::Exception& )
     {
-        SAL_WARN( "sd", "sd::DrawViewShell::SelectionHasChanged(), exception caught: "
-                << exceptionToString( cppu::getCaughtException() ) );
+        TOOLS_WARN_EXCEPTION( "sd", "sd::DrawViewShell::SelectionHasChanged()" );
     }
 
     if( HasCurrentFunction() )