diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-06-16 15:38:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-06-17 08:19:15 +0200 |
| commit | 13b6e5d50affa56cb9c449252227933ab0fa1268 (patch) | |
| tree | 474b266e01073532a63e58f0f8f93df515cb017b /shell | |
| parent | 5aa942f3a5bf83e0426438913acc040abb6a329f (diff) | |
loplugin:logexceptionnicely in shell..sot
Change-Id: I2ae0c0ac06f32ef91951aa4f7c98b5706178f841
Reviewed-on: https://gerrit.libreoffice.org/74115
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Library_cmdmail.mk | 1 | ||||
| -rw-r--r-- | shell/Library_desktopbe.mk | 1 | ||||
| -rw-r--r-- | shell/source/backends/desktopbe/desktopbackend.cxx | 5 | ||||
| -rw-r--r-- | shell/source/cmdmail/cmdmailsuppl.cxx | 5 |
4 files changed, 8 insertions, 4 deletions
diff --git a/shell/Library_cmdmail.mk b/shell/Library_cmdmail.mk index 49d76f72484b..4841fde2f1e8 100644 --- a/shell/Library_cmdmail.mk +++ b/shell/Library_cmdmail.mk @@ -15,6 +15,7 @@ $(eval $(call gb_Library_use_libraries,cmdmail,\ cppu \ cppuhelper \ sal \ + tl \ )) $(eval $(call gb_Library_set_componentfile,cmdmail,shell/source/cmdmail/cmdmail)) diff --git a/shell/Library_desktopbe.mk b/shell/Library_desktopbe.mk index f782a0a146e3..e70f7c95c03e 100644 --- a/shell/Library_desktopbe.mk +++ b/shell/Library_desktopbe.mk @@ -17,6 +17,7 @@ $(eval $(call gb_Library_use_libraries,desktopbe1,\ cppu \ cppuhelper \ sal \ + tl \ vcl \ )) diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx index 14b22b033fb1..6b402a892427 100644 --- a/shell/source/backends/desktopbe/desktopbackend.cxx +++ b/shell/source/backends/desktopbe/desktopbackend.cxx @@ -51,6 +51,7 @@ #include <rtl/ustrbuf.hxx> #include <rtl/ustring.hxx> #include <sal/types.h> +#include <tools/diagnose_ex.h> #include <uno/current_context.hxx> #include <vcl/svapp.hxx> @@ -284,9 +285,9 @@ css::uno::Reference< css::uno::XInterface > createBackend( } catch (css::uno::RuntimeException &) { // Assuming these exceptions are real errors: throw; - } catch (const css::uno::Exception & e) { + } catch (const css::uno::Exception &) { // Assuming these exceptions indicate that the service is not installed: - SAL_WARN("shell", "createInstance(" << name << ") failed with " << e); + TOOLS_WARN_EXCEPTION("shell", "createInstance(" << name << ") failed"); return css::uno::Reference< css::uno::XInterface >(); } } diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx index eb931f23b683..efbefb21cab0 100644 --- a/shell/source/cmdmail/cmdmailsuppl.cxx +++ b/shell/source/cmdmail/cmdmailsuppl.cxx @@ -35,6 +35,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/supportsservice.hxx> +#include <tools/diagnose_ex.h> #include <string.h> #include <errno.h> @@ -198,10 +199,10 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM } - catch(const RuntimeException &e ) + catch(const RuntimeException & ) { + TOOLS_WARN_EXCEPTION("shell", "RuntimeException caught accessing configuration provider" ); m_xConfigurationProvider.clear(); - SAL_WARN("shell", "RuntimeException caught accessing configuration provider. " << e ); throw; } |