loplugin:logexceptionnicely in desktop

Change-Id: I19f70b0e9d1ca2bbcd2595af24f2e15766d14b33
Reviewed-on: https://gerrit.libreoffice.org/74046
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

6 files changed, 36 insertions, 35 deletions

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 3874b39270e5..bda1df98f6da 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -305,8 +305,8 @@ void SetRestartState() {
             comphelper::ConfigurationChanges::create());
         officecfg::Setup::Office::OfficeRestartInProgress::set(true, batch);
         batch->commit();
-    } catch (css::uno::Exception & e) {
-        SAL_WARN("desktop.app", "ignoring " << e);
+    } catch (css::uno::Exception) {
+        TOOLS_WARN_EXCEPTION("desktop.app", "ignoring");
     }
 }
 
@@ -323,9 +323,8 @@ void DoRestartActionsIfNecessary(bool quickstart) {
                     comphelper::getProcessComponentContext(),
                     shouldLaunchQuickstart());
             }
-        } catch (css::uno::Exception & e) {
-            SAL_WARN(
-                "desktop.app", "ignoring " << e);
+        } catch (css::uno::Exception &) {
+            TOOLS_WARN_EXCEPTION("desktop.app", "ignoring");
         }
     }
 }
@@ -2023,9 +2022,9 @@ void Desktop::OpenClients()
 
             xRecovery->dispatch(aCmd, css::uno::Sequence< css::beans::PropertyValue >());
         }
-        catch(const css::uno::Exception& e)
+        catch(const css::uno::Exception&)
         {
-            SAL_WARN( "desktop.app", "Could not disable AutoRecovery." << e);
+            TOOLS_WARN_EXCEPTION( "desktop.app", "Could not disable AutoRecovery.");
         }
     }
     else
@@ -2052,9 +2051,9 @@ void Desktop::OpenClients()
                     false          , // false => force recovery instead of emergency save
                     bExistsRecoveryData);
             }
-            catch(const css::uno::Exception& e)
+            catch(const css::uno::Exception&)
             {
-                SAL_WARN( "desktop.app", "Error during recovery" << e);
+                TOOLS_WARN_EXCEPTION( "desktop.app", "Error during recovery");
             }
         }
 
@@ -2066,9 +2065,9 @@ void Desktop::OpenClients()
             xSessionListener = SessionListener::createWithOnQuitFlag(
                     ::comphelper::getProcessComponentContext(), bUIOnSessionShutdownAllowed);
         }
-        catch(const css::uno::Exception& e)
+        catch(const css::uno::Exception&)
         {
-            SAL_WARN( "desktop.app", "Registration of session listener failed" << e);
+            TOOLS_WARN_EXCEPTION( "desktop.app", "Registration of session listener failed");
         }
 
         if ( !bExistsRecoveryData && xSessionListener.is() )
@@ -2078,9 +2077,9 @@ void Desktop::OpenClients()
             {
                 xSessionListener->doRestore();
             }
-            catch(const css::uno::Exception& e)
+            catch(const css::uno::Exception&)
             {
-                SAL_WARN( "desktop.app", "Error in session management" << e);
+                TOOLS_WARN_EXCEPTION( "desktop.app", "Error in session management");
             }
         }
     }
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 2363b36722f0..642733efceb2 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -44,6 +44,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <rtl/bootstrap.hxx>
 #include <sal/log.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <rtl/instance.hxx>
 #include <comphelper/processfactory.hxx>
@@ -159,11 +160,11 @@ void Desktop::createAcceptor(const OUString& aAcceptString)
                 rAcceptor->initialize( aSeq );
                 rMap.emplace(aAcceptString, rAcceptor);
             }
-            catch (const css::uno::Exception& e)
+            catch (const css::uno::Exception&)
             {
                 // no error handling needed...
                 // acceptor just won't come up
-                SAL_WARN( "desktop.app", "Acceptor could not be created: " << e);
+                TOOLS_WARN_EXCEPTION( "desktop.app", "Acceptor could not be created");
             }
         }
         else
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index 37fe079d18dc..96f0a7f69168 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -55,6 +55,7 @@
 #include <com/sun/star/document/XEmbeddedScripts.hpp>
 
 #include <comphelper/sequence.hxx>
+#include <tools/diagnose_ex.h>
 #include <tools/urlobj.hxx>
 #include <unotools/mediadescriptor.hxx>
 #include <unotools/tempfile.hxx>
@@ -446,12 +447,11 @@ bool DispatchWatcher::executeDispatchRequests( const std::vector<DispatchRequest
                     else
                         xDispatcher->dispatch( aURL, aArgs2 );
                 }
-                catch (const css::uno::Exception& e)
+                catch (const css::uno::Exception&)
                 {
-                    SAL_WARN(
+                    TOOLS_WARN_EXCEPTION(
                         "desktop.app",
-                        "Desktop::OpenDefault() ignoring Exception while"
-                            " calling XNotifyingDispatch: " << e);
+                        "Desktop::OpenDefault() ignoring Exception while calling XNotifyingDispatch");
                 }
             }
         }
@@ -503,19 +503,17 @@ bool DispatchWatcher::executeDispatchRequests( const std::vector<DispatchRequest
                              xDesktop, aName, aTarget, comphelper::containerToSequence(aArgs)),
                          UNO_QUERY);
             }
-            catch (const css::lang::IllegalArgumentException& iae)
+            catch (const css::lang::IllegalArgumentException&)
             {
-                SAL_WARN(
+                TOOLS_WARN_EXCEPTION(
                     "desktop.app",
-                    "Dispatchwatcher IllegalArgumentException while calling"
-                        " loadComponentFromURL: " << iae);
+                    "Dispatchwatcher IllegalArgumentException while calling loadComponentFromURL");
             }
-            catch (const css::io::IOException& ioe)
+            catch (const css::io::IOException&)
             {
-                SAL_WARN(
+                TOOLS_WARN_EXCEPTION(
                     "desktop.app",
-                    "Dispatchwatcher IOException while calling"
-                        " loadComponentFromURL: " << ioe);
+                    "Dispatchwatcher IOException while calling loadComponentFromURL");
             }
             if ( aDispatchRequest.aRequestType == REQUEST_OPEN ||
                  aDispatchRequest.aRequestType == REQUEST_VIEW ||
diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx
index 86ce7434e6ab..57f7d3831ff9 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -38,6 +38,7 @@
 #include <sal/types.h>
 #include <svl/languageoptions.hxx>
 #include <svtools/langhelp.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <app.hxx>
 
@@ -90,8 +91,8 @@ bool prepareLocale() {
                 officecfg::Office::Linguistic::General::UILocale::set(
                     "", batch);
                 batch->commit();
-            } catch (css::uno::Exception & e) {
-                SAL_WARN("desktop.app", "ignoring " << e);
+            } catch (const css::uno::Exception &) {
+                TOOLS_WARN_EXCEPTION("desktop.app", "ignoring");
             }
         }
     }
@@ -123,8 +124,8 @@ bool prepareLocale() {
                 comphelper::ConfigurationChanges::create());
             officecfg::Setup::L10N::ooLocale::set(locale, batch);
             batch->commit();
-        } catch (css::uno::Exception & e) {
-            SAL_WARN("desktop.app", "ignoring " << e);
+        } catch (const css::uno::Exception &) {
+            TOOLS_WARN_EXCEPTION("desktop.app", "ignoring");
         }
     }
     MsLangId::setConfiguredSystemUILanguage(tag.getLanguageType(false));
diff --git a/desktop/source/app/opencl.cxx b/desktop/source/app/opencl.cxx
index 92d720eeae9f..16da10e50206 100644
--- a/desktop/source/app/opencl.cxx
+++ b/desktop/source/app/opencl.cxx
@@ -25,6 +25,7 @@
 #include <officecfg/Office/Common.hxx>
 
 #include <svl/documentlockfile.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <com/sun/star/table/XCell2.hpp>
 #include <com/sun/star/sheet/XCalculatable.hpp>
@@ -162,9 +163,9 @@ static bool testOpenCLCompute(const Reference< XDesktop2 > &xDesktop, const OUSt
             bSuccess = true;
         }
     }
-    catch (const css::uno::Exception &e)
+    catch (const css::uno::Exception &)
     {
-        SAL_WARN("opencl", "OpenCL testing failed - disabling: " << e);
+        TOOLS_WARN_EXCEPTION("opencl", "OpenCL testing failed - disabling");
     }
 
     if (nKernelFailures != openclwrapper::kernelFailures)
diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx
index 2fa7f5befa69..55c5a6fa01b0 100644
--- a/desktop/source/app/userinstall.cxx
+++ b/desktop/source/app/userinstall.cxx
@@ -30,6 +30,7 @@
 #include <rtl/bootstrap.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
+#include <tools/diagnose_ex.h>
 #include <unotools/bootstrap.hxx>
 
 #include "userinstall.hxx"
@@ -146,8 +147,8 @@ Status create(OUString const & uri) {
 bool isCreated() {
     try {
         return officecfg::Setup::Office::ooSetupInstCompleted::get();
-    } catch (css::uno::Exception & e) {
-        SAL_WARN("desktop.app", "ignoring " << e);
+    } catch (const css::uno::Exception &) {
+        TOOLS_WARN_EXCEPTION("desktop.app", "ignoring");
         return false;
     }
 }