summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ucb/source/cacher/cacheserv.cxx24
-rw-r--r--ucb/source/core/ucbserv.cxx32
-rw-r--r--ucb/source/sorter/sortmain.cxx10
-rw-r--r--ucb/source/ucp/file/prov.cxx9
-rw-r--r--ucb/source/ucp/hierarchy/hierarchyservices.cxx9
-rw-r--r--ucb/source/ucp/package/pkgservices.cxx9
-rw-r--r--ucb/source/ucp/webdav/webdavservices.cxx9
-rw-r--r--uui/source/services.cxx9
8 files changed, 17 insertions, 94 deletions
diff --git a/ucb/source/cacher/cacheserv.cxx b/ucb/source/cacher/cacheserv.cxx
index 27dfe0c8c480..2df589f42450 100644
--- a/ucb/source/cacher/cacheserv.cxx
+++ b/ucb/source/cacher/cacheserv.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: cacheserv.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: kso $ $Date: 2001-04-05 09:50:13 $
+ * last change: $Author: kso $ $Date: 2001-04-06 08:31:07 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -191,11 +191,6 @@ extern "C" void * SAL_CALL component_getFactory(
{
xFactory = CachedContentResultSetFactory::createServiceFactory( xSMgr );
}
- else if ( rtl_str_compare( pImplName, "CachedContentResultSetFactory" ) == 0 )
- {
- // Backward compatibility... :-/
- xFactory = CachedContentResultSetFactory::createServiceFactory( xSMgr );
- }
//////////////////////////////////////////////////////////////////////
// CachedContentResultSetStubFactory.
@@ -206,11 +201,6 @@ extern "C" void * SAL_CALL component_getFactory(
{
xFactory = CachedContentResultSetStubFactory::createServiceFactory( xSMgr );
}
- else if ( rtl_str_compare( pImplName, "CachedContentResultSetStubFactory" ) == 0 )
- {
- // Backward compatibility... :-/
- xFactory = CachedContentResultSetStubFactory::createServiceFactory( xSMgr );
- }
//////////////////////////////////////////////////////////////////////
// CachedDynamicResultSetFactory.
@@ -221,11 +211,6 @@ extern "C" void * SAL_CALL component_getFactory(
{
xFactory = CachedDynamicResultSetFactory::createServiceFactory( xSMgr );
}
- else if ( rtl_str_compare( pImplName, "CachedDynamicResultSetFactory" ) == 0 )
- {
- // Backward compatibility... :-/
- xFactory = CachedDynamicResultSetFactory::createServiceFactory( xSMgr );
- }
//////////////////////////////////////////////////////////////////////
// CachedDynamicResultSetStubFactory.
@@ -236,11 +221,6 @@ extern "C" void * SAL_CALL component_getFactory(
{
xFactory = CachedDynamicResultSetStubFactory::createServiceFactory( xSMgr );
}
- else if ( rtl_str_compare( pImplName, "CachedDynamicResultSetStubFactory" ) == 0 )
- {
- // Backward compatibility... :-/
- xFactory = CachedDynamicResultSetStubFactory::createServiceFactory( xSMgr );
- }
//////////////////////////////////////////////////////////////////////
diff --git a/ucb/source/core/ucbserv.cxx b/ucb/source/core/ucbserv.cxx
index 0d6acf56b2f9..8453933230e7 100644
--- a/ucb/source/core/ucbserv.cxx
+++ b/ucb/source/core/ucbserv.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ucbserv.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: kso $ $Date: 2001-04-05 09:49:55 $
+ * last change: $Author: kso $ $Date: 2001-04-06 08:32:14 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -204,11 +204,6 @@ extern "C" void * SAL_CALL component_getFactory(
{
xFactory = UniversalContentBroker::createServiceFactory( xSMgr );
}
- else if ( rtl_str_compare( pImplName, "UniversalContentBroker" ) == 0 )
- {
- // Backward compatibility... :-/
- xFactory = UniversalContentBroker::createServiceFactory( xSMgr );
- }
//////////////////////////////////////////////////////////////////////
// UCB Store.
@@ -219,11 +214,6 @@ extern "C" void * SAL_CALL component_getFactory(
{
xFactory = UcbStore::createServiceFactory( xSMgr );
}
- else if ( rtl_str_compare( pImplName, "UcbStore" ) == 0 )
- {
- // Backward compatibility... :-/
- xFactory = UcbStore::createServiceFactory( xSMgr );
- }
//////////////////////////////////////////////////////////////////////
// UCB PropertiesManager.
@@ -234,11 +224,6 @@ extern "C" void * SAL_CALL component_getFactory(
{
xFactory = UcbPropertiesManager::createServiceFactory( xSMgr );
}
- else if ( rtl_str_compare( pImplName, "UcbPropertiesManager" ) == 0 )
- {
- // Backward compatibility... :-/
- xFactory = UcbPropertiesManager::createServiceFactory( xSMgr );
- }
//////////////////////////////////////////////////////////////////////
// UCP Proxy Factory.
@@ -250,13 +235,6 @@ extern "C" void * SAL_CALL component_getFactory(
xFactory
= UcbContentProviderProxyFactory::createServiceFactory( xSMgr );
}
- else if ( rtl_str_compare( pImplName, "UcbContentProviderProxyFactory" )
- == 0 )
- {
- // Backward compatibility... :-/
- xFactory
- = UcbContentProviderProxyFactory::createServiceFactory( xSMgr );
- }
//////////////////////////////////////////////////////////////////////
// Remote Content Broker.
@@ -268,12 +246,6 @@ extern "C" void * SAL_CALL component_getFactory(
{
xFactory = RemoteContentBroker::createServiceFactory( xSMgr );
}
- else if ( rtl_str_compare( pImplName, "ucb_core::RemoteContentBroker" )
- == 0 )
- {
- // Backward compatibility... :-/
- xFactory = RemoteContentBroker::createServiceFactory( xSMgr );
- }
//////////////////////////////////////////////////////////////////////
diff --git a/ucb/source/sorter/sortmain.cxx b/ucb/source/sorter/sortmain.cxx
index fa1090a10ea8..bd7ec0421ed8 100644
--- a/ucb/source/sorter/sortmain.cxx
+++ b/ucb/source/sorter/sortmain.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: sortmain.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: kso $ $Date: 2001-04-05 09:49:31 $
+ * last change: $Author: kso $ $Date: 2001-04-06 08:32:56 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -158,12 +158,6 @@ extern "C" void * SAL_CALL component_getFactory(
{
xFactory = SortedDynamicResultSetFactory::createServiceFactory( xSMgr );
}
- else if ( rtl_str_compare( pImplName, "SortedDynamicResultSetFactory" )
- == 0 )
- {
- // Backward compatibility... :-/
- xFactory = SortedDynamicResultSetFactory::createServiceFactory( xSMgr );
- }
//////////////////////////////////////////////////////////////////////
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index f2feb6fa381a..1f6a24f84ba3 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: prov.cxx,v $
*
- * $Revision: 1.15 $
+ * $Revision: 1.16 $
*
- * last change: $Author: kso $ $Date: 2001-04-05 09:49:09 $
+ * last change: $Author: kso $ $Date: 2001-04-06 08:34:35 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -185,11 +185,6 @@ extern "C" void * SAL_CALL component_getFactory(
{
xFactory = FileProvider::createServiceFactory( xSMgr );
}
- else if ( rtl_str_compare( pImplName, "FileProvider" ) == 0 )
- {
- // Backward compatibility... :-/
- xFactory = FileProvider::createServiceFactory( xSMgr );
- }
//////////////////////////////////////////////////////////////////////
diff --git a/ucb/source/ucp/hierarchy/hierarchyservices.cxx b/ucb/source/ucp/hierarchy/hierarchyservices.cxx
index 1809c1fa7800..eba253e0f534 100644
--- a/ucb/source/ucp/hierarchy/hierarchyservices.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyservices.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: hierarchyservices.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: kso $ $Date: 2001-04-05 09:48:49 $
+ * last change: $Author: kso $ $Date: 2001-04-06 08:35:20 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -159,11 +159,6 @@ extern "C" void * SAL_CALL component_getFactory(
{
xFactory = HierarchyContentProvider::createServiceFactory( xSMgr );
}
- else if ( rtl_str_compare( pImplName, "HierarchyContentProvider" ) == 0 )
- {
- // Backward compatibility... :-/
- xFactory = HierarchyContentProvider::createServiceFactory( xSMgr );
- }
//////////////////////////////////////////////////////////////////////
diff --git a/ucb/source/ucp/package/pkgservices.cxx b/ucb/source/ucp/package/pkgservices.cxx
index 2566fae06d78..81d25247cb02 100644
--- a/ucb/source/ucp/package/pkgservices.cxx
+++ b/ucb/source/ucp/package/pkgservices.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: pkgservices.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: kso $ $Date: 2001-04-05 09:48:30 $
+ * last change: $Author: kso $ $Date: 2001-04-06 08:36:07 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -158,11 +158,6 @@ extern "C" void * SAL_CALL component_getFactory(
{
xFactory = ::package_ucp::ContentProvider::createServiceFactory( xSMgr );
}
- else if ( rtl_str_compare( pImplName, "PackageContentProvider" ) == 0 )
- {
- // Backward compatibility... :-/
- xFactory = ::package_ucp::ContentProvider::createServiceFactory( xSMgr );
- }
//////////////////////////////////////////////////////////////////////
diff --git a/ucb/source/ucp/webdav/webdavservices.cxx b/ucb/source/ucp/webdav/webdavservices.cxx
index ddbf924a902d..4cf3bdfaff87 100644
--- a/ucb/source/ucp/webdav/webdavservices.cxx
+++ b/ucb/source/ucp/webdav/webdavservices.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: webdavservices.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: kso $ $Date: 2001-04-05 09:40:17 $
+ * last change: $Author: kso $ $Date: 2001-04-06 08:38:39 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -158,11 +158,6 @@ extern "C" void * SAL_CALL component_getFactory(
{
xFactory = ::webdav_ucp::ContentProvider::createServiceFactory( xSMgr );
}
- else if ( rtl_str_compare( pImplName, "webdav_ucp_ContentProvider" ) == 0 )
- {
- // Backward compatibility... :-/
- xFactory = ::webdav_ucp::ContentProvider::createServiceFactory( xSMgr );
- }
//////////////////////////////////////////////////////////////////////
diff --git a/uui/source/services.cxx b/uui/source/services.cxx
index a8d28c5bfa80..509ffa65d75d 100644
--- a/uui/source/services.cxx
+++ b/uui/source/services.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: services.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: kso $ $Date: 2001-04-05 09:52:00 $
+ * last change: $Author: kso $ $Date: 2001-04-06 08:40:56 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -163,12 +163,9 @@ extern "C" void * SAL_CALL component_getFactory(sal_Char const * pImplName,
{
void * pFactory = 0;
if (pServiceManager
- && (rtl_str_compare(pImplName,
+ && rtl_str_compare(pImplName,
UUIInteractionHandler::m_aImplementationName)
== 0)
- ||
- // Backward compatibility... :-/
- (rtl_str_compare(pImplName, "UUIInteractionHandler") == 0))
{
uno::Reference< lang::XSingleServiceFactory >
xTheFactory(