diff options
Diffstat (limited to 'desktop/source/deployment/manager/dp_manager.cxx')
| -rw-r--r-- | desktop/source/deployment/manager/dp_manager.cxx | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index f73eeb2268b2..12098a26a733 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -33,6 +33,7 @@ #include <rtl/bootstrap.hxx> #include <sal/log.hxx> #include <tools/urlobj.hxx> +#include <tools/diagnose_ex.h> #include <osl/diagnose.h> #include <osl/file.hxx> #include <osl/security.hxx> @@ -597,10 +598,11 @@ OUString PackageManagerImpl::detectMediaType( if (xPackageType.is()) mediaType = xPackageType->getMediaType(); } - catch (const lang::IllegalArgumentException & exc) { + catch (const lang::IllegalArgumentException &) { if (throw_exc) throw; - SAL_WARN( "desktop", exc ); + css::uno::Any ex( cppu::getCaughtException() ); + SAL_WARN( "desktop", exceptionToString(ex) ); } } return mediaType; @@ -1037,13 +1039,15 @@ PackageManagerImpl::getDeployedPackages_( true /* xxx todo: think of GUI: ignore other platforms than the current one */ ) ); } - catch (const lang::IllegalArgumentException & exc) { + catch (const lang::IllegalArgumentException &) { + css::uno::Any ex( cppu::getCaughtException() ); // ignore - SAL_WARN( "desktop", exc ); + SAL_WARN( "desktop", exceptionToString(ex) ); } - catch (const deployment::DeploymentException& exc) { + catch (const deployment::DeploymentException&) { + css::uno::Any ex( cppu::getCaughtException() ); // ignore - SAL_WARN( "desktop", exc ); + SAL_WARN( "desktop", exceptionToString(ex) ); } } return comphelper::containerToSequence(packages); |