add prefixes for component_getFactory

4 files changed, 6 insertions, 17 deletions

diff --git a/scaddins/source/analysis/analysis.component b/scaddins/source/analysis/analysis.component
index af4d13fa43b9..8fe009ea421f 100644
--- a/scaddins/source/analysis/analysis.component
+++ b/scaddins/source/analysis/analysis.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="analysis"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.sheet.addin.AnalysisImpl">
     <service name="com.sun.star.sheet.AddIn"/>
diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx
index ee73f616c1a8..4994c3692f91 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -47,17 +47,11 @@
 using namespace                 ::rtl;
 using namespace                 ::com::sun::star;
 
-//------------------------------------------------------------------
-//
-//  entry points for service registration / instantiation
-//
-//------------------------------------------------------------------
 
-extern "C" {
-
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL analysis_component_getFactory(
+    const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
 {
-    void*                                   pRet = 0;
+    void* pRet = 0;
 
     if( pServiceManager && STRING::createFromAscii( pImplName ) == AnalysisAddIn::getImplementationName_Static() )
     {
@@ -78,11 +72,6 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplN
 }
 
 
-}   // extern C
-
-
-
-
 //------------------------------------------------------------------------
 //
 //  "normal" service implementation
diff --git a/scaddins/source/datefunc/date.component b/scaddins/source/datefunc/date.component
index 47e73d891017..f99cc17ef79f 100644
--- a/scaddins/source/datefunc/date.component
+++ b/scaddins/source/datefunc/date.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="date"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.sheet.addin.DateFunctionsImpl">
     <service name="com.sun.star.sheet.AddIn"/>
diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx
index 6040f6c1adcb..75a538b4f44e 100644
--- a/scaddins/source/datefunc/datefunc.cxx
+++ b/scaddins/source/datefunc/datefunc.cxx
@@ -235,7 +235,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScaDateAddIn_CreateInstance(
 
 extern "C" {
 
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL date_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
     void* pRet = 0;