3 files changed, 19 insertions, 16 deletions
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 174e15699e46..83172f70e56f 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -63,6 +63,7 @@
 #include <objectformatter.hxx>
 #include <fntcache.hxx>
 #include <vector>
+#include <tools/diagnose_ex.h>
 
 // Save some typing work to avoid accessing destroyed pages.
 #define XCHECKPAGE \
@@ -1968,9 +1969,9 @@ bool SwLayIdle::DoIdleJob_( const SwContentFrame *pCnt, IdleJobType eJob )
                     bPageValid = bPageValid && !pTextNode->IsSmartTagDirty();
                     if ( aRepaint.HasArea() )
                         pImp->GetShell()->InvalidateWindows( aRepaint );
-                } catch( const css::uno::RuntimeException& e) {
+                } catch( const css::uno::RuntimeException&) {
                     // handle smarttag problems gracefully and provide diagnostics
-                    SAL_WARN( "sw.core", "SMART_TAGS: " << e);
+                    TOOLS_WARN_EXCEPTION( "sw.core", "SMART_TAGS");
                 }
                 if (Application::AnyInput(VCL_INPUT_ANY & VclInputFlags(~VclInputFlags::TIMER)))
                     return true;
diff --git a/sw/source/core/tox/toxhlp.cxx b/sw/source/core/tox/toxhlp.cxx
index 7bdd2d3d0130..1c383a757ae0 100644
--- a/sw/source/core/tox/toxhlp.cxx
+++ b/sw/source/core/tox/toxhlp.cxx
@@ -21,6 +21,7 @@
 #include <com/sun/star/i18n/IndexEntrySupplier.hpp>
 #include <toxwrap.hxx>
 #include <sal/log.hxx>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 
@@ -31,9 +32,9 @@ IndexEntrySupplierWrapper::IndexEntrySupplierWrapper()
     try {
         xIES = i18n::IndexEntrySupplier::create(xContext);
     }
-    catch (const uno::Exception& e)
+    catch (const uno::Exception&)
     {
-        SAL_WARN( "sw.core", "IndexEntrySupplierWrapper: Caught " << e );
+        TOOLS_WARN_EXCEPTION( "sw.core", "IndexEntrySupplierWrapper" );
     }
 }
 
@@ -49,9 +50,9 @@ OUString IndexEntrySupplierWrapper::GetIndexKey( const OUString& rText,
     try {
         sRet = xIES->getIndexKey( rText, rTextReading, rLocale );
     }
-    catch (const uno::Exception& e)
+    catch (const uno::Exception&)
     {
-        SAL_WARN( "sw.core", "getIndexKey: Caught " << e );
+        TOOLS_WARN_EXCEPTION( "sw.core", "getIndexKey" );
     }
     return sRet;
 }
@@ -62,9 +63,9 @@ OUString IndexEntrySupplierWrapper::GetFollowingText( bool bMorePages ) const
     try {
         sRet = xIES->getIndexFollowPageWord( bMorePages, aLcl );
     }
-    catch (const uno::Exception& e)
+    catch (const uno::Exception&)
     {
-        SAL_WARN( "sw.core", "getIndexFollowPageWord: Caught " << e );
+        TOOLS_WARN_EXCEPTION( "sw.core", "getIndexFollowPageWord" );
     }
     return sRet;
 }
@@ -76,9 +77,9 @@ css::uno::Sequence< OUString > IndexEntrySupplierWrapper::GetAlgorithmList( cons
     try {
         sRet = xIES->getAlgorithmList( rLcl );
     }
-    catch (const uno::Exception& e)
+    catch (const uno::Exception&)
     {
-        SAL_WARN( "sw.core", "getAlgorithmList: Caught " << e );
+        TOOLS_WARN_EXCEPTION( "sw.core", "getAlgorithmList" );
     }
     return sRet;
 }
@@ -91,9 +92,9 @@ bool IndexEntrySupplierWrapper::LoadAlgorithm(
     try {
         bRet = xIES->loadAlgorithm( rLcl, sSortAlgorithm, nOptions );
     }
-    catch (const uno::Exception& e)
+    catch (const uno::Exception&)
     {
-        SAL_WARN( "sw.core", "loadAlgorithm: Caught " << e );
+        TOOLS_WARN_EXCEPTION( "sw.core", "loadAlgorithm" );
     }
     return bRet;
 }
@@ -109,9 +110,9 @@ sal_Int16 IndexEntrySupplierWrapper::CompareIndexEntry(
         nRet = xIES->compareIndexEntry( rText1, rTextReading1, rLocale1,
                                         rText2, rTextReading2, rLocale2 );
     }
-    catch (const uno::Exception& e)
+    catch (const uno::Exception&)
     {
-        SAL_WARN( "sw.core", "compareIndexEntry: Caught " << e );
+        TOOLS_WARN_EXCEPTION( "sw.core", "compareIndexEntry" );
     }
     return nRet;
 }
diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx
index 7e0022f53c2b..aba0c251e3da 100644
--- a/sw/source/core/view/viewimp.cxx
+++ b/sw/source/core/view/viewimp.cxx
@@ -36,6 +36,7 @@
 #include <svx/svdundo.hxx>
 #include <comphelper/lok.hxx>
 #include <sal/log.hxx>
+#include <tools/diagnose_ex.h>
 #include <IDocumentLayoutAccess.hxx>
 #include <IDocumentDrawModelAccess.hxx>
 #include <IDocumentDeviceAccess.hxx>
@@ -302,9 +303,9 @@ void SwViewShellImp::UpdateAccessible()
         {
             GetAccessibleMap().GetDocumentView();
         }
-        catch (uno::Exception const& e)
+        catch (uno::Exception const&)
         {
-            SAL_WARN("sw.a11y", e);
+            TOOLS_WARN_EXCEPTION("sw.a11y", "");
             assert(!"SwViewShellImp::UpdateAccessible: unhandled exception");
         }
     }