[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - desktop/source

[Stephan Bergmann]

 desktop/source/deployment/registry/dp_backend.cxx |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit 1ceb97fdd46b2eb6ebf5aded10cb2a8f33cd5a7a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Feb 5 12:52:46 2013 +0100

    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 at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index 955a5ac..5012cc2 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",