ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

loplugin:flatten in connectivity..desktop

Browse Source 
Change-Id: Iff59d3049ba40b4338ef8eec67d08a96b0834d2b
Reviewed-on: https://gerrit.libreoffice.org/42578
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2017-09-21 15:41:50 +02:00
parent 3a481dde03
commit 2a612907ae
15 changed files with 252 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpputools/source/unoexe/unoexe.cxx
+54 -56
View File
@@ -165,66 +165,64 @@ static Reference< XInterface > loadComponent(
{
// determine loader to be used
sal_Int32 nDot = rLocation.lastIndexOf( '.' );
if (nDot > 0 && nDot < rLocation.getLength())
{
Reference< XImplementationLoader > xLoader;
OUString aExt( rLocation.copy( nDot +1 ) );
if (aExt == "dll" || aExt == "exe" || aExt == "dylib" || aExt == "so")
{
createInstance(
xLoader, xContext, "com.sun.star.loader.SharedLibrary" );
}
else if (aExt == "jar" || aExt == "class")
{
createInstance(
xLoader, xContext, "com.sun.star.loader.Java" );
}
else
{
throw RuntimeException(
"unknown extension of \"" + rLocation + "\"! No loader available!" );
}
Reference< XInterface > xInstance;
// activate
Reference< XInterface > xFactory( xLoader->activate(
rImplName, OUString(), rLocation, Reference< XRegistryKey >() ) );
if (xFactory.is())
{
Reference< XSingleComponentFactory > xCFac( xFactory, UNO_QUERY );
if (xCFac.is())
{
xInstance = xCFac->createInstanceWithContext( xContext );
}
else
{
Reference< XSingleServiceFactory > xSFac( xFactory, UNO_QUERY );
if (xSFac.is())
{
out( "\n> warning: ignoring context for implementation \"" );
out( rImplName );
out( "\"!" );
xInstance = xSFac->createInstance();
}
}
}
if (! xInstance.is())
{
throw RuntimeException(
"activating component \"" + rImplName + "\" from location \"" + rLocation + "\" failed!" );
}
return xInstance;
}
else
if (nDot <= 0 || nDot >= rLocation.getLength())
{
throw RuntimeException(
"location \"" + rLocation + "\" has no extension! Cannot determine loader to be used!" );
}
Reference< XImplementationLoader > xLoader;
OUString aExt( rLocation.copy( nDot +1 ) );
if (aExt == "dll" || aExt == "exe" || aExt == "dylib" || aExt == "so")
{
createInstance(
xLoader, xContext, "com.sun.star.loader.SharedLibrary" );
}
else if (aExt == "jar" || aExt == "class")
{
createInstance(
xLoader, xContext, "com.sun.star.loader.Java" );
}
else
{
throw RuntimeException(
"unknown extension of \"" + rLocation + "\"! No loader available!" );
}
Reference< XInterface > xInstance;
// activate
Reference< XInterface > xFactory( xLoader->activate(
rImplName, OUString(), rLocation, Reference< XRegistryKey >() ) );
if (xFactory.is())
{
Reference< XSingleComponentFactory > xCFac( xFactory, UNO_QUERY );
if (xCFac.is())
{
xInstance = xCFac->createInstanceWithContext( xContext );
}
else
{
Reference< XSingleServiceFactory > xSFac( xFactory, UNO_QUERY );
if (xSFac.is())
{
out( "\n> warning: ignoring context for implementation \"" );
out( rImplName );
out( "\"!" );
xInstance = xSFac->createInstance();
}
}
}
if (! xInstance.is())
{
throw RuntimeException(
"activating component \"" + rImplName + "\" from location \"" + rLocation + "\" failed!" );
}
return xInstance;
}
class OInstanceProvider