12 files changed, 12 insertions, 12 deletions
diff --git a/desktop/source/deployment/deployment.component b/desktop/source/deployment/deployment.component
index 11385c7aa8d9..2a244677930d 100755
--- a/desktop/source/deployment/deployment.component
+++ b/desktop/source/deployment/deployment.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="deployment"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.deployment.ExtensionManager">
     <service name="com.sun.star.comp.deployment.ExtensionManager"/>
diff --git a/desktop/source/deployment/dp_services.cxx b/desktop/source/deployment/dp_services.cxx
index 7a93e5b42df3..1eae8edb9049 100644
--- a/desktop/source/deployment/dp_services.cxx
+++ b/desktop/source/deployment/dp_services.cxx
@@ -85,7 +85,7 @@ bool singleton_entries( uno::Reference<registry::XRegistryKey> const& );
 
 extern "C" {
 
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL deployment_component_getFactory(
     sal_Char const * pImplName,
     lang::XMultiServiceFactory * pServiceManager,
     registry::XRegistryKey * pRegistryKey )
diff --git a/desktop/source/deployment/gui/deploymentgui.component b/desktop/source/deployment/gui/deploymentgui.component
index d613f482e791..085100baf07f 100755
--- a/desktop/source/deployment/gui/deploymentgui.component
+++ b/desktop/source/deployment/gui/deploymentgui.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="deploymentgui"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.deployment.ui.LicenseDialog">
     <service name="com.sun.star.deployment.ui.LicenseDialog"/>
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index efd055dc4d87..38c081b1c3fc 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -351,7 +351,7 @@ sdecl::ServiceDecl const updateDecl(
 
 extern "C" {
 
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL deploymentgui_component_getFactory(
     sal_Char const * pImplName,
     lang::XMultiServiceFactory * pServiceManager,
     registry::XRegistryKey * pRegistryKey )
diff --git a/desktop/source/migration/services/cexports.cxx b/desktop/source/migration/services/cexports.cxx
index f527941376bd..ae46b18a2234 100644
--- a/desktop/source/migration/services/cexports.cxx
+++ b/desktop/source/migration/services/cexports.cxx
@@ -61,7 +61,7 @@ extern "C"
 };
 
 
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL migrationoo2_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return ::cppu::component_getFactoryHelper(
diff --git a/desktop/source/migration/services/cexportsoo3.cxx b/desktop/source/migration/services/cexportsoo3.cxx
index 5f715393cc1c..3535e9481cba 100644
--- a/desktop/source/migration/services/cexportsoo3.cxx
+++ b/desktop/source/migration/services/cexportsoo3.cxx
@@ -46,7 +46,7 @@ extern "C"
 };
 
 
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL migrationoo3_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return ::cppu::component_getFactoryHelper(
diff --git a/desktop/source/migration/services/migrationoo2.component b/desktop/source/migration/services/migrationoo2.component
index 2b21ab123b9e..f138a47c1792 100755
--- a/desktop/source/migration/services/migrationoo2.component
+++ b/desktop/source/migration/services/migrationoo2.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="migrationoo2"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.desktop.migration.Basic">
     <service name="com.sun.star.migration.Basic"/>
diff --git a/desktop/source/migration/services/migrationoo3.component b/desktop/source/migration/services/migrationoo3.component
index 380c389ab7b9..94ac9cb45565 100755
--- a/desktop/source/migration/services/migrationoo3.component
+++ b/desktop/source/migration/services/migrationoo3.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="migrationoo3"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.desktop.migration.OOo3Extensions">
     <service name="com.sun.star.migration.Extensions"/>
diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx
index 82139ff489bd..098dc5ce4547 100644
--- a/desktop/source/offacc/acceptor.cxx
+++ b/desktop/source/offacc/acceptor.cxx
@@ -298,7 +298,7 @@ extern "C"
 {
 using namespace desktop;
 
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_Char *pImplementationName, void *pServiceManager, void *)
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL offacc_component_getFactory(const sal_Char *pImplementationName, void *pServiceManager, void *)
 {
     void* pReturn = NULL ;
     if  ( pImplementationName && pServiceManager )
diff --git a/desktop/source/offacc/offacc.component b/desktop/source/offacc/offacc.component
index 6f0d4a97a2d2..4004a457160d 100755
--- a/desktop/source/offacc/offacc.component
+++ b/desktop/source/offacc/offacc.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="offacc"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.office.comp.Acceptor">
     <service name="com.sun.star.office.Acceptor"/>
diff --git a/desktop/source/splash/services_spl.cxx b/desktop/source/splash/services_spl.cxx
index a2f9bd232123..6a621c3f3277 100644
--- a/desktop/source/splash/services_spl.cxx
+++ b/desktop/source/splash/services_spl.cxx
@@ -84,7 +84,7 @@ getSupportedServiceNames(int p) {
 
 extern "C"
 {
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL spl_component_getFactory(
     const sal_Char* pImplementationName,
     void* pServiceManager,
     void*)
diff --git a/desktop/source/splash/spl.component b/desktop/source/splash/spl.component
index 2caecf5c0e4b..5d7a6e6a7e92 100755
--- a/desktop/source/splash/spl.component
+++ b/desktop/source/splash/spl.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="spl"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.desktop.FirstStart">
     <service name="com.sun.star.task.Job"/>