8 files changed, 9 insertions, 9 deletions
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index d71377c8411c..0d66d463d60e 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -1204,7 +1204,7 @@ extern "C"
     { 0, 0, 0, 0, 0, 0 }
 };
 
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, XMultiServiceFactory* pServiceManager, XRegistryKey*  pRegistryKey )
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL scfilt_component_getFactory( const sal_Char* pImplName, XMultiServiceFactory* pServiceManager, XRegistryKey*  pRegistryKey )
 {
     return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, entries );
 
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index 66b3c7b26cfd..a37e02f0ec8e 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -186,7 +186,7 @@ SC_SIMPLE_SERVICE_INFO( ScSpreadsheetSettings, "ScSpreadsheetSettings", SCSPREAD
 
 extern "C" {
 
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL sc_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
 {
     if (!pServiceManager)
diff --git a/sc/source/ui/unoobj/detreg.cxx b/sc/source/ui/unoobj/detreg.cxx
index 02ae0f8d4294..c32fbb15e0bd 100644
--- a/sc/source/ui/unoobj/detreg.cxx
+++ b/sc/source/ui/unoobj/detreg.cxx
@@ -43,7 +43,7 @@ using namespace ::com::sun::star::lang;
 
 extern "C" {
 
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL scd_component_getFactory( const sal_Char* pImplementationName,
                                      void* pServiceManager,
                                      void* /* pRegistryKey */ )
 {
diff --git a/sc/source/ui/vba/service.cxx b/sc/source/ui/vba/service.cxx
index e086afa0cfe9..b31e3291fd4f 100644
--- a/sc/source/ui/vba/service.cxx
+++ b/sc/source/ui/vba/service.cxx
@@ -78,11 +78,11 @@ extern sdecl::ServiceDecl const serviceDecl;
 
 extern "C"
 {
-    SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+    SAL_DLLPUBLIC_EXPORT void * SAL_CALL vbaobj_component_getFactory(
         const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
         registry::XRegistryKey * pRegistryKey )
     {
-        OSL_TRACE("In component_getFactory for %s", pImplName );
+        OSL_TRACE("In vbaobj_component_getFactory for %s", pImplName );
     void* pRet =  component_getFactoryHelper(
             pImplName, pServiceManager, pRegistryKey, range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, window::serviceDecl, hyperlink::serviceDecl, application::serviceDecl );
     if( !pRet )
diff --git a/sc/util/sc.component b/sc/util/sc.component
index abd05aa579f2..85e37745b02e 100644
--- a/sc/util/sc.component
+++ b/sc/util/sc.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="sc"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.Calc.FilterOptionsDialog">
     <service name="com.sun.star.ui.dialogs.FilterOptionsDialog"/>
diff --git a/sc/util/scd.component b/sc/util/scd.component
index df2e2f77e25f..900d78d4d3c1 100644
--- a/sc/util/scd.component
+++ b/sc/util/scd.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="scd"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.calc.FormatDetector">
     <service name="com.sun.star.frame.ExtendedTypeDetection"/>
diff --git a/sc/util/scfilt.component b/sc/util/scfilt.component
index 7af70050d860..91ae96d910ce 100644
--- a/sc/util/scfilt.component
+++ b/sc/util/scfilt.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="scfilt"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.oox.ExcelFilterExport">
     <service name="com.sun.star.comp.oox.ExcelFilterExport"/>
diff --git a/sc/util/vbaobj.component b/sc/util/vbaobj.component
index 52ad691822d0..0faca1dd58c0 100644
--- a/sc/util/vbaobj.component
+++ b/sc/util/vbaobj.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="vbaobj"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="ScVbaApplication">
     <service name="ooo.vba.excel.Application"/>