Kaydet (Commit) 02a872cb authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Remove odd "bootstrapping" of acceptor/connector/binaryurp components

...that had effectively been in uno.exe since
c460c0cc "initial import," for whatever reason
it was supposed to be good for, but would no longer work anyway at least since
644c33a8 "fdo#67313: Use "lo" suffix for private
URE libs."

Change-Id: I98c038a4d9d963eefc542c91247cf263d7d988bb
üst f3010323
......@@ -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>
......@@ -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 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment