mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#62155 - don't crash if we can't create an instance of a calc addin.

Browse Source 
Change-Id: I478d7777949683a91e7adf9fa6b54e9d01ced676
This commit is contained in:
Michael Meeks
2014-03-27 09:47:55 +00:00
parent 26f6ff0829
commit 3ca1411772
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sc/source/core/tool/addincol.cxx
View File

@@ -593,12 +593,20 @@ void ScUnoAddInCollection::LoadComponent( const ScUnoAddInFuncData& rFuncData )
{ {
OUString aServiceName = aFullName.copy( 0, nPos ); OUString aServiceName = aFullName.copy( 0, nPos );
try
{
uno::Reference<lang::XMultiServiceFactory> xServiceFactory = comphelper::getProcessServiceFactory(); uno::Reference<lang::XMultiServiceFactory> xServiceFactory = comphelper::getProcessServiceFactory();
uno::Reference<uno::XInterface> xInterface( xServiceFactory->createInstance( aServiceName ) ); uno::Reference<uno::XInterface> xInterface( xServiceFactory->createInstance( aServiceName ) );
if (xInterface.is()) if (xInterface.is())
UpdateFromAddIn( xInterface, aServiceName ); UpdateFromAddIn( xInterface, aServiceName );
} }
catch (const uno::Exception &)
{
SAL_WARN ("sc", "Failed to create addin component '"
<< aServiceName << "'");
}
}
} }
bool ScUnoAddInCollection::GetExcelName( const OUString& rCalcName, bool ScUnoAddInCollection::GetExcelName( const OUString& rCalcName,