add prefixes for component_getFactory

22 files changed, 25 insertions, 36 deletions

diff --git a/chart2/source/controller/chartcontroller.component b/chart2/source/controller/chartcontroller.component
index fc99913b5a74..fcf0b67d41b8 100644
--- a/chart2/source/controller/chartcontroller.component
+++ b/chart2/source/controller/chartcontroller.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="chartcontroller"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.chart.ElementSelectorToolbarController">
     <service name="com.sun.star.frame.ToolbarController"/>
diff --git a/chart2/source/controller/main/_serviceregistration_controller.cxx b/chart2/source/controller/main/_serviceregistration_controller.cxx
index c6d9acfca95d..f5d93e2616e6 100644
--- a/chart2/source/controller/main/_serviceregistration_controller.cxx
+++ b/chart2/source/controller/main/_serviceregistration_controller.cxx
@@ -102,7 +102,7 @@ static struct ::cppu::ImplementationEntry g_entries_chart2_controller[] =
 // component exports
 extern "C"
 {
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL chartcontroller_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return ::cppu::component_getFactoryHelper(
diff --git a/chart2/source/model/chartmodel.component b/chart2/source/model/chartmodel.component
index fa26e51ac401..9cb536e52e8a 100644
--- a/chart2/source/model/chartmodel.component
+++ b/chart2/source/model/chartmodel.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="chartmodel"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.chart.AreaChartType">
     <service name="com.sun.star.chart2.AreaChartType"/>
diff --git a/chart2/source/model/main/_serviceregistration_model.cxx b/chart2/source/model/main/_serviceregistration_model.cxx
index 5b783e95e613..a766fbd4c9ea 100644
--- a/chart2/source/model/main/_serviceregistration_model.cxx
+++ b/chart2/source/model/main/_serviceregistration_model.cxx
@@ -185,7 +185,7 @@ static struct ::cppu::ImplementationEntry g_entries_chart2_model[] =
 // component exports
 extern "C"
 {
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL chartmodel_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     void * pResult = ::cppu::component_getFactoryHelper(
diff --git a/chart2/source/tools/_serviceregistration_tools.cxx b/chart2/source/tools/_serviceregistration_tools.cxx
index a2444e171e28..4fee554ed377 100644
--- a/chart2/source/tools/_serviceregistration_tools.cxx
+++ b/chart2/source/tools/_serviceregistration_tools.cxx
@@ -177,7 +177,7 @@ static struct ::cppu::ImplementationEntry g_entries_chart2_tools[] =
 // component exports
 extern "C"
 {
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL charttools_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return ::cppu::component_getFactoryHelper(
diff --git a/chart2/source/tools/charttools.component b/chart2/source/tools/charttools.component
index 7ca499a7ba80..6dc992917a3a 100644
--- a/chart2/source/tools/charttools.component
+++ b/chart2/source/tools/charttools.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="charttools"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.chart2.ExponentialScaling">
     <service name="com.sun.star.chart2.ExponentialScaling"/>
diff --git a/chart2/source/view/chartview.component b/chart2/source/view/chartview.component
index 773666150651..62c46f4ab129 100644
--- a/chart2/source/view/chartview.component
+++ b/chart2/source/view/chartview.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="chartview"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.chart2.ChartView">
     <service name="com.sun.star.chart2.ChartView"/>
diff --git a/chart2/source/view/main/_serviceregistration_view.cxx b/chart2/source/view/main/_serviceregistration_view.cxx
index f90ea3aa5ee3..484de9d38346 100644
--- a/chart2/source/view/main/_serviceregistration_view.cxx
+++ b/chart2/source/view/main/_serviceregistration_view.cxx
@@ -48,7 +48,7 @@ static struct ::cppu::ImplementationEntry g_entries_chart2_view[] =
 // component exports
 extern "C"
 {
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL chartview_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return ::cppu::component_getFactoryHelper(
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"/>
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;
diff --git a/sccomp/source/solver/solver.component b/sccomp/source/solver/solver.component
index de9cb3bd511d..6099ab96402f 100644
--- a/sccomp/source/solver/solver.component
+++ b/sccomp/source/solver/solver.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="solver"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.Calc.Solver">
     <service name="com.sun.star.sheet.Solver"/>
diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx
index a4725411a791..a02b2975e20b 100644
--- a/sccomp/source/solver/solver.cxx
+++ b/sccomp/source/solver/solver.cxx
@@ -596,7 +596,7 @@ uno::Reference<uno::XInterface> SolverComponent_createInstance( const uno::Refer
 
 extern "C"
 {
-    SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+    SAL_DLLPUBLIC_EXPORT void* SAL_CALL solver_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
     {
         OUString    aImplName( OUString::createFromAscii( pImplName ) );
         void*       pRet = 0;