diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-07-23 14:02:43 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-07-23 14:02:43 +0000 |
| commit | 7b80ba1fde3d786c70210fa00ef0996f78ef8d79 (patch) | |
| tree | 7fa0823e310deb0f18295d6ca219d07f8c3b185b /cppuhelper/source/bootstrap.cxx | |
| parent | f1f0d0b6d04e8cb0f402dea4a7feaedc9dd85e1d (diff) | |
INTEGRATION: CWS sb20 (1.17.6); FILE MERGED
2004/07/12 11:01:16 sb 1.17.6.2: RESYNC: (1.17-1.18); FILE MERGED
2004/07/09 09:24:26 sb 1.17.6.1: #i29741# Retrofitted existing services as single-interface--based ones.
Diffstat (limited to 'cppuhelper/source/bootstrap.cxx')
| -rw-r--r-- | cppuhelper/source/bootstrap.cxx | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx index 0c21bb3ee08b..b9d9877e5bf3 100644 --- a/cppuhelper/source/bootstrap.cxx +++ b/cppuhelper/source/bootstrap.cxx @@ -2,9 +2,9 @@ * * $RCSfile: bootstrap.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: hr $ $Date: 2004-06-28 14:17:16 $ + * last change: $Author: rt $ $Date: 2004-07-23 15:02:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -93,6 +93,7 @@ #include "com/sun/star/container/XSet.hpp" #include "com/sun/star/beans/PropertyValue.hpp" #include "com/sun/star/io/IOException.hpp" +#include "com/sun/star/bridge/UnoUrlResolver.hpp" #include "com/sun/star/bridge/XUnoUrlResolver.hpp" #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) @@ -603,17 +604,9 @@ Reference< XComponentContext > SAL_CALL bootstrap() throw BootstrapException( OUSTR( "unmapped error!" ) ); } - // initial service manager - Reference< lang::XMultiComponentFactory > xLocalServiceManager( - xLocalContext->getServiceManager() ); - if ( !xLocalServiceManager.is() ) - throw BootstrapException( OUSTR( "no initial service manager!" ) ); - // create a URL resolver Reference< bridge::XUnoUrlResolver > xUrlResolver( - xLocalServiceManager->createInstanceWithContext( - OUSTR( "com.sun.star.bridge.UnoUrlResolver" ), xLocalContext ), - UNO_QUERY_THROW ); + bridge::UnoUrlResolver::create( xLocalContext ) ); // connection string OSL_ASSERT( buf.getLength() == 0 ); |