diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-02-05 12:52:46 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-02-05 15:12:43 +0000 |
| commit | 1ceb97fdd46b2eb6ebf5aded10cb2a8f33cd5a7a (patch) | |
| tree | a252ad38d60b943c25c91f4cb42f8b62ad385494 /desktop | |
| parent | d639a5febe0df03d7af90d69eed816dcf856a551 (diff) | |
Avoid a SAL_WARN caused by IllegalArgumentEx now being a RuntimeEx
Change-Id: I6fad4e840cf47b4d41592ff179f66943a4469760
(cherry picked from commit 3d23c626e685f8ab3ee1780f10f368ee8ede61d0)
Reviewed-on: https://gerrit.libreoffice.org/1997
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/registry/dp_backend.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx index 955a5acd8897..5012cc2dee2f 100644 --- a/desktop/source/deployment/registry/dp_backend.cxx +++ b/desktop/source/deployment/registry/dp_backend.cxx @@ -670,6 +670,15 @@ void Package::processPackage_impl( xCmdEnv ); } } + catch (lang::IllegalArgumentException &) { + Any e(cppu::getCaughtException()); + throw deployment::DeploymentException( + ((doRegisterPackage + ? getResourceString(RID_STR_ERROR_WHILE_REGISTERING) + : getResourceString(RID_STR_ERROR_WHILE_REVOKING)) + + getDisplayName()), + static_cast< OWeakObject * >(this), e); + } catch (const RuntimeException &e) { SAL_WARN( "desktop.deployment", |