loplugin:logexceptionnicely in configmgr..connectivity

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

3 files changed, 18 insertions, 15 deletions

diff --git a/configmgr/CppunitTest_configmgr_unit.mk b/configmgr/CppunitTest_configmgr_unit.mk
index 0e227edba37c..fa0718dc2c0e 100644
--- a/configmgr/CppunitTest_configmgr_unit.mk
+++ b/configmgr/CppunitTest_configmgr_unit.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_CppunitTest_use_libraries,configmgr_unit, \
 	    sal \
 	    salhelper \
 	    test \
+	    tl \
 	    unotest \
 	    xmlreader \
 		i18nlangtag \
diff --git a/configmgr/Library_configmgr.mk b/configmgr/Library_configmgr.mk
index 4fc2909ad600..ae4467af01b2 100644
--- a/configmgr/Library_configmgr.mk
+++ b/configmgr/Library_configmgr.mk
@@ -60,6 +60,7 @@ $(eval $(call gb_Library_use_libraries,configmgr, \
     cppuhelper \
     sal \
     salhelper \
+    tl \
     xmlreader \
     i18nlangtag \
 ))
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 9587fde1e7a5..7f2eb3afcfc0 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -51,6 +51,7 @@
 #include <sal/log.hxx>
 #include <sal/types.h>
 #include <salhelper/thread.hxx>
+#include <tools/diagnose_ex.h>
 #include <comphelper/backupfilehelper.hxx>
 
 #include "additions.hxx"
@@ -184,9 +185,9 @@ void Components::WriteThread::execute() {
     try {
         try {
             writeModFile(components_, url_, data_);
-        } catch (css::uno::RuntimeException & e) {
+        } catch (css::uno::RuntimeException &) {
             // Ignore write errors, instead of aborting:
-            SAL_WARN("configmgr", "error writing modifications: " << e);
+            TOOLS_WARN_EXCEPTION("configmgr", "error writing modifications");
         }
     } catch (...) {
         reference_->clear();
@@ -395,10 +396,10 @@ void Components::insertModificationXcuFile(
     try {
         parseFileLeniently(
             &parseXcuFile, fileUri, Data::NO_LAYER, &part, modifications, nullptr);
-    } catch (css::container::NoSuchElementException & e) {
-        SAL_WARN(
+    } catch (const css::container::NoSuchElementException &) {
+        TOOLS_WARN_EXCEPTION(
             "configmgr",
-            "error inserting non-existing \"" << fileUri << "\": " << e);
+            "error inserting non-existing \"" << fileUri << "\"");
     }
 }
 
@@ -418,15 +419,15 @@ css::beans::Optional< css::uno::Any > Components::getExternalValue(
         try {
             service = context_->getServiceManager()->createInstanceWithContext(
                 name, context_);
-        } catch (css::uno::RuntimeException &) {
+        } catch (const css::uno::RuntimeException &) {
             // Assuming these exceptions are real errors:
             throw;
-        } catch (css::uno::Exception & e) {
+        } catch (const css::uno::Exception &)  {
             // Assuming these exceptions indicate that the service is not
             // installed:
-            SAL_WARN(
+            TOOLS_WARN_EXCEPTION(
                 "configmgr",
-                "createInstance(" << name << ") failed with " << e);
+                "createInstance(" << name << ") failed");
         }
         css::uno::Reference< css::beans::XPropertySet > propset;
         if (service.is()) {
@@ -650,14 +651,14 @@ void Components::parseFileLeniently(
     assert(parseFile != nullptr);
     try {
         (*parseFile)(url, layer, data_, partial, modifications, additions);
-    } catch (css::container::NoSuchElementException &) {
+    } catch (const css::container::NoSuchElementException &) {
         throw;
-    } catch (css::uno::Exception & e) { //TODO: more specific exception catching
+    } catch (const css::uno::Exception &) { //TODO: more specific exception catching
         // Ignore invalid XML files, instead of completely preventing OOo from
         // starting:
-        SAL_WARN(
+        TOOLS_WARN_EXCEPTION(
             "configmgr",
-            "error reading \"" << url << "\": " << e);
+            "error reading \"" << url << "\"");
     }
 }
 
@@ -729,8 +730,8 @@ void Components::parseFileList(
             }
             try {
                 parseFileLeniently(parseFile, url, layer, nullptr, nullptr, adds);
-            } catch (css::container::NoSuchElementException & e) {
-                SAL_WARN("configmgr", "file does not exist: " << e);
+            } catch (const css::container::NoSuchElementException &) {
+                TOOLS_WARN_EXCEPTION("configmgr", "file does not exist");
                 if (adds != nullptr) {
                     data_.removeExtensionXcuAdditions(url);
                 }