summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2012-08-31 21:45:56 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2012-09-01 21:06:10 +0200
commitf1493c583fa02abcde685980b6f0d60b0338d772 (patch)
tree9d1ce3f5d8e03cc01073c4069adc95f31983854c /ucb
parentb08f8494e67bb433686853328df68f377c45e019 (diff)
ucb: add component prefixes
Change-Id: I77bb24d90d310452530abe57ebc183cce98043de
Diffstat (limited to 'ucb')
-rw-r--r--ucb/source/cacher/cached1.component2
-rw-r--r--ucb/source/cacher/cacheserv.cxx2
-rw-r--r--ucb/source/sorter/sortmain.cxx2
-rw-r--r--ucb/source/sorter/srtrs1.component2
-rw-r--r--ucb/source/ucp/cmis/cmis_provider.cxx2
-rw-r--r--ucb/source/ucp/cmis/ucpcmis1.component2
-rw-r--r--ucb/source/ucp/expand/ucpexpand.cxx2
-rw-r--r--ucb/source/ucp/expand/ucpexpand1.component2
-rw-r--r--ucb/source/ucp/ext/ucpext.component2
-rw-r--r--ucb/source/ucp/ext/ucpext_services.cxx2
-rw-r--r--ucb/source/ucp/ftp/ftpservices.cxx2
-rw-r--r--ucb/source/ucp/ftp/ucpftp1.component2
-rw-r--r--ucb/source/ucp/gio/gio_provider.cxx2
-rw-r--r--ucb/source/ucp/gio/ucpgio.component2
-rw-r--r--ucb/source/ucp/gvfs/gvfs_provider.cxx2
-rw-r--r--ucb/source/ucp/gvfs/ucpgvfs.component2
-rw-r--r--ucb/source/ucp/hierarchy/hierarchyservices.cxx2
-rw-r--r--ucb/source/ucp/hierarchy/ucphier1.component2
-rw-r--r--ucb/source/ucp/odma/odma_services.cxx2
-rw-r--r--ucb/source/ucp/odma/ucpodma1.component2
-rw-r--r--ucb/source/ucp/package/pkgservices.cxx2
-rw-r--r--ucb/source/ucp/package/ucppkg1.component2
-rw-r--r--ucb/source/ucp/tdoc/tdoc_services.cxx2
-rw-r--r--ucb/source/ucp/tdoc/ucptdoc1.component2
-rw-r--r--ucb/source/ucp/webdav/ucpdav1.component2
-rw-r--r--ucb/source/ucp/webdav/webdavservices.cxx2
26 files changed, 26 insertions, 26 deletions
diff --git a/ucb/source/cacher/cached1.component b/ucb/source/cacher/cached1.component
index aa19e54b5da3..13cc57684444 100644
--- a/ucb/source/cacher/cached1.component
+++ b/ucb/source/cacher/cached1.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="cached1"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.ucb.CachedContentResultSetFactory">
<service name="com.sun.star.ucb.CachedContentResultSetFactory"/>
diff --git a/ucb/source/cacher/cacheserv.cxx b/ucb/source/cacher/cacheserv.cxx
index 32d96155f5d7..dcd0c185819a 100644
--- a/ucb/source/cacher/cacheserv.cxx
+++ b/ucb/source/cacher/cacheserv.cxx
@@ -41,7 +41,7 @@ using namespace com::sun::star::registry;
using ::rtl::OUString;
//=========================================================================
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL cached1_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * )
{
void * pRet = 0;
diff --git a/ucb/source/sorter/sortmain.cxx b/ucb/source/sorter/sortmain.cxx
index 1a5957b738d0..ed2d70798eef 100644
--- a/ucb/source/sorter/sortmain.cxx
+++ b/ucb/source/sorter/sortmain.cxx
@@ -36,7 +36,7 @@ using ::rtl::OUString;
//=========================================================================
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL srtrs1_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * )
{
void * pRet = 0;
diff --git a/ucb/source/sorter/srtrs1.component b/ucb/source/sorter/srtrs1.component
index c32705160c0f..4f59e54d7f10 100644
--- a/ucb/source/sorter/srtrs1.component
+++ b/ucb/source/sorter/srtrs1.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="srtrs1"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.ucb.SortedDynamicResultSetFactory">
<service name="com.sun.star.ucb.SortedDynamicResultSetFactory"/>
diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx
index 14a3b81c4cc8..271cd5bb50a7 100644
--- a/ucb/source/ucp/cmis/cmis_provider.cxx
+++ b/ucb/source/ucp/cmis/cmis_provider.cxx
@@ -125,7 +125,7 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider );
}
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char *pImplName,
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpcmis1_component_getFactory( const sal_Char *pImplName,
void *pServiceManager, void * )
{
void * pRet = 0;
diff --git a/ucb/source/ucp/cmis/ucpcmis1.component b/ucb/source/ucp/cmis/ucpcmis1.component
index 0d617800e76c..96ce7c39e226 100644
--- a/ucb/source/ucp/cmis/ucpcmis1.component
+++ b/ucb/source/ucp/cmis/ucpcmis1.component
@@ -26,7 +26,7 @@
* instead of those above.
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpcmis1"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.CmisContentProvider">
<service name="com.sun.star.ucb.CmisContentProvider"/>
diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx
index 0c74ba4f27b1..3f75376e1249 100644
--- a/ucb/source/ucp/expand/ucpexpand.cxx
+++ b/ucb/source/ucp/expand/ucpexpand.cxx
@@ -266,7 +266,7 @@ static const ::cppu::ImplementationEntry s_entries [] =
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpexpand1_component_getFactory(
const sal_Char * pImplName,
lang::XMultiServiceFactory * pServiceManager,
registry::XRegistryKey * pRegistryKey )
diff --git a/ucb/source/ucp/expand/ucpexpand1.component b/ucb/source/ucp/expand/ucpexpand1.component
index c8a7e8e18c68..307522ce1372 100644
--- a/ucb/source/ucp/expand/ucpexpand1.component
+++ b/ucb/source/ucp/expand/ucpexpand1.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpexpand1"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.ucb.ExpandContentProvider">
<service name="com.sun.star.ucb.ExpandContentProvider"/>
diff --git a/ucb/source/ucp/ext/ucpext.component b/ucb/source/ucp/ext/ucpext.component
index 2982529e539c..29266f473203 100644
--- a/ucb/source/ucp/ext/ucpext.component
+++ b/ucb/source/ucp/ext/ucpext.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpext"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="org.openoffice.comp.ucp.ext.ContentProvider">
<service name="com.sun.star.ucb.ExtensionContentProvider"/>
diff --git a/ucb/source/ucp/ext/ucpext_services.cxx b/ucb/source/ucp/ext/ucpext_services.cxx
index b6e10684cf44..41fef9f52117 100644
--- a/ucb/source/ucp/ext/ucpext_services.cxx
+++ b/ucb/source/ucp/ext/ucpext_services.cxx
@@ -70,7 +70,7 @@ namespace ucb { namespace ucp { namespace ext
extern "C"
{
//------------------------------------------------------------------------------------------------------------------
- SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
+ SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpext_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , ::ucb::ucp::ext::s_aServiceEntries );
}
diff --git a/ucb/source/ucp/ftp/ftpservices.cxx b/ucb/source/ucp/ftp/ftpservices.cxx
index afa27b72e35c..059755140d7e 100644
--- a/ucb/source/ucp/ftp/ftpservices.cxx
+++ b/ucb/source/ucp/ftp/ftpservices.cxx
@@ -35,7 +35,7 @@ using namespace com::sun::star;
using namespace ftp;
//=========================================================================
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpftp1_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = 0;
diff --git a/ucb/source/ucp/ftp/ucpftp1.component b/ucb/source/ucp/ftp/ucpftp1.component
index fa4cfe6e7557..c0137e9510ec 100644
--- a/ucb/source/ucp/ftp/ucpftp1.component
+++ b/ucb/source/ucp/ftp/ucpftp1.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpftp1"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.FTPContentProvider">
<service name="com.sun.star.ucb.FTPContentProvider"/>
diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx
index e1c25cd1b11e..b645aa10f1bf 100644
--- a/ucb/source/ucp/gio/gio_provider.cxx
+++ b/ucb/source/ucp/gio/gio_provider.cxx
@@ -101,7 +101,7 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider );
}
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char *pImplName,
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpgio1_component_getFactory( const sal_Char *pImplName,
void *pServiceManager, void * )
{
void * pRet = 0;
diff --git a/ucb/source/ucp/gio/ucpgio.component b/ucb/source/ucp/gio/ucpgio.component
index caa8fc361f7f..5993e7088445 100644
--- a/ucb/source/ucp/gio/ucpgio.component
+++ b/ucb/source/ucp/gio/ucpgio.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpgio1"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.GIOContentProvider">
<service name="com.sun.star.ucb.GIOContentProvider"/>
diff --git a/ucb/source/ucp/gvfs/gvfs_provider.cxx b/ucb/source/ucp/gvfs/gvfs_provider.cxx
index cb4f3ae6e248..6b7ae7c17165 100644
--- a/ucb/source/ucp/gvfs/gvfs_provider.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_provider.cxx
@@ -140,7 +140,7 @@ ContentProvider::queryContent(
//============================ shlib entry points =============================================
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char *pImplName,
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpgvfs1_component_getFactory( const sal_Char *pImplName,
void *pServiceManager,
void */*pRegistryKey*/ )
{
diff --git a/ucb/source/ucp/gvfs/ucpgvfs.component b/ucb/source/ucp/gvfs/ucpgvfs.component
index cec3e4d1e2b1..abb2901d46c2 100644
--- a/ucb/source/ucp/gvfs/ucpgvfs.component
+++ b/ucb/source/ucp/gvfs/ucpgvfs.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpgvfs1"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.GnomeVFSContentProvider">
<service name="com.sun.star.ucb.GnomeVFSContentProvider"/>
diff --git a/ucb/source/ucp/hierarchy/hierarchyservices.cxx b/ucb/source/ucp/hierarchy/hierarchyservices.cxx
index fb673891032b..d020c22e0dc9 100644
--- a/ucb/source/ucp/hierarchy/hierarchyservices.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyservices.cxx
@@ -35,7 +35,7 @@ using namespace com::sun::star;
using namespace hierarchy_ucp;
//=========================================================================
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucphier1_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = 0;
diff --git a/ucb/source/ucp/hierarchy/ucphier1.component b/ucb/source/ucp/hierarchy/ucphier1.component
index 5483187d8674..4c93da0e6d8e 100644
--- a/ucb/source/ucp/hierarchy/ucphier1.component
+++ b/ucb/source/ucp/hierarchy/ucphier1.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="ucphier1"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.ucb.HierarchyContentProvider">
<service name="com.sun.star.ucb.HierarchyContentProvider"/>
diff --git a/ucb/source/ucp/odma/odma_services.cxx b/ucb/source/ucp/odma/odma_services.cxx
index ff9f13647b41..93d7d1f41246 100644
--- a/ucb/source/ucp/odma/odma_services.cxx
+++ b/ucb/source/ucp/odma/odma_services.cxx
@@ -40,7 +40,7 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::registry;
//=========================================================================
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpodma1_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = 0;
diff --git a/ucb/source/ucp/odma/ucpodma1.component b/ucb/source/ucp/odma/ucpodma1.component
index fa1abaee8517..709ebea17d11 100644
--- a/ucb/source/ucp/odma/ucpodma1.component
+++ b/ucb/source/ucp/odma/ucpodma1.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpodma1"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.ucb.FileProvider">
<service name="com.sun.star.ucb.ODMAContentProvider"/>
diff --git a/ucb/source/ucp/package/pkgservices.cxx b/ucb/source/ucp/package/pkgservices.cxx
index 8bc6f454400f..b1a2841ffad7 100644
--- a/ucb/source/ucp/package/pkgservices.cxx
+++ b/ucb/source/ucp/package/pkgservices.cxx
@@ -34,7 +34,7 @@
using namespace com::sun::star;
//=========================================================================
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucppkg1_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = 0;
diff --git a/ucb/source/ucp/package/ucppkg1.component b/ucb/source/ucp/package/ucppkg1.component
index a2e2418b5602..c842595ade16 100644
--- a/ucb/source/ucp/package/ucppkg1.component
+++ b/ucb/source/ucp/package/ucppkg1.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="ucppkg1"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.ucb.PackageContentProvider">
<service name="com.sun.star.ucb.PackageContentProvider"/>
diff --git a/ucb/source/ucp/tdoc/tdoc_services.cxx b/ucb/source/ucp/tdoc/tdoc_services.cxx
index 78a790db7b2a..77f2c04bfdc0 100644
--- a/ucb/source/ucp/tdoc/tdoc_services.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_services.cxx
@@ -38,7 +38,7 @@ using namespace com::sun::star;
using namespace tdoc_ucp;
//=========================================================================
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucptdoc1_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = 0;
diff --git a/ucb/source/ucp/tdoc/ucptdoc1.component b/ucb/source/ucp/tdoc/ucptdoc1.component
index 8ba1471bd933..bc67905480f9 100644
--- a/ucb/source/ucp/tdoc/ucptdoc1.component
+++ b/ucb/source/ucp/tdoc/ucptdoc1.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="ucptdoc1"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.ucb.TransientDocumentsContentProvider">
<service name="com.sun.star.ucb.TransientDocumentsContentProvider"/>
diff --git a/ucb/source/ucp/webdav/ucpdav1.component b/ucb/source/ucp/webdav/ucpdav1.component
index 4e18b566e1a4..5abdc1b27b92 100644
--- a/ucb/source/ucp/webdav/ucpdav1.component
+++ b/ucb/source/ucp/webdav/ucpdav1.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpdav1"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.WebDAVContentProvider">
<service name="com.sun.star.ucb.WebDAVContentProvider"/>
diff --git a/ucb/source/ucp/webdav/webdavservices.cxx b/ucb/source/ucp/webdav/webdavservices.cxx
index 26f8692a416b..c88eb6f241cd 100644
--- a/ucb/source/ucp/webdav/webdavservices.cxx
+++ b/ucb/source/ucp/webdav/webdavservices.cxx
@@ -34,7 +34,7 @@
using namespace com::sun::star;
//=========================================================================
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpdav1_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = 0;