From 2c251422bf58449c57ca15527960dc9528b330ea Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Fri, 14 Jun 2019 15:30:08 +0200
Subject: loplugin:logexceptionnicely in editeng..extensions

Change-Id: I50b9d7e92ef057c985d0d6e76dfeb62591d404f6
Reviewed-on: https://gerrit.libreoffice.org/74047
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 editeng/source/editeng/impedit2.cxx       | 5 +++--
 editeng/source/misc/svxacorr.cxx          | 5 +++--
 embeddedobj/source/msole/oleembed.cxx     | 5 +++--
 embeddedobj/source/msole/ownview.cxx      | 5 +++--
 extensions/source/bibliography/datman.cxx | 6 ++----
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 472a3d78de14..eda0c2c0f374 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -61,6 +61,7 @@
 #include <sot/formats.hxx>
 #include <svl/asiancfg.hxx>
 #include <i18nutil/unicode.hxx>
+#include <tools/diagnose_ex.h>
 #include <comphelper/lok.hxx>
 #include <unotools/configmgr.hxx>
 
@@ -3542,9 +3543,9 @@ EditSelection ImpEditEngine::PasteText( uno::Reference< datatransfer::XTransfera
                 }
                 bDone = true;
             }
-            catch( const css::uno::Exception& e)
+            catch( const css::uno::Exception&)
             {
-                SAL_WARN( "editeng", "Unable to paste EDITENGINE_ODF_TEXT_FLAT " << e );
+                TOOLS_WARN_EXCEPTION( "editeng", "Unable to paste EDITENGINE_ODF_TEXT_FLAT" );
             }
         }
 
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 01a4f27234fb..2a7db090d1ed 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -75,6 +75,7 @@
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <com/sun/star/ucb/TransferInfo.hpp>
 #include <com/sun/star/ucb/NameClash.hpp>
+#include <tools/diagnose_ex.h>
 #include <xmloff/xmltoken.hxx>
 #include <vcl/help.hxx>
 #include <set>
@@ -2275,9 +2276,9 @@ SvStringsISortDtor* SvxAutoCorrectLanguageLists::LoadWrdSttExceptList()
         if( xStg.is() && xStg->IsContained( sTemp ) )
             LoadXMLExceptList_Imp( pWrdStt_ExcptLst, pXMLImplWrdStt_ExcptLstStr, xStg );
     }
-    catch (const css::ucb::ContentCreationException &e)
+    catch (const css::ucb::ContentCreationException &)
     {
-        SAL_WARN("editeng", "SvxAutoCorrectLanguageLists::LoadWrdSttExceptList: Caught " << e);
+        TOOLS_WARN_EXCEPTION("editeng", "SvxAutoCorrectLanguageLists::LoadWrdSttExceptList");
     }
     return pWrdStt_ExcptLst.get();
 }
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index beeae8ab2469..6dd539bd7a8e 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -49,6 +49,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/mimeconfighelper.hxx>
 #include <sal/log.hxx>
+#include <tools/diagnose_ex.h>
 
 
 #include <targetstatecontrol.hxx>
@@ -934,9 +935,9 @@ void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID )
             {
                 throw;
             }
-            catch (uno::Exception const& e)
+            catch (uno::Exception const&)
             {
-                SAL_WARN("embeddedobj.ole", "OleEmbeddedObject::doVerb: -9 fallback path: " << e);
+                TOOLS_WARN_EXCEPTION("embeddedobj.ole", "OleEmbeddedObject::doVerb: -9 fallback path:");
             }
         }
 
diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx
index 0685bba77a37..e89ec59f60d8 100644
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
@@ -41,6 +41,7 @@
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/mimeconfighelper.hxx>
 #include <sal/log.hxx>
+#include <tools/diagnose_ex.h>
 
 #include "olepersist.hxx"
 #include "ownview.hxx"
@@ -150,9 +151,9 @@ bool OwnView_Impl::CreateModelFromURL( const OUString& aFileURL )
                 }
             }
         }
-        catch (uno::Exception const& e)
+        catch (uno::Exception const&)
         {
-            SAL_WARN("embeddedobj.ole", "OwnView_Impl::CreateModelFromURL:" << e);
+            TOOLS_WARN_EXCEPTION("embeddedobj.ole", "OwnView_Impl::CreateModelFromURL:");
         }
     }
 
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index ad8215500d9a..0345049a9238 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -426,11 +426,9 @@ DBChangeDialog_Impl::DBChangeDialog_Impl(weld::Window* pParent, BibDataManager*
             m_xSelectionLB->append_text(rSourceName);
         m_xSelectionLB->select_text(sActiveSource);
     }
-    catch (const Exception& e)
+    catch (const Exception&)
     {
-        SAL_WARN("extensions.biblio",
-            "Exception in BibDataManager::DBChangeDialog_Impl::DBChangeDialog_Impl "
-            << e);
+        TOOLS_WARN_EXCEPTION("extensions.biblio", "");
     }
 }
 
-- 
cgit