summaryrefslogtreecommitdiff
path: root/desktop/source/deployment
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-11-20 19:07:31 +0100
committerMichael Stahl <mstahl@redhat.com>2012-11-26 23:14:33 +0100
commit31170413ae3786bf44564e813d7291354e939a77 (patch)
treeca37fdc23fa2d31217433ba9d7bc12fe66be94e9 /desktop/source/deployment
parent1d095efaf989730c298b2ad99720eacf68f71229 (diff)
API CHANGE: com.sun.star.lang.IllegalArgumentException
... derives from com.sun.star.uno.RuntimeException instead of com.sun.star.uno.Exception. Only test that breaks with this change is jurt_uno/AnyConverter_Test, which for mysterious reasons effectively tests that IllegalArgumentException is a subclass of Exception and not RuntimeException. Presumably this is just a generic exception test that happens to use IllegalArgumentException. Some further testing indicates there are no problems expected at runtime: Running "make subsequentcheck" with all Java test code compiled against a ridl.jar that does not contain the change, running against a soffice that uses ridl.jar and rdbs with the change + ridl.jar with the change on the test side yields exactly the same AnyConverter_Test failure, with no other failures. Change-Id: Iad183de76ec7e0d56648084e97cdcc160b5b033d
Diffstat (limited to 'desktop/source/deployment')
-rw-r--r--desktop/source/deployment/manager/dp_manager.cxx11
-rw-r--r--desktop/source/deployment/registry/dp_backend.cxx3
2 files changed, 4 insertions, 10 deletions
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index 4d54abcf6d40..8f469ed545c9 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -940,9 +940,6 @@ void PackageManagerImpl::removePackage(
catch (const RuntimeException &) {
throw;
}
- catch (const lang::IllegalArgumentException &) {
- throw;
- }
catch (const CommandFailedException & exc) {
logIntern( Any(exc) );
throw;
@@ -1089,14 +1086,14 @@ Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage(
const ::osl::MutexGuard guard( getMutex() );
return getDeployedPackage_( id, fileName, xCmdEnv );
}
- catch (const RuntimeException &) {
+ catch (const lang::IllegalArgumentException & exc) {
+ logIntern( Any(exc) );
throw;
}
- catch (const CommandFailedException & exc) {
- logIntern( Any(exc) );
+ catch (const RuntimeException &) {
throw;
}
- catch (const lang::IllegalArgumentException & exc) {
+ catch (const CommandFailedException & exc) {
logIntern( Any(exc) );
throw;
}
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index a142d358793c..955a5acd8897 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -177,9 +177,6 @@ Reference<deployment::XPackage> PackageRegistryBackend::bindPackage(
catch (const RuntimeException &) {
throw;
}
- catch (const lang::IllegalArgumentException &) {
- throw;
- }
catch (const CommandFailedException &) {
throw;
}