diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-08-07 13:39:28 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-08-07 13:39:28 +0000 |
| commit | 8500c62236766b0ec2c9470b5fe6753c2526041d (patch) | |
| tree | 9727d3f53c147a8ea3fd2a0dea08d5e7c2b9f961 /ucb | |
| parent | 3cf566268835debd9ad68bf5d802eeaa19a12ad2 (diff) | |
INTEGRATION: CWS sb5 (1.6.96); FILE MERGED
2003/06/20 10:36:37 sb 1.6.96.1: #110345# Removed remote access content provider and stand-alone ucb executable.
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/core/ucbserv.cxx | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/ucb/source/core/ucbserv.cxx b/ucb/source/core/ucbserv.cxx index 8453933230e7..3485b6abbdd4 100644 --- a/ucb/source/core/ucbserv.cxx +++ b/ucb/source/core/ucbserv.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ucbserv.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: kso $ $Date: 2001-04-06 08:32:14 $ + * last change: $Author: hr $ $Date: 2003-08-07 14:39:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,15 +81,11 @@ #ifndef _PROVPROX_HXX #include "provprox.hxx" #endif -#ifndef INCLUDED_UCB_COREREMOTECONTENTBROKER_HXX -#include "coreremotecontentbroker.hxx" -#endif using namespace rtl; using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::registry; -using ucb_core::RemoteContentBroker; //========================================================================= static sal_Bool writeInfo( void * pRegistryKey, @@ -173,16 +169,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( writeInfo( pRegistryKey, UcbContentProviderProxyFactory::getImplementationName_Static(), - UcbContentProviderProxyFactory::getSupportedServiceNames_Static() ) && - - ////////////////////////////////////////////////////////////////////// - // Remote Content Broker. - ////////////////////////////////////////////////////////////////////// - // THIS CAN BE REMOVED ONCE THE WEBTOP SERVER HAS A UCB OF ITS OWN: - - writeInfo( pRegistryKey, - RemoteContentBroker::getImplementationName_Static(), - RemoteContentBroker::getSupportedServiceNames_Static() ); + UcbContentProviderProxyFactory::getSupportedServiceNames_Static() ); } //========================================================================= @@ -237,17 +224,6 @@ extern "C" void * SAL_CALL component_getFactory( } ////////////////////////////////////////////////////////////////////// - // Remote Content Broker. - ////////////////////////////////////////////////////////////////////// - // THIS CAN BE REMOVED ONCE THE WEBTOP SERVER HAS A UCB OF ITS OWN: - - else if ( RemoteContentBroker::getImplementationName_Static(). - compareToAscii( pImplName ) == 0 ) - { - xFactory = RemoteContentBroker::createServiceFactory( xSMgr ); - } - - ////////////////////////////////////////////////////////////////////// if ( xFactory.is() ) { |