Kaydet (Commit) eaf3c601 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

fdo#58331: Handle IllegalArgumentException routinely thrown for legacy exts

...that was no longer handled properly when installing such a legacy .zip
extension due to 31170413 "API CHANGE:
com.sun.star.lang.IllegalArgumentException."

Change-Id: I6f5f4be0eed16496d8d3c3623d6676c7c669c5c4
üst 28e4c025
......@@ -866,7 +866,7 @@ void BackendImpl::PackageImpl::processPackage_(
try {
xPackage->registerPackage( startup, xSubAbortChannel, xCmdEnv );
}
catch (const Exception &)
catch (const Exception & e)
{
//We even try a rollback if the user cancelled the action (CommandAbortedException)
//in order to prevent invalid database entries.
......@@ -1366,9 +1366,15 @@ Reference<deployment::XPackage> BackendImpl::PackageImpl::bindBundleItem(
Reference<deployment::XPackage>xPackage;
try {
xPackage.set( getMyBackend()->m_xRootRegistry->bindPackage(
url, mediaType, bRemoved, identifier, xCmdEnv ) );
OSL_ASSERT( xPackage.is() );
try {
xPackage.set( getMyBackend()->m_xRootRegistry->bindPackage(
url, mediaType, bRemoved, identifier, xCmdEnv ) );
OSL_ASSERT( xPackage.is() );
} catch (css::lang::IllegalArgumentException & e) {
css::uno::Any exc(cppu::getCaughtException());
throw css::lang::WrappedTargetException(
"wrapped: " + e.Message, e.Context, exc);
}
}
catch (const RuntimeException &) {
throw;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment