summaryrefslogtreecommitdiff
path: root/ucb/source/ucp
diff options
context:
space:
mode:
Diffstat (limited to 'ucb/source/ucp')
-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
12 files changed, 48 insertions, 34 deletions
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