summaryrefslogtreecommitdiff
path: root/ucb/source
diff options
context:
space:
mode:
Diffstat (limited to 'ucb/source')
-rw-r--r--ucb/source/cacher/cached.xml8
-rw-r--r--ucb/source/cacher/cachedcontentresultset.cxx16
-rw-r--r--ucb/source/cacher/cachedcontentresultsetstub.cxx16
-rw-r--r--ucb/source/cacher/cacheddynamicresultset.cxx16
-rw-r--r--ucb/source/cacher/cacheddynamicresultsetstub.cxx16
-rw-r--r--ucb/source/cacher/cacheserv.cxx24
-rw-r--r--ucb/source/core/provprox.cxx16
-rw-r--r--ucb/source/core/ucb.cxx10
-rw-r--r--ucb/source/core/ucb.xml8
-rw-r--r--ucb/source/core/ucbprops.cxx9
-rw-r--r--ucb/source/core/ucbserv.cxx32
-rw-r--r--ucb/source/core/ucbstore.cxx18
-rw-r--r--ucb/source/sorter/sortdynres.cxx18
-rw-r--r--ucb/source/sorter/sortmain.cxx10
-rw-r--r--ucb/source/sorter/sortresult.cxx10
-rw-r--r--ucb/source/sorter/srtrs.xml2
-rw-r--r--ucb/source/ucp/file/bc.cxx10
-rw-r--r--ucb/source/ucp/file/prov.cxx13
-rw-r--r--ucb/source/ucp/file/shell.cxx6
-rw-r--r--ucb/source/ucp/file/ucpfile.xml2
-rw-r--r--ucb/source/ucp/hierarchy/hierarchycontent.cxx7
-rw-r--r--ucb/source/ucp/hierarchy/hierarchyprovider.cxx8
-rw-r--r--ucb/source/ucp/hierarchy/hierarchyservices.cxx9
-rw-r--r--ucb/source/ucp/hierarchy/ucphier.xml2
-rw-r--r--ucb/source/ucp/package/pkgcontent.cxx6
-rw-r--r--ucb/source/ucp/package/pkgprovider.cxx8
-rw-r--r--ucb/source/ucp/package/pkgservices.cxx9
-rw-r--r--ucb/source/ucp/package/ucppkg.xml2
28 files changed, 202 insertions, 109 deletions
diff --git a/ucb/source/cacher/cached.xml b/ucb/source/cacher/cached.xml
index 1bb9f6863803..4d4a287c4799 100644
--- a/ucb/source/cacher/cached.xml
+++ b/ucb/source/cacher/cached.xml
@@ -11,7 +11,7 @@
Ingrid Halama
</author>
<name>
- CachedContentResultSetFactory
+ com.sun.star.comp.ucb.CachedContentResultSetFactory
</name>
<description>
This component implements a factory for locally cached resultsets.
@@ -32,7 +32,7 @@
Ingrid Halama
</author>
<name>
- CachedContentResultSetStubFactory
+ com.sun.star.comp.ucb.CachedContentResultSetStubFactory
</name>
<description>
This component implements a factory for stubs for locally cached
@@ -54,7 +54,7 @@
Ingrid Halama
</author>
<name>
- CachedDynamicResultSetFactory
+ com.sun.star.comp.ucb.CachedDynamicResultSetFactory
</name>
<description>
This component implements a factory for locally cached dynamic
@@ -76,7 +76,7 @@
Ingrid Halama
</author>
<name>
- CachedDynamicResultSetStubFactory
+ com.sun.star.comp.ucb.CachedDynamicResultSetStubFactory
</name>
<description>
This component implements a factory for stubs for locally cached
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index bead556b899c..e603e40509b8 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: cachedcontentresultset.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: iha $ $Date: 2001-02-26 15:47:50 $
+ * last change: $Author: kso $ $Date: 2001-04-05 09:50:13 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1010,8 +1010,10 @@ XTYPEPROVIDER_IMPL_11( CachedContentResultSet
//--------------------------------------------------------------------------
XSERVICEINFO_NOFACTORY_IMPL_1( CachedContentResultSet,
- OUString::createFromAscii( "CachedContentResultSet" ),
- OUString::createFromAscii( CACHED_CONTENT_RESULTSET_SERVICE_NAME ) );
+ OUString::createFromAscii(
+ "com.sun.star.comp.ucb.CachedContentResultSet" ),
+ OUString::createFromAscii(
+ CACHED_CONTENT_RESULTSET_SERVICE_NAME ) );
//--------------------------------------------------------------------------
// XPropertySet methods. ( inherited )
@@ -2214,8 +2216,10 @@ XTYPEPROVIDER_IMPL_3( CachedContentResultSetFactory,
//--------------------------------------------------------------------------
XSERVICEINFO_IMPL_1( CachedContentResultSetFactory,
- OUString::createFromAscii( "CachedContentResultSetFactory" ),
- OUString::createFromAscii( CACHED_CONTENT_RESULTSET_FACTORY_NAME ) );
+ OUString::createFromAscii(
+ "com.sun.star.comp.ucb.CachedContentResultSetFactory" ),
+ OUString::createFromAscii(
+ CACHED_CONTENT_RESULTSET_FACTORY_NAME ) );
//--------------------------------------------------------------------------
// Service factory implementation.
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx
index 88319d58a1ea..dbdce9a48af9 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.cxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: cachedcontentresultsetstub.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: iha $ $Date: 2001-03-23 11:00:45 $
+ * last change: $Author: kso $ $Date: 2001-04-05 09:50:13 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -212,8 +212,10 @@ Sequence< Type > SAL_CALL CachedContentResultSetStub
//--------------------------------------------------------------------------
XSERVICEINFO_NOFACTORY_IMPL_1( CachedContentResultSetStub,
- OUString::createFromAscii( "CachedContentResultSetStub" ),
- OUString::createFromAscii( CACHED_CRS_STUB_SERVICE_NAME ) );
+ OUString::createFromAscii(
+ "com.sun.star.comp.ucb.CachedContentResultSetStub" ),
+ OUString::createFromAscii(
+ CACHED_CRS_STUB_SERVICE_NAME ) );
//-----------------------------------------------------------------
// XFetchProvider methods.
@@ -569,8 +571,10 @@ XTYPEPROVIDER_IMPL_3( CachedContentResultSetStubFactory,
//--------------------------------------------------------------------------
XSERVICEINFO_IMPL_1( CachedContentResultSetStubFactory,
- OUString::createFromAscii( "CachedContentResultSetStubFactory" ),
- OUString::createFromAscii( CACHED_CRS_STUB_FACTORY_NAME ) );
+ OUString::createFromAscii(
+ "com.sun.star.comp.ucb.CachedContentResultSetStubFactory" ),
+ OUString::createFromAscii(
+ CACHED_CRS_STUB_FACTORY_NAME ) );
//--------------------------------------------------------------------------
// Service factory implementation.
diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx
index b25da54bc48f..d42b2c4b8c8e 100644
--- a/ucb/source/cacher/cacheddynamicresultset.cxx
+++ b/ucb/source/cacher/cacheddynamicresultset.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: cacheddynamicresultset.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: kso $ $Date: 2000-10-17 10:44:57 $
+ * last change: $Author: kso $ $Date: 2001-04-05 09:50:13 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -160,8 +160,10 @@ XTYPEPROVIDER_IMPL_4( CachedDynamicResultSet
//--------------------------------------------------------------------------
XSERVICEINFO_NOFACTORY_IMPL_1( CachedDynamicResultSet,
- OUString::createFromAscii( "CachedDynamicResultSet" ),
- OUString::createFromAscii( CACHED_DRS_SERVICE_NAME ) );
+ OUString::createFromAscii(
+ "com.sun.star.comp.ucb.CachedDynamicResultSet" ),
+ OUString::createFromAscii(
+ CACHED_DRS_SERVICE_NAME ) );
//--------------------------------------------------------------------------
// own methds. ( inherited )
@@ -214,8 +216,10 @@ XTYPEPROVIDER_IMPL_3( CachedDynamicResultSetFactory,
//--------------------------------------------------------------------------
XSERVICEINFO_IMPL_1( CachedDynamicResultSetFactory,
- OUString::createFromAscii( "CachedDynamicResultSetFactory" ),
- OUString::createFromAscii( CACHED_DRS_FACTORY_NAME ) );
+ OUString::createFromAscii(
+ "com.sun.star.comp.ucb.CachedDynamicResultSetFactory" ),
+ OUString::createFromAscii(
+ CACHED_DRS_FACTORY_NAME ) );
//--------------------------------------------------------------------------
// Service factory implementation.
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
index bce17dadb9d7..f6f377849c3b 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: cacheddynamicresultsetstub.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: kso $ $Date: 2001-03-01 08:03:25 $
+ * last change: $Author: kso $ $Date: 2001-04-05 09:50:13 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -168,8 +168,10 @@ XTYPEPROVIDER_IMPL_5( CachedDynamicResultSetStub
//--------------------------------------------------------------------------
XSERVICEINFO_NOFACTORY_IMPL_1( CachedDynamicResultSetStub,
- OUString::createFromAscii( "CachedDynamicResultSetStub" ),
- OUString::createFromAscii( CACHED_DRS_STUB_SERVICE_NAME ) );
+ OUString::createFromAscii(
+ "com.sun.star.comp.ucb.CachedDynamicResultSetStub" ),
+ OUString::createFromAscii(
+ CACHED_DRS_STUB_SERVICE_NAME ) );
//--------------------------------------------------------------------------
//--------------------------------------------------------------------------
@@ -210,8 +212,10 @@ XTYPEPROVIDER_IMPL_3( CachedDynamicResultSetStubFactory,
//--------------------------------------------------------------------------
XSERVICEINFO_IMPL_1( CachedDynamicResultSetStubFactory,
- OUString::createFromAscii( "CachedDynamicResultSetStubFactory" ),
- OUString::createFromAscii( CACHED_DRS_STUB_FACTORY_NAME ) );
+ OUString::createFromAscii(
+ "com.sun.star.comp.ucb.CachedDynamicResultSetStubFactory" ),
+ OUString::createFromAscii(
+ CACHED_DRS_STUB_FACTORY_NAME ) );
//--------------------------------------------------------------------------
// Service factory implementation.
diff --git a/ucb/source/cacher/cacheserv.cxx b/ucb/source/cacher/cacheserv.cxx
index 0f0574b76937..27dfe0c8c480 100644
--- a/ucb/source/cacher/cacheserv.cxx
+++ b/ucb/source/cacher/cacheserv.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: cacheserv.cxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: kso $ $Date: 2000-10-16 14:52:35 $
+ * last change: $Author: kso $ $Date: 2001-04-05 09:50:13 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -191,6 +191,11 @@ 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.
@@ -201,6 +206,11 @@ 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.
@@ -211,6 +221,11 @@ 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.
@@ -221,6 +236,11 @@ 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/provprox.cxx b/ucb/source/core/provprox.cxx
index c5cc3c0612d7..6ccbe00dd473 100644
--- a/ucb/source/core/provprox.cxx
+++ b/ucb/source/core/provprox.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: provprox.cxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: kso $ $Date: 2000-10-16 14:52:48 $
+ * last change: $Author: kso $ $Date: 2001-04-05 09:49:55 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -121,9 +121,9 @@ XTYPEPROVIDER_IMPL_3( UcbContentProviderProxyFactory,
XSERVICEINFO_IMPL_1( UcbContentProviderProxyFactory,
OUString::createFromAscii(
- "UcbContentProviderProxyFactory" ),
+ "com.sun.star.comp.ucb.UcbContentProviderProxyFactory" ),
OUString::createFromAscii(
- PROVIDER_FACTORY_SERVICE_NAME ) );
+ PROVIDER_FACTORY_SERVICE_NAME ) );
//=========================================================================
//
@@ -229,10 +229,10 @@ XTYPEPROVIDER_IMPL_5( UcbContentProviderProxy,
//=========================================================================
XSERVICEINFO_NOFACTORY_IMPL_1( UcbContentProviderProxy,
- OUString::createFromAscii(
- "UcbContentProviderProxy" ),
- OUString::createFromAscii(
- PROVIDER_PROXY_SERVICE_NAME ) );
+ OUString::createFromAscii(
+ "com.sun.star.comp.ucb.UcbContentProviderProxy" ),
+ OUString::createFromAscii(
+ PROVIDER_PROXY_SERVICE_NAME ) );
//=========================================================================
//
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index bb0d7301aa83..99bdd6d4316d 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ucb.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: kso $ $Date: 2001-02-02 08:21:39 $
+ * last change: $Author: kso $ $Date: 2001-04-05 09:49:55 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -216,8 +216,10 @@ void SAL_CALL UniversalContentBroker::removeEventListener(
//=========================================================================
XSERVICEINFO_IMPL_1( UniversalContentBroker,
- OUString::createFromAscii( "UniversalContentBroker" ),
- OUString::createFromAscii( UCB_SERVICE_NAME ) );
+ OUString::createFromAscii(
+ "com.sun.star.comp.ucb.UniversalContentBroker" ),
+ OUString::createFromAscii(
+ UCB_SERVICE_NAME ) );
//=========================================================================
//
diff --git a/ucb/source/core/ucb.xml b/ucb/source/core/ucb.xml
index 31a4349770d6..47ed60b5eec9 100644
--- a/ucb/source/core/ucb.xml
+++ b/ucb/source/core/ucb.xml
@@ -11,7 +11,7 @@
Kai Sommerfeld
</author>
<name>
- UniversalContentBroker
+ com.sun.star.comp.ucb.UniversalContentBroker
</name>
<description>
This component provides access to a set of Contents via Content Providers.
@@ -36,7 +36,7 @@
Kai Sommerfeld
</author>
<name>
- UcbStore
+ com.sun.star.comp.ucb.UcbStore
</name>
<description>
This component is a factory for components managing persistent data.
@@ -67,7 +67,7 @@
Kai Sommerfeld
</author>
<name>
- UcbPropertiesManager
+ com.sun.star.comp.ucb.UcbPropertiesManager
</name>
<description>
This component provides access to the meta data of the properties
@@ -89,7 +89,7 @@
Kai Sommerfeld
</author>
<name>
- UcbContentProviderProxyFactory
+ com.sun.star.comp.ucb.UcbContentProviderProxyFactory
</name>
<description>
This component is a factory for proxy objects for Content Providers.
diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx
index 6e3da90a9ff9..465caa7afbc6 100644
--- a/ucb/source/core/ucbprops.cxx
+++ b/ucb/source/core/ucbprops.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ucbprops.cxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: kso $ $Date: 2000-10-16 14:52:48 $
+ * last change: $Author: kso $ $Date: 2001-04-05 09:49:55 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -420,9 +420,10 @@ XTYPEPROVIDER_IMPL_3( UcbPropertiesManager,
//=========================================================================
XSERVICEINFO_IMPL_1( UcbPropertiesManager,
- OUString::createFromAscii( "UcbPropertiesManager" ),
OUString::createFromAscii(
- PROPERTIES_MANAGER_SERVICE_NAME ) );
+ "com.sun.star.comp.ucb.UcbPropertiesManager" ),
+ OUString::createFromAscii(
+ PROPERTIES_MANAGER_SERVICE_NAME ) );
//=========================================================================
//
diff --git a/ucb/source/core/ucbserv.cxx b/ucb/source/core/ucbserv.cxx
index 10eab23d835a..0d6acf56b2f9 100644
--- a/ucb/source/core/ucbserv.cxx
+++ b/ucb/source/core/ucbserv.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ucbserv.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: sb $ $Date: 2001-02-06 11:07:19 $
+ * last change: $Author: kso $ $Date: 2001-04-05 09:49:55 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -204,6 +204,11 @@ 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.
@@ -214,6 +219,11 @@ 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.
@@ -224,6 +234,11 @@ 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.
@@ -235,6 +250,13 @@ 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.
@@ -246,6 +268,12 @@ 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/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index 646ce4fb3e05..f8d33c208496 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ucbstore.cxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: kso $ $Date: 2001-03-21 09:04:18 $
+ * last change: $Author: kso $ $Date: 2001-04-05 09:49:55 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -254,8 +254,10 @@ XTYPEPROVIDER_IMPL_4( UcbStore,
//=========================================================================
XSERVICEINFO_IMPL_1( UcbStore,
- OUString::createFromAscii( "UcbStore" ),
- OUString::createFromAscii( STORE_SERVICE_NAME ) );
+ OUString::createFromAscii(
+ "com.sun.star.comp.ucb.UcbStore" ),
+ OUString::createFromAscii(
+ STORE_SERVICE_NAME ) );
//=========================================================================
//
@@ -414,9 +416,9 @@ XTYPEPROVIDER_IMPL_4( PropertySetRegistry,
XSERVICEINFO_NOFACTORY_IMPL_1( PropertySetRegistry,
OUString::createFromAscii(
- "PropertySetRegistry" ),
+ "com.sun.star.comp.ucb.PropertySetRegistry" ),
OUString::createFromAscii(
- PROPSET_REG_SERVICE_NAME ) );
+ PROPSET_REG_SERVICE_NAME ) );
//=========================================================================
//
@@ -1578,9 +1580,9 @@ XTYPEPROVIDER_IMPL_8( PersistentPropertySet,
XSERVICEINFO_NOFACTORY_IMPL_1( PersistentPropertySet,
OUString::createFromAscii(
- "PersistentPropertySet" ),
+ "com.sun.star.comp.ucb.PersistentPropertySet" ),
OUString::createFromAscii(
- PERS_PROPSET_SERVICE_NAME ) );
+ PERS_PROPSET_SERVICE_NAME ) );
//=========================================================================
//
diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx
index 5657fcb92260..604c647c8434 100644
--- a/ucb/source/sorter/sortdynres.cxx
+++ b/ucb/source/sorter/sortdynres.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: sortdynres.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: kso $ $Date: 2001-03-01 08:03:26 $
+ * last change: $Author: kso $ $Date: 2001-04-05 09:49:31 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -179,9 +179,10 @@ XTYPEPROVIDER_IMPL_3( SortedDynamicResultSet,
//--------------------------------------------------------------------------
XSERVICEINFO_NOFACTORY_IMPL_1( SortedDynamicResultSet,
- OUString::createFromAscii( "SortedDynamicResultSet" ),
- OUString::createFromAscii( DYNAMIC_RESULTSET_SERVICE_NAME ) );
-
+ OUString::createFromAscii(
+ "com.sun.star.comp.ucb.SortedDynamicResultSet" ),
+ OUString::createFromAscii(
+ DYNAMIC_RESULTSET_SERVICE_NAME ) );
//--------------------------------------------------------------------------
// XComponent methods.
@@ -554,9 +555,10 @@ XTYPEPROVIDER_IMPL_3( SortedDynamicResultSetFactory,
//--------------------------------------------------------------------------
XSERVICEINFO_IMPL_1( SortedDynamicResultSetFactory,
- OUString::createFromAscii( "SortedDynamicResultSetFactory" ),
- OUString::createFromAscii( DYNAMIC_RESULTSET_FACTORY_NAME ) );
-
+ OUString::createFromAscii(
+ "com.sun.star.comp.ucb.SortedDynamicResultSetFactory" ),
+ OUString::createFromAscii(
+ DYNAMIC_RESULTSET_FACTORY_NAME ) );
//--------------------------------------------------------------------------
// Service factory implementation.
diff --git a/ucb/source/sorter/sortmain.cxx b/ucb/source/sorter/sortmain.cxx
index 1165ccbf8dc3..fa1090a10ea8 100644
--- a/ucb/source/sorter/sortmain.cxx
+++ b/ucb/source/sorter/sortmain.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: sortmain.cxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: kso $ $Date: 2000-10-16 14:53:23 $
+ * last change: $Author: kso $ $Date: 2001-04-05 09:49:31 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -158,6 +158,12 @@ 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/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index 4835f885b84e..25f0b8c71544 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: sortresult.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: jl $ $Date: 2001-03-22 13:56:08 $
+ * last change: $Author: kso $ $Date: 2001-04-05 09:49:31 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -295,8 +295,10 @@ XTYPEPROVIDER_IMPL_9( SortedResultSet,
//--------------------------------------------------------------------------
XSERVICEINFO_NOFACTORY_IMPL_1( SortedResultSet,
- OUString::createFromAscii( "SortedResultSet" ),
- OUString::createFromAscii( RESULTSET_SERVICE_NAME ) );
+ OUString::createFromAscii(
+ "com.sun.star.comp.ucb.SortedResultSet" ),
+ OUString::createFromAscii(
+ RESULTSET_SERVICE_NAME ) );
//--------------------------------------------------------------------------
// XComponent methods.
diff --git a/ucb/source/sorter/srtrs.xml b/ucb/source/sorter/srtrs.xml
index 7bbd6da89be8..225d8588157a 100644
--- a/ucb/source/sorter/srtrs.xml
+++ b/ucb/source/sorter/srtrs.xml
@@ -11,7 +11,7 @@
Dirk Voelzke
</author>
<name>
- SortedDynamicResultSetFactory
+ com.sun.star.comp.ucb.SortedDynamicResultSetFactory
</name>
<description>
This component implements a factory for sorted Content Resultsets.
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index 92eb12402043..104352b59c8e 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: bc.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: hro $ $Date: 2001-04-03 12:06:25 $
+ * last change: $Author: kso $ $Date: 2001-04-05 09:49:09 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -302,13 +302,15 @@ BaseContent::dispose()
-
+//////////////////////////////////////////////////////////////////////////////////////////
+// XServiceInfo
+//////////////////////////////////////////////////////////////////////////////////////////
rtl::OUString SAL_CALL
BaseContent::getImplementationName()
throw( uno::RuntimeException)
{
- return rtl::OUString::createFromAscii( "FileContent" );
+ return rtl::OUString::createFromAscii( "com.sun.star.comp.ucb.FileContent" );
}
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index 138ded9b5de2..f2feb6fa381a 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.14 $
+ * $Revision: 1.15 $
*
- * last change: $Author: hro $ $Date: 2001-03-15 12:54:03 $
+ * last change: $Author: kso $ $Date: 2001-04-05 09:49:09 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -185,6 +185,11 @@ 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 );
+ }
//////////////////////////////////////////////////////////////////////
@@ -498,11 +503,7 @@ FileProvider::createServiceFactory(
fileaccess::shell::getSupportedServiceNames_static() ) );
}
-#if SUPD > 583
uno::Reference< uno::XInterface > SAL_CALL
-#else
-uno::Reference< uno::XInterface >
-#endif
FileProvider::CreateInstance(
const uno::Reference< lang::XMultiServiceFactory >& xMultiServiceFactory )
{
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index 1c1db8e5f522..681b37a5a153 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: shell.cxx,v $
*
- * $Revision: 1.31 $
+ * $Revision: 1.32 $
*
- * last change: $Author: hro $ $Date: 2001-04-03 12:27:16 $
+ * last change: $Author: kso $ $Date: 2001-04-05 09:49:09 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -2890,7 +2890,7 @@ shell::getScheme( rtl::OUString& Scheme )
rtl::OUString SAL_CALL
shell::getImplementationName_static( void )
{
- return rtl::OUString::createFromAscii( "FileProvider" );
+ return rtl::OUString::createFromAscii( "com.sun.star.comp.ucb.FileProvider" );
}
diff --git a/ucb/source/ucp/file/ucpfile.xml b/ucb/source/ucp/file/ucpfile.xml
index c13fdd15084f..de28ddba9c05 100644
--- a/ucb/source/ucp/file/ucpfile.xml
+++ b/ucb/source/ucp/file/ucpfile.xml
@@ -11,7 +11,7 @@
Andreas Bille
</author>
<name>
- FileProvider
+ com.sun.star.comp.ucb.FileProvider
</name>
<description>
This component implements a Content Provider for the Universal
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
index 22ce9abb100f..0c9181ad7184 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: hierarchycontent.cxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: kso $ $Date: 2001-03-27 14:08:50 $
+ * last change: $Author: kso $ $Date: 2001-04-05 09:48:49 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -343,7 +343,8 @@ Sequence< Type > SAL_CALL HierarchyContent::getTypes()
OUString SAL_CALL HierarchyContent::getImplementationName()
throw( RuntimeException )
{
- return OUString::createFromAscii( "HierarchyContent" );
+ return
+ OUString::createFromAscii( "com.sun.star.comp.ucb.HierarchyContent" );
}
//=========================================================================
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
index fab14ee3d1bb..b852170fb6d9 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: hierarchyprovider.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: kso $ $Date: 2000-12-21 09:31:52 $
+ * last change: $Author: kso $ $Date: 2001-04-05 09:48:49 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -143,9 +143,9 @@ XTYPEPROVIDER_IMPL_4( HierarchyContentProvider,
XSERVICEINFO_IMPL_1( HierarchyContentProvider,
OUString::createFromAscii(
- "HierarchyContentProvider" ),
+ "com.sun.star.comp.ucb.HierarchyContentProvider" ),
OUString::createFromAscii(
- HIERARCHY_CONTENT_PROVIDER_SERVICE_NAME ) );
+ HIERARCHY_CONTENT_PROVIDER_SERVICE_NAME ) );
//=========================================================================
//
diff --git a/ucb/source/ucp/hierarchy/hierarchyservices.cxx b/ucb/source/ucp/hierarchy/hierarchyservices.cxx
index 7a5ada177810..1809c1fa7800 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.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: kso $ $Date: 2000-10-16 14:54:18 $
+ * last change: $Author: kso $ $Date: 2001-04-05 09:48:49 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -159,6 +159,11 @@ 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/hierarchy/ucphier.xml b/ucb/source/ucp/hierarchy/ucphier.xml
index c7ecff0d8fe6..adb4e62947a5 100644
--- a/ucb/source/ucp/hierarchy/ucphier.xml
+++ b/ucb/source/ucp/hierarchy/ucphier.xml
@@ -11,7 +11,7 @@
Kai Sommerfeld
</author>
<name>
- HierarchyContentProvider
+ com.sun.star.comp.ucb.HierarchyContentProvider
</name>
<description>
This component implements a Content Provider for the Universal
diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx
index faaab1f9cc69..83860bcdd0ba 100644
--- a/ucb/source/ucp/package/pkgcontent.cxx
+++ b/ucb/source/ucp/package/pkgcontent.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: pkgcontent.cxx,v $
*
- * $Revision: 1.20 $
+ * $Revision: 1.21 $
*
- * last change: $Author: kso $ $Date: 2001-03-27 14:08:51 $
+ * last change: $Author: kso $ $Date: 2001-04-05 09:48:30 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -422,7 +422,7 @@ Sequence< Type > SAL_CALL Content::getTypes()
OUString SAL_CALL Content::getImplementationName()
throw( RuntimeException )
{
- return OUString::createFromAscii( "PackageContent" );
+ return OUString::createFromAscii( "com.sun.star.comp.ucb.PackageContent" );
}
//=========================================================================
diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx
index fcd149bb6f89..afdf18b2dbd5 100644
--- a/ucb/source/ucp/package/pkgprovider.cxx
+++ b/ucb/source/ucp/package/pkgprovider.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: pkgprovider.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: kso $ $Date: 2001-03-19 08:37:07 $
+ * last change: $Author: kso $ $Date: 2001-04-05 09:48:30 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -235,9 +235,9 @@ XTYPEPROVIDER_IMPL_3( ContentProvider,
XSERVICEINFO_IMPL_1( ContentProvider,
OUString::createFromAscii(
- "PackageContentProvider" ),
+ "com.sun.star.comp.ucb.PackageContentProvider" ),
OUString::createFromAscii(
- PACKAGE_CONTENT_PROVIDER_SERVICE_NAME ) );
+ PACKAGE_CONTENT_PROVIDER_SERVICE_NAME ) );
//=========================================================================
//
diff --git a/ucb/source/ucp/package/pkgservices.cxx b/ucb/source/ucp/package/pkgservices.cxx
index 713dc1b4eec4..2566fae06d78 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.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: kso $ $Date: 2000-11-17 14:41:33 $
+ * last change: $Author: kso $ $Date: 2001-04-05 09:48:30 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -158,6 +158,11 @@ 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/package/ucppkg.xml b/ucb/source/ucp/package/ucppkg.xml
index 7827ed6069f1..3b6eb2926deb 100644
--- a/ucb/source/ucp/package/ucppkg.xml
+++ b/ucb/source/ucp/package/ucppkg.xml
@@ -11,7 +11,7 @@
Kai Sommerfeld
</author>
<name>
- PackageContentProvider
+ com.sun.star.comp.ucb.PackageContentProvider
</name>
<description>
This component implements a Content Provider for the Universal