[PATCH libreoffice-4-0] Avoid a SAL_WARN caused by IllegalArgumentEx now being a Run...

[Stephan Bergmann (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1997

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/97/1997/1

Avoid a SAL_WARN caused by IllegalArgumentEx now being a RuntimeEx

Change-Id: I6fad4e840cf47b4d41592ff179f66943a4469760
(cherry picked from commit 3d23c626e685f8ab3ee1780f10f368ee8ede61d0)
---
M desktop/source/deployment/registry/dp_backend.cxx
1 file changed, 9 insertions(+), 0 deletions(-)



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 @@
                                  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",

-- 
To view, visit https://gerrit.libreoffice.org/1997
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6fad4e840cf47b4d41592ff179f66943a4469760
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Stephan Bergmann <sbergman at redhat.com>