diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-01 14:42:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-07 07:12:39 +0100 |
| commit | 8b5e23eac31cafbd442a3acab5fbcf98bfd0af11 (patch) | |
| tree | d41feeea533127280e0503d0dc2dd55a4ab83ce8 /extensions/source/update/check | |
| parent | 4f810905fa74128871f2fe924a3d28a79f4e4261 (diff) | |
log nice exception messages whereever possible
Change-Id: Idd125c18bee1a39b9ea8cc4f8c55cddfd37c33e1
Reviewed-on: https://gerrit.libreoffice.org/68579
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'extensions/source/update/check')
| -rw-r--r-- | extensions/source/update/check/updatecheck.cxx | 11 | ||||
| -rw-r--r-- | extensions/source/update/check/updatecheckjob.cxx | 11 |
2 files changed, 14 insertions, 8 deletions
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index 47ef6e18093e..4306e073e26b 100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.cxx @@ -40,6 +40,7 @@ #include <osl/file.hxx> #include <sal/macros.h> #include <sal/log.hxx> +#include <tools/diagnose_ex.h> #ifdef _WIN32 #include <objbase.h> @@ -523,9 +524,10 @@ UpdateCheckThread::run() } } - catch(const uno::Exception& e) { + catch(const uno::Exception&) { + css::uno::Any ex( cppu::getCaughtException() ); // Silently catch all errors - SAL_WARN("extensions.update", "Caught exception, thread terminated. " << e ); + SAL_WARN("extensions.update", "Caught exception, thread terminated. " << exceptionToString(ex) ); } } @@ -538,9 +540,10 @@ ManualUpdateCheckThread::run() runCheck( bExtensionsChecked ); m_aCondition.reset(); } - catch(const uno::Exception& e) { + catch(const uno::Exception&) { // Silently catch all errors - SAL_WARN("extensions.update", "Caught exception, thread terminated. " << e ); + css::uno::Any ex( cppu::getCaughtException() ); + SAL_WARN("extensions.update", "Caught exception, thread terminated. " << exceptionToString(ex) ); } } diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx index 3e86885fa621..298046485fde 100644 --- a/extensions/source/update/check/updatecheckjob.cxx +++ b/extensions/source/update/check/updatecheckjob.cxx @@ -29,6 +29,7 @@ #include <cppuhelper/implementationentry.hxx> #include <cppuhelper/supportsservice.hxx> #include <sal/log.hxx> +#include <tools/diagnose_ex.h> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/XTerminateListener.hpp> @@ -132,9 +133,10 @@ void SAL_CALL InitUpdateCheckJobThread::run() if ( m_bShowDialog ) aController->showDialog( true ); - } catch (const uno::Exception &e) { + } catch (const uno::Exception &) { + css::uno::Any ex( cppu::getCaughtException() ); // fdo#64962 - don't bring the app down on some unexpected exception. - SAL_WARN("extensions.update", "Caught init update exception, thread terminated. " << e ); + SAL_WARN("extensions.update", "Caught init update exception, thread terminated. " << exceptionToString(ex) ); } } @@ -235,9 +237,10 @@ void UpdateCheckJob::handleExtensionUpdates( const uno::Sequence< beans::NamedVa aController->setUIState( UPDATESTATE_NO_UPDATE_AVAIL, true ); } } - catch( const uno::Exception& e ) + catch( const uno::Exception& ) { - SAL_WARN("extensions.update", "Caught exception, thread terminated. " << e); + css::uno::Any ex( cppu::getCaughtException() ); + SAL_WARN("extensions.update", "Caught exception, thread terminated. " << exceptionToString(ex)); } } |