scripting/source/provider/ProviderCache.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 275753a7d08086b084452ca00372003f1d8700d4
Author: Damjan Jovanovic <dam...@apache.org>
Date: Sun Oct 16 16:32:08 2016 +0000
#i127165# Clicking "No" in Java dialog causes abnormal exit on FreeBSD
XSingleComponentFactory::createInstanceWithArgumentsAndContext()
throws an Exception, not a RuntimeException. This was causing
an abort on FreeBSD when "No" is clicked in the Java dialog,
as JavaComponentLoader::activate() throws a
CannotActivateFactoryException which is a subclass of Exception
but not RuntimeException, and the scripting ProviderCache wrongly
catches only RuntimeException. The missed CannotActivateFactoryException
was going to unexpected(), which calls abort()...
Patch by: me
diff --git a/scripting/source/provider/ProviderCache.cxx
b/scripting/source/provider/ProviderCache.cxx
index 0049200..d7df63e 100644
--- a/scripting/source/provider/ProviderCache.cxx
+++ b/scripting/source/provider/ProviderCache.cxx
@@ -200,7 +200,7 @@ ProviderCache::createProvider( ProviderDetails& details )
throw ( RuntimeExcepti
details.provider.set(
details.factory->createInstanceWithArgumentsAndContext( m_Sctx,
m_xContext ), UNO_QUERY_THROW );
}
- catch ( RuntimeException& e )
+ catch ( Exception& e )
{
::rtl::OUString temp =
::rtl::OUString::createFromAscii("ProviderCache::createProvider() Error
creating provider from factory!!!");
throw RuntimeException( temp.concat( e.Message ), Reference<
XInterface >() );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
