diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-08-15 15:56:55 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-08-16 13:31:26 +0200 |
commit | 889dc7bffa02236bf2ad56b382997771f0fcf3c6 (patch) | |
tree | e7fc2c8748972bb1ed4acb98fd92ff08a8670f7b /extensions | |
parent | 9a97a26511584f41c3753fa9536e1c4a8dce637a (diff) |
use more TOOLS_WARN_EXCEPTION
Change-Id: Ic21ea11ff106e0732bb8fa600ef39a549d7bda86
Reviewed-on: https://gerrit.libreoffice.org/77569
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'extensions')
7 files changed, 10 insertions, 18 deletions
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 64201ff405fb..996df17cfc38 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -170,8 +170,7 @@ static Reference< XNameAccess > getColumns(const Reference< XForm > & _rxForm) } catch (const Exception&) { - css::uno::Any ex( cppu::getCaughtException() ); - SAL_WARN( "extensions.biblio", "::getColumns : caught an exception. " << exceptionToString(ex)); + TOOLS_WARN_EXCEPTION( "extensions.biblio", "::getColumns"); } } diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx b/extensions/source/config/ldap/ldapuserprofilebe.cxx index f1f3143417a9..ccec13a6365e 100644 --- a/extensions/source/config/ldap/ldapuserprofilebe.cxx +++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx @@ -141,8 +141,7 @@ bool LdapUserProfileBe::readLdapConfiguration( } catch (const uno::Exception&) { - css::uno::Any ex(DbgGetCaughtException()); - SAL_WARN("extensions.config", "LdapUserProfileBackend: access to configuration data failed: " << exceptionToString(ex)); + TOOLS_WARN_EXCEPTION("extensions.config", "LdapUserProfileBackend: access to configuration data failed"); return false; } diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index 537d2e35b820..77fee4c8396e 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -255,8 +255,7 @@ namespace dbp } catch(const Exception&) { - css::uno::Any ex( cppu::getCaughtException() ); - SAL_WARN( "extensions.dbpilots", "OLinkFieldsPage::initializePage: caught an exception while retrieving the columns! " << exceptionToString(ex)); + TOOLS_WARN_EXCEPTION( "extensions.dbpilots", "OLinkFieldsPage::initializePage: caught an exception while retrieving the columns"); } } return aColumnNames; diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx index 5bf819e099f2..65f986126332 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.cxx +++ b/extensions/source/propctrlr/eformspropertyhandler.cxx @@ -148,9 +148,8 @@ namespace pcr } catch( const Exception& ) { - css::uno::Any ex( cppu::getCaughtException() ); - SAL_WARN( "extensions.propctrlr", "EFormsPropertyHandler::getPropertyValue: caught an exception!" - "\n(have been asked for the \"" <<_rPropertyName << "\" property.) " << exceptionToString(ex)); + TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "EFormsPropertyHandler::getPropertyValue: caught an exception!" + "(have been asked for the \"" <<_rPropertyName << "\" property.)"); } return aReturn; } diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index b77bcc286b36..e416e8cdea95 100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.cxx @@ -524,9 +524,8 @@ UpdateCheckThread::run() } catch(const uno::Exception&) { - css::uno::Any ex( cppu::getCaughtException() ); // Silently catch all errors - SAL_WARN("extensions.update", "Caught exception, thread terminated. " << exceptionToString(ex) ); + TOOLS_WARN_EXCEPTION("extensions.update", "Caught exception, thread terminated" ); } } @@ -541,8 +540,7 @@ ManualUpdateCheckThread::run() } catch(const uno::Exception&) { // Silently catch all errors - css::uno::Any ex( cppu::getCaughtException() ); - SAL_WARN("extensions.update", "Caught exception, thread terminated. " << exceptionToString(ex) ); + TOOLS_WARN_EXCEPTION("extensions.update", "Caught exception, thread terminated" ); } } diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx index 4d018bea5c77..683ac5ce7db5 100644 --- a/extensions/source/update/check/updatecheckjob.cxx +++ b/extensions/source/update/check/updatecheckjob.cxx @@ -134,9 +134,8 @@ void SAL_CALL InitUpdateCheckJobThread::run() if ( m_bShowDialog ) aController->showDialog( true ); } 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. " << exceptionToString(ex) ); + TOOLS_WARN_EXCEPTION("extensions.update", "Caught init update exception, thread terminated" ); } } @@ -239,8 +238,7 @@ void UpdateCheckJob::handleExtensionUpdates( const uno::Sequence< beans::NamedVa } catch( const uno::Exception& ) { - css::uno::Any ex( cppu::getCaughtException() ); - SAL_WARN("extensions.update", "Caught exception, thread terminated. " << exceptionToString(ex)); + TOOLS_WARN_EXCEPTION("extensions.update", "Caught exception, thread terminated"); } } diff --git a/extensions/source/update/feed/test/updatefeedtest.cxx b/extensions/source/update/feed/test/updatefeedtest.cxx index 6e6c944fa70c..119aab24a3d1 100644 --- a/extensions/source/update/feed/test/updatefeedtest.cxx +++ b/extensions/source/update/feed/test/updatefeedtest.cxx @@ -72,7 +72,7 @@ SAL_IMPLEMENT_MAIN() } catch( const uno::Exception & ) { - SAL_WARN("extensions.update", "exception caught: " << exceptionToString(ex)); + TOOLS_WARN_EXCEPTION("extensions.update", ""); } catch( ... ) { |