diff options
Diffstat (limited to 'desktop/source/offacc/acceptor.cxx')
-rw-r--r-- | desktop/source/offacc/acceptor.cxx | 43 |
1 files changed, 7 insertions, 36 deletions
diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx index 1989937597..0b9f33ada3 100644 --- a/desktop/source/offacc/acceptor.cxx +++ b/desktop/source/offacc/acceptor.cxx @@ -69,10 +69,10 @@ Acceptor::Acceptor( const Reference< XMultiServiceFactory >& rFactory ) { m_rSMgr = rFactory; m_rAcceptor = Reference< XAcceptor > (m_rSMgr->createInstance( - rtl::OUString::createFromAscii( "com.sun.star.connection.Acceptor" )), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.connection.Acceptor" ))), UNO_QUERY ); m_rBridgeFactory = Reference < XBridgeFactory > (m_rSMgr->createInstance( - rtl::OUString::createFromAscii( "com.sun.star.bridge.BridgeFactory" )), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.bridge.BridgeFactory" ))), UNO_QUERY ); // get component context m_rContext = getComponentContext(m_rSMgr); @@ -174,7 +174,7 @@ void SAL_CALL Acceptor::initialize( const Sequence<Any>& aArguments ) // "<connectString>;<protocol>" sal_Int32 nIndex1 = m_aAcceptString.indexOf( (sal_Unicode) ';' ); if (nIndex1 < 0) throw IllegalArgumentException( - OUString::createFromAscii("Invalid accept-string format"), m_rContext, 1); + OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid accept-string format")), m_rContext, 1); m_aConnectString = m_aAcceptString.copy( 0 , nIndex1 ).trim(); nIndex1++; sal_Int32 nIndex2 = m_aAcceptString.indexOf( (sal_Unicode) ';' , nIndex1 ); @@ -200,7 +200,7 @@ void SAL_CALL Acceptor::initialize( const Sequence<Any>& aArguments ) if (!bOk) { throw IllegalArgumentException( - OUString::createFromAscii("invalid initialization"), m_rContext, 1); + OUString(RTL_CONSTASCII_USTRINGPARAM("invalid initialization")), m_rContext, 1); } } @@ -275,29 +275,17 @@ Reference<XInterface> SAL_CALL AccInstanceProvider::getInstance (const OUString& else if ( aName.compareToAscii("StarOffice.NamingService" ) == 0 ) { Reference< XNamingService > rNamingService( - m_rSMgr->createInstance( OUString::createFromAscii( "com.sun.star.uno.NamingService" )), + m_rSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uno.NamingService" ))), UNO_QUERY ); if ( rNamingService.is() ) { rNamingService->registerObject( - OUString::createFromAscii( "StarOffice.ServiceManager" ), m_rSMgr ); + OUString(RTL_CONSTASCII_USTRINGPARAM( "StarOffice.ServiceManager" )), m_rSMgr ); rNamingService->registerObject( - OUString::createFromAscii( "StarOffice.ComponentContext" ), getComponentContext( m_rSMgr )); + OUString(RTL_CONSTASCII_USTRINGPARAM( "StarOffice.ComponentContext" )), getComponentContext( m_rSMgr )); rInstance = rNamingService; } } - /* - else if ( aName.compareToAscii("com.sun.star.ucb.RemoteContentProviderAcceptor" )) - { - Reference< XMultiServiceFactory > rSMgr = ::comphelper::getProcessServiceFactory(); - if ( rSMgr.is() ) { - try { - rInstance = rSMgr->createInstance( sObjectName ); - } - catch (Exception const &) {} - } - } - */ return rInstance; } @@ -315,23 +303,6 @@ component_getImplementationEnvironment(const sal_Char **ppEnvironmentTypeName, u *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; } -sal_Bool SAL_CALL -component_writeInfo(void *pServiceManager, void *pRegistryKey) -{ - Reference< XMultiServiceFactory > xMan(reinterpret_cast< XMultiServiceFactory* >(pServiceManager)); - Reference< XRegistryKey > xKey(reinterpret_cast< XRegistryKey* >(pRegistryKey)); - - // register service - ::rtl::OUString aTempStr; - ::rtl::OUString aImpl(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += Acceptor::impl_getImplementationName(); - aImpl += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - Reference< XRegistryKey > xNewKey = xKey->createKey(aImpl); - xNewKey->createKey(Acceptor::impl_getSupportedServiceNames()[0]); - - return sal_True; -} - void * SAL_CALL component_getFactory(const sal_Char *pImplementationName, void *pServiceManager, void *) { |