diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-10-01 01:09:41 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-10-01 01:14:24 +0200 |
| commit | 02a872cb2cb68338a9459dd7d922001ee6c9a343 (patch) | |
| tree | 2644fc3a732864f34bb3d92502b8c985f776d135 /cpputools | |
| parent | f3010323077228e282509924d8bab29b35fd21f0 (diff) | |
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
Diffstat (limited to 'cpputools')
| -rw-r--r-- | cpputools/source/unoexe/unoexe.cxx | 43 |
1 files changed, 0 insertions, 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 <rtl/ustrbuf.hxx> #include <cppuhelper/bootstrap.hxx> -#include <cppuhelper/shlib.hxx> #include <cppuhelper/implbase1.hxx> #include <com/sun/star/lang/XMain.hpp> @@ -38,9 +37,7 @@ #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XSingleComponentFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XEventListener.hpp> -#include <com/sun/star/container/XSet.hpp> #include <com/sun/star/loader/XImplementationLoader.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/connection/Acceptor.hpp> @@ -175,46 +172,6 @@ void createInstance( 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 ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("cannot get service instance \"") ); buf.append( rServiceName ); |