diff options
author | Kai Sommerfeld <kso@openoffice.org> | 2001-04-05 08:52:01 +0000 |
---|---|---|
committer | Kai Sommerfeld <kso@openoffice.org> | 2001-04-05 08:52:01 +0000 |
commit | eb72cd638395a2d09ff134d040ac85a5c0f14a7a (patch) | |
tree | dad438a7df1fe059e40b4e02b0f39f78fa20485a /ucb | |
parent | 5b114841094f95d78f286b61fe0de1a7d47115a0 (diff) |
#85714# - Prefixed all component implementation names with "com.sun.star.comp"
(UDK naming recommandation - required for automatic testing).
Diffstat (limited to 'ucb')
28 files changed, 289 insertions, 196 deletions
diff --git a/ucb/source/cacher/cached.xml b/ucb/source/cacher/cached.xml index b38f5ea367..6b4f97cabf 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 4350476635..e059a41de2 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 bc063e2af4..1a3a5a3911 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 b25da54bc4..d42b2c4b8c 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 220d4593d1..d54188fd48 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 0f0574b769..27dfe0c8c4 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 60b68c6a61..344c17050c 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 861adcad93..a02a6148c2 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 241d93eaea..442fb00e37 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 4f25138f13..e090d9af52 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 10eab23d83..0dc1738a9e 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 ade365223e..0da7e2ceda 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 8759557799..c1fb82dee8 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. @@ -592,7 +594,7 @@ void EventList::Clear() { delete maData[i]; } - + maData.clear(); } diff --git a/ucb/source/sorter/sortmain.cxx b/ucb/source/sorter/sortmain.cxx index 1165ccbf8d..fa1090a10e 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 c815df2dac..0bdc78d315 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. @@ -1490,7 +1492,7 @@ void SortedResultSet::Initialize( // now fetch all the elements from the original result set, // get there new position in the sorted result set and insert // an entry in the sorted to original mapping list - try { + try { while ( mxOriginal->absolute( nIndex ) ) { pData = new SortListData( nIndex ); @@ -1913,7 +1915,7 @@ void SortedEntryList::Clear() { delete maData[i]; } - + maData.clear(); } @@ -1930,7 +1932,7 @@ void SortedEntryList::Insert( SortListData *pEntry, long nPos ) SortListData* SortedEntryList::Remove( long nPos ) { SortListData *pData; - + if ( nPos < (long) maData.size() ) { pData = maData[ nPos ]; @@ -1946,7 +1948,7 @@ SortListData* SortedEntryList::Remove( long nPos ) SortListData* SortedEntryList::GetData( long nPos ) { SortListData *pData; - + if ( nPos < (long) maData.size() ) pData = maData[ nPos ]; else @@ -1959,7 +1961,7 @@ SortListData* SortedEntryList::GetData( long nPos ) long SortedEntryList::operator [] ( long nPos ) const { SortListData *pData; - + if ( nPos < (long) maData.size() ) pData = maData[ nPos ]; else diff --git a/ucb/source/sorter/srtrs.xml b/ucb/source/sorter/srtrs.xml index 6331ee4aa8..17868765d6 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 0d5d7937ac..7c5318629e 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,19 +302,21 @@ BaseContent::dispose() - +////////////////////////////////////////////////////////////////////////////////////////// +// XServiceInfo +////////////////////////////////////////////////////////////////////////////////////////// rtl::OUString SAL_CALL -BaseContent::getImplementationName() +BaseContent::getImplementationName() throw( uno::RuntimeException) { - return rtl::OUString::createFromAscii( "FileContent" ); + return rtl::OUString::createFromAscii( "com.sun.star.comp.ucb.FileContent" ); } sal_Bool SAL_CALL -BaseContent::supportsService( const rtl::OUString& ServiceName ) +BaseContent::supportsService( const rtl::OUString& ServiceName ) throw( uno::RuntimeException) { if( ServiceName.compareToAscii( "com.sun.star.ucb.FileContent" ) == 0 ) @@ -326,7 +328,7 @@ BaseContent::supportsService( const rtl::OUString& ServiceName ) uno::Sequence< rtl::OUString > SAL_CALL -BaseContent::getSupportedServiceNames() +BaseContent::getSupportedServiceNames() throw( uno::RuntimeException ) { uno::Sequence< rtl::OUString > ret( 1 ); @@ -1078,11 +1080,11 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier, if( m_pMyShell->m_bFaked && m_aUncPath.compareToAscii( "//./" ) == 0 ) throw CommandAbortedException(); - + rtl::OUString scheme = aTransferInfo.SourceURL.copy( 0,5 ); if( scheme.compareToAscii( "file:" ) != 0 ) throw InteractiveBadTransferURLException(); - + sal_Unicode slash = '/'; rtl::OUString srcUnc; diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index 95cd573684..c59e246134 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 ) { @@ -610,40 +611,40 @@ class XPropertySetInfoImpl2 public: XPropertySetInfoImpl2(); ~XPropertySetInfoImpl2(); - + // XInterface virtual uno::Any SAL_CALL - queryInterface( - const uno::Type& aType ) + queryInterface( + const uno::Type& aType ) throw( uno::RuntimeException); - + virtual void SAL_CALL - acquire( - void ) + acquire( + void ) throw( uno::RuntimeException); - + virtual void SAL_CALL release( - void ) + void ) throw( uno::RuntimeException ); - - + + virtual uno::Sequence< beans::Property > SAL_CALL - getProperties( - void ) + getProperties( + void ) throw( uno::RuntimeException ); - + virtual beans::Property SAL_CALL - getPropertyByName( - const rtl::OUString& aName ) - throw( beans::UnknownPropertyException, + getPropertyByName( + const rtl::OUString& aName ) + throw( beans::UnknownPropertyException, uno::RuntimeException); - + virtual sal_Bool SAL_CALL - hasPropertyByName( const rtl::OUString& Name ) + hasPropertyByName( const rtl::OUString& Name ) throw( uno::RuntimeException ); - + private: uno::Sequence< beans::Property > m_seq; }; @@ -656,7 +657,7 @@ XPropertySetInfoImpl2::XPropertySetInfoImpl2() -1, getCppuType( static_cast< rtl::OUString* >( 0 ) ), beans::PropertyAttribute::READONLY ); - + m_seq[1] = beans::Property( rtl::OUString::createFromAscii( "FileSystemNotation" ), -1, getCppuType( static_cast< sal_Int32* >( 0 ) ), @@ -704,11 +705,11 @@ XPropertySetInfoImpl2::getPropertyByName( const rtl::OUString& aName ) throw( beans::UnknownPropertyException, uno::RuntimeException) -{ +{ for( sal_Int32 i = 0; i < m_seq.getLength(); ++i ) - if( m_seq[i].Name == aName ) + if( m_seq[i].Name == aName ) return m_seq[i]; - + throw beans::UnknownPropertyException(); } @@ -729,7 +730,7 @@ XPropertySetInfoImpl2::hasPropertyByName( throw( uno::RuntimeException ) { for( sal_Int32 i = 0; i < m_seq.getLength(); ++i ) - if( m_seq[i].Name == aName ) + if( m_seq[i].Name == aName ) return true; return false; } @@ -749,14 +750,14 @@ void SAL_CALL FileProvider::initProperties( void ) #elif defined( WNT ) m_FileSystemNotation = FileSystemNotation::DOS_NOTATION; #else - m_FileSystemNotation = FileSystemNotation::UNKNOWN_NOTATION; + m_FileSystemNotation = FileSystemNotation::UNKNOWN_NOTATION; #endif - + // static const sal_Int32 UNKNOWN_NOTATION = (sal_Int32)0; // static const sal_Int32 UNIX_NOTATION = (sal_Int32)1; // static const sal_Int32 DOS_NOTATION = (sal_Int32)2; // static const sal_Int32 MAC_NOTATION = (sal_Int32)3; - + XPropertySetInfoImpl2* p = new XPropertySetInfoImpl2(); m_xPropertySetInfo = uno::Reference< beans::XPropertySetInfo >( p ); } @@ -765,8 +766,8 @@ void SAL_CALL FileProvider::initProperties( void ) // XPropertySet -uno::Reference< beans::XPropertySetInfo > SAL_CALL -FileProvider::getPropertySetInfo( ) +uno::Reference< beans::XPropertySetInfo > SAL_CALL +FileProvider::getPropertySetInfo( ) throw( uno::RuntimeException ) { initProperties(); @@ -774,13 +775,13 @@ FileProvider::getPropertySetInfo( ) } -void SAL_CALL -FileProvider::setPropertyValue( const rtl::OUString& aPropertyName, - const uno::Any& aValue ) - throw( beans::UnknownPropertyException, - beans::PropertyVetoException, - lang::IllegalArgumentException, - lang::WrappedTargetException, +void SAL_CALL +FileProvider::setPropertyValue( const rtl::OUString& aPropertyName, + const uno::Any& aValue ) + throw( beans::UnknownPropertyException, + beans::PropertyVetoException, + lang::IllegalArgumentException, + lang::WrappedTargetException, uno::RuntimeException ) { if( aPropertyName.compareToAscii( "FileSystemNotation" ) == 0 || @@ -792,11 +793,11 @@ FileProvider::setPropertyValue( const rtl::OUString& aPropertyName, -uno::Any SAL_CALL -FileProvider::getPropertyValue( - const rtl::OUString& aPropertyName ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, +uno::Any SAL_CALL +FileProvider::getPropertyValue( + const rtl::OUString& aPropertyName ) + throw( beans::UnknownPropertyException, + lang::WrappedTargetException, uno::RuntimeException ) { initProperties(); @@ -815,14 +816,14 @@ FileProvider::getPropertyValue( else throw beans::UnknownPropertyException(); } - + void SAL_CALL -FileProvider::addPropertyChangeListener( - const rtl::OUString& aPropertyName, - const uno::Reference< beans::XPropertyChangeListener >& xListener ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, +FileProvider::addPropertyChangeListener( + const rtl::OUString& aPropertyName, + const uno::Reference< beans::XPropertyChangeListener >& xListener ) + throw( beans::UnknownPropertyException, + lang::WrappedTargetException, uno::RuntimeException) { return; @@ -830,10 +831,10 @@ FileProvider::addPropertyChangeListener( void SAL_CALL -FileProvider::removePropertyChangeListener( - const rtl::OUString& aPropertyName, +FileProvider::removePropertyChangeListener( + const rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) - throw( beans::UnknownPropertyException, + throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { @@ -841,11 +842,11 @@ FileProvider::removePropertyChangeListener( } void SAL_CALL -FileProvider::addVetoableChangeListener( +FileProvider::addVetoableChangeListener( const rtl::OUString& PropertyName, - const uno::Reference< beans::XVetoableChangeListener >& aListener ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, + const uno::Reference< beans::XVetoableChangeListener >& aListener ) + throw( beans::UnknownPropertyException, + lang::WrappedTargetException, uno::RuntimeException ) { return; @@ -853,11 +854,11 @@ FileProvider::addVetoableChangeListener( void SAL_CALL -FileProvider::removeVetoableChangeListener( - const rtl::OUString& PropertyName, - const uno::Reference< beans::XVetoableChangeListener >& aListener ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, +FileProvider::removeVetoableChangeListener( + const rtl::OUString& PropertyName, + const uno::Reference< beans::XVetoableChangeListener >& aListener ) + throw( beans::UnknownPropertyException, + lang::WrappedTargetException, uno::RuntimeException) { return; @@ -895,12 +896,12 @@ rtl::OUString SAL_CALL FileProvider::getFileURLFromSystemPath( const rtl::OUStri sal_Bool success = m_pMyShell->uncheckMountPoint( aNormalizedPath,aRed ); if( ! success ) return rtl::OUString(); - + rtl::OUString aUrl; sal_Bool err = m_pMyShell->getUrlFromUnq( aRed,aUrl ); if( err ) return rtl::OUString(); - + return aUrl; } @@ -911,12 +912,12 @@ rtl::OUString SAL_CALL FileProvider::getSystemPathFromFileURL( const rtl::OUStri sal_Bool err = m_pMyShell->getUnqFromUrl( URL,aUnq ); if( err ) return rtl::OUString(); - + rtl::OUString aRed; sal_Bool success = m_pMyShell->checkMountPoint( aUnq,aRed ); - if( ! success ) + if( ! success ) return rtl::OUString(); - + rtl::OUString aSystemPath; if (osl::FileBase::getSystemPathFromNormalizedPath( aRed,aSystemPath ) != osl::FileBase::E_None ) return rtl::OUString(); diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx index c6d25d9aee..b6d6e154e0 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 @@ -1195,8 +1195,8 @@ public: { uno::Any aRet = cppu::queryInterface( rType, SAL_STATIC_CAST( io::XOutputStream*,this ), - SAL_STATIC_CAST( io::XSeekable*,this ), - SAL_STATIC_CAST( io::XTruncate*,this ) + SAL_STATIC_CAST( io::XSeekable*,this ), + SAL_STATIC_CAST( io::XTruncate*,this ) ); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } @@ -2242,7 +2242,7 @@ osl::FileBase::RC osl_File_copy( const rtl::OUString& strPath, if( osl::DirectoryItem::get( strDestPath,aItem ) != osl::FileBase:: E_NOENT ) return osl::FileBase::E_EXIST; } - + return osl::File::copy( strPath,strDestPath ); } @@ -2258,7 +2258,7 @@ osl::FileBase::RC osl_File_move( const rtl::OUString& strPath, if( osl::DirectoryItem::get( strDestPath,aItem ) != osl::FileBase:: E_NOENT ) return osl::FileBase::E_EXIST; } - + return osl::File::move( strPath,strDestPath ); } @@ -2276,7 +2276,7 @@ shell::move( sal_Int32 CommandId, if( dstUnqPath == srcUnqPath ) // Nothing left to be done return; - + // Moving file or folder ? osl::DirectoryItem aItem; osl::FileBase::RC err = osl::DirectoryItem::get( srcUnqPath,aItem ); @@ -2288,7 +2288,7 @@ shell::move( sal_Int32 CommandId, sal_Bool isDocument; if( aStatus.isValid( FileStatusMask_Type ) ) isDocument = aStatus.getFileType() == osl::FileStatus::Regular; - + err = osl_File_move( srcUnqPath,dstUnqPath,true ); // Why, the hell, is this not all what has to be done? if( err == osl::FileBase::E_EXIST ) @@ -2461,7 +2461,7 @@ shell::copy( throw( CommandAbortedException ) { rtl::OUString dstUnqPath( dstUnqPathIn ); - + if( dstUnqPath == srcUnqPath ) // Nothing left to be done return; @@ -2680,7 +2680,7 @@ sal_Bool SAL_CALL shell::ensuredir( const rtl::OUString& rUnqPath ) else aPath = rUnqPath; - + osl::FileBase::RC nError = osl::Directory::create( aPath ); sal_Bool bSuccess = (nError == osl::File::E_None || nError == osl::FileBase::E_EXIST); @@ -2805,7 +2805,7 @@ shell::write( sal_Int32 CommandId, nRequestedBytes ); } catch( const io::NotConnectedException& ) - { + { bSuccess = false; } catch( const io::BufferSizeExceededException& ) @@ -2816,8 +2816,8 @@ shell::write( sal_Int32 CommandId, { bSuccess = false; } - - + + if( bSuccess && nReadBytes ) { const sal_Int8* p = seq.getConstArray(); @@ -2831,7 +2831,7 @@ shell::write( sal_Int32 CommandId, } } } while( bSuccess && sal_uInt64( nReadBytes ) == nRequestedBytes ); - + aFile.setSize( nTotalNumberOfBytes ); } @@ -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 a91f66a3db..ae943ad147 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 b49ec14fd2..d51f998b90 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 b30409893a..9fd33ee956 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 7a5ada1778..44050cee7e 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 0be256ba7f..42eee95097 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 98e86cc19d..c07ebab301 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 60c35ba0dc..93103953eb 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 713dc1b4ee..2566fae06d 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 4a184bc922..c578ce8428 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 |