From 02a872cb2cb68338a9459dd7d922001ee6c9a343 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 1 Oct 2013 01:09:41 +0200 Subject: Remove odd "bootstrapping" of acceptor/connector/binaryurp components ...that had effectively been in uno.exe since c460c0ccb6f389339b2ff9e57a101557c30df676 "initial import," for whatever reason it was supposed to be good for, but would no longer work anyway at least since 644c33a857c46d540202189228f519946dc33833 "fdo#67313: Use "lo" suffix for private URE libs." Change-Id: I98c038a4d9d963eefc542c91247cf263d7d988bb --- cpputools/source/unoexe/unoexe.cxx | 43 -------------------------------------- 1 file changed, 43 deletions(-) diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx index cb345ca020ac..1a7ace1a5350 100644 --- a/cpputools/source/unoexe/unoexe.cxx +++ b/cpputools/source/unoexe/unoexe.cxx @@ -30,7 +30,6 @@ #include #include -#include #include #include @@ -38,9 +37,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -173,46 +170,6 @@ void createInstance( Reference< XMultiComponentFactory > xMgr( xContext->getServiceManager() ); Reference< XInterface > x( xMgr->createInstanceWithContext( rServiceName, xContext ) ); - if (! x.is()) - { - static sal_Bool s_bSet = sal_False; - if (! s_bSet) - { - MutexGuard aGuard( Mutex::getGlobalMutex() ); - if (! s_bSet) - { - Reference< XSet > xSet( xMgr, UNO_QUERY ); - if (xSet.is()) - { - Reference< XMultiServiceFactory > xSF( xMgr, UNO_QUERY ); - // acceptor - xSet->insert( makeAny( loadSharedLibComponentFactory( - OUString( "acceptor.uno" SAL_DLLEXTENSION ), - OUString(), - OUString( "com.sun.star.comp.io.Acceptor" ), - xSF, Reference< XRegistryKey >(), - "acceptor_" ) ) ); - // connector - xSet->insert( makeAny( loadSharedLibComponentFactory( - OUString( "connector.uno" SAL_DLLEXTENSION ), - OUString(), - OUString( "com.sun.star.comp.io.Connector" ), - xSF, Reference< XRegistryKey >(), - "connector_" ) ) ); - // bridge factory - xSet->insert( makeAny( loadSharedLibComponentFactory( - OUString( "binaryurp.uno" SAL_DLLEXTENSION ), - OUString(), - OUString( "com.sun.star.comp.bridge.BridgeFactory" ), - xSF, Reference< XRegistryKey >(), - "binaryurp_" ) ) ); - } - s_bSet = sal_True; - } - } - x = xMgr->createInstanceWithContext( rServiceName, xContext ); - } - if (! x.is()) { OUStringBuffer buf( 64 ); -- cgit on value='distro/collabora/cp-6.0'>distro/collabora/cp-6.0 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/stoc/source/javavm/javavm.component
AgeCommit message (Expand)Author
2019-06-07lok: re-factor getTextSelection.Michael Meeks