diff options
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/CppunitTest_extensions_test_update.mk | 1 | ||||
-rw-r--r-- | extensions/Library_updchk.mk | 1 | ||||
-rw-r--r-- | extensions/source/bibliography/datman.cxx | 5 | ||||
-rw-r--r-- | extensions/source/dbpilots/listcombowizard.cxx | 4 | ||||
-rw-r--r-- | extensions/source/propctrlr/eformspropertyhandler.cxx | 4 | ||||
-rw-r--r-- | extensions/source/update/check/updatecheck.cxx | 11 | ||||
-rw-r--r-- | extensions/source/update/check/updatecheckjob.cxx | 11 | ||||
-rw-r--r-- | extensions/source/update/feed/test/updatefeedtest.cxx | 4 |
8 files changed, 27 insertions, 14 deletions
diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk index e2cdaf58c315..02876aab74d5 100644 --- a/extensions/CppunitTest_extensions_test_update.mk +++ b/extensions/CppunitTest_extensions_test_update.mk @@ -23,6 +23,7 @@ $(eval $(call gb_CppunitTest_use_libraries,extensions_test_update, \ sal \ salhelper \ test \ + tl \ utl \ unotest \ vcl \ diff --git a/extensions/Library_updchk.mk b/extensions/Library_updchk.mk index 269a0d4dd36b..c7f1a54bb65e 100644 --- a/extensions/Library_updchk.mk +++ b/extensions/Library_updchk.mk @@ -23,6 +23,7 @@ $(eval $(call gb_Library_use_libraries,updchk,\ cppu \ sal \ salhelper \ + tl \ utl \ vcl \ )) diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 8f456b889181..af0430e09352 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -174,9 +174,10 @@ static Reference< XNameAccess > getColumns(const Reference< XForm > & _rxForm) if (xSupplyCols.is()) xReturn = xSupplyCols->getColumns(); } - catch (const Exception& e) + catch (const Exception&) { - SAL_WARN( "extensions.biblio", "::getColumns : caught an exception. " << e); + css::uno::Any ex( cppu::getCaughtException() ); + SAL_WARN( "extensions.biblio", "::getColumns : caught an exception. " << exceptionToString(ex)); } } diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index 44006083ee29..491eda019fa1 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/form/ListSourceType.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <tools/debug.hxx> +#include <tools/diagnose_ex.h> #include <connectivity/dbtools.hxx> #include <helpids.h> #include <sal/log.hxx> @@ -253,7 +254,8 @@ namespace dbp } catch(const Exception&) { - SAL_WARN( "extensions.dbpilots", "OLinkFieldsPage::initializePage: caught an exception while retrieving the columns!"); + css::uno::Any ex( cppu::getCaughtException() ); + SAL_WARN( "extensions.dbpilots", "OLinkFieldsPage::initializePage: caught an exception while retrieving the columns! " << exceptionToString(ex)); } } return aColumnNames; diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx index d074a7e64fed..31ca06be7121 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.cxx +++ b/extensions/source/propctrlr/eformspropertyhandler.cxx @@ -31,6 +31,7 @@ #include <com/sun/star/inspection/PropertyControlType.hpp> #include <com/sun/star/inspection/XObjectInspectorUI.hpp> #include <tools/debug.hxx> +#include <tools/diagnose_ex.h> #include <sal/log.hxx> #include <functional> @@ -147,8 +148,9 @@ 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.)"); + "\n(have been asked for the \"" <<_rPropertyName << "\" property.) " << exceptionToString(ex)); } return aReturn; } 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)); } } diff --git a/extensions/source/update/feed/test/updatefeedtest.cxx b/extensions/source/update/feed/test/updatefeedtest.cxx index e443cd1a9473..6e6c944fa70c 100644 --- a/extensions/source/update/feed/test/updatefeedtest.cxx +++ b/extensions/source/update/feed/test/updatefeedtest.cxx @@ -70,9 +70,9 @@ SAL_IMPLEMENT_MAIN() uno::Sequence< uno::Reference< xml::dom::XElement > > theUpdateInfo = rUpdateInformationProvider->getUpdateInformation( theURLs, aExtension ); } - catch( const uno::Exception & e ) + catch( const uno::Exception & ) { - SAL_WARN("extensions.update", "exception caught: " << e); + SAL_WARN("extensions.update", "exception caught: " << exceptionToString(ex)); } catch( ... ) { |