prefix all component_getFactory methods

Change-Id: I954176fdab9103125444dd2fb397673406f7aff9

11 files changed, 11 insertions, 15 deletions

diff --git a/connectivity/source/drivers/mork/services.cxx b/connectivity/source/drivers/mork/services.cxx
index aa610e1f73bc..150b21d63a8c 100644
--- a/connectivity/source/drivers/mork/services.cxx
+++ b/connectivity/source/drivers/mork/services.cxx
@@ -30,7 +30,7 @@ static cppu::ImplementationEntry const services[] =
 
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void *SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void *SAL_CALL mork_component_getFactory(
     char const *pImplName, void *pServiceManager, void *pRegistryKey)
 {
     return cppu::component_getFactoryHelper(
diff --git a/mysqlc/source/mysqlc.component b/mysqlc/source/mysqlc.component
index e4295110f84b..ae16484d43b4 100644
--- a/mysqlc/source/mysqlc.component
+++ b/mysqlc/source/mysqlc.component
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
 -->
-<component xmlns="http://openoffice.org/2010/uno-components"
+<component xmlns="http://openoffice.org/2010/uno-components" prefix="mysqlc"
         loader="com.sun.star.loader.SharedLibrary">
     <implementation name="com.sun.star.comp.sdbc.mysqlc.MysqlCDriver">
         <service name="com.sun.star.sdbc.Driver"/>
diff --git a/mysqlc/source/mysqlc_services.cxx b/mysqlc/source/mysqlc_services.cxx
index 672633c26e1c..1d6139d99293 100644
--- a/mysqlc/source/mysqlc_services.cxx
+++ b/mysqlc/source/mysqlc_services.cxx
@@ -76,7 +76,7 @@ struct ProviderRequest
 
 
 /* {{{ component_getFactory -I- */
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL mysqlc_component_getFactory(
                     const sal_Char * pImplementationName,
                     void * pServiceManager,
                     void * /* pRegistryKey */)
diff --git a/shell/source/sessioninstall/losessioninstall.component b/shell/source/sessioninstall/losessioninstall.component
index d01c357ef6cb..8045b93b92fb 100644
--- a/shell/source/sessioninstall/losessioninstall.component
+++ b/shell/source/sessioninstall/losessioninstall.component
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
 -->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="sessioninstall"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="org.libreoffice.comp.shell.sessioninstall.SyncDbusSessionHelper">
     <service name="org.freedesktop.PackageKit.SyncDbusSessionHelper"/>
diff --git a/shell/source/sessioninstall/services.cxx b/shell/source/sessioninstall/services.cxx
index caf332197a96..5b6f1f23c52a 100644
--- a/shell/source/sessioninstall/services.cxx
+++ b/shell/source/sessioninstall/services.cxx
@@ -23,7 +23,7 @@ const sdecl::ServiceDecl SyncDbusSessionHelperServiceDecl(
 COMPHELPER_SERVICEDECL_EXPORTS1(losessioninstall, SyncDbusSessionHelperServiceDecl);
 extern "C"
 {
-    SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( sal_Char const* pImplName, ::com::sun::star::lang::XMultiServiceFactory* pServiceManager, ::com::sun::star::registry::XRegistryKey* pRegistryKey )
+    SAL_DLLPUBLIC_EXPORT void* SAL_CALL sessioninstall_component_getFactory( sal_Char const* pImplName, ::com::sun::star::lang::XMultiServiceFactory* pServiceManager, ::com::sun::star::registry::XRegistryKey* pRegistryKey )
         { return losessioninstall_component_getFactory(pImplName, pServiceManager, pRegistryKey); }
 }
 
diff --git a/stoc/source/bootstrap/services.cxx b/stoc/source/bootstrap/services.cxx
index 56bcd1c87e33..72404f19f9bb 100644
--- a/stoc/source/bootstrap/services.cxx
+++ b/stoc/source/bootstrap/services.cxx
@@ -116,12 +116,8 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
 }
 #endif
 
-#ifdef DISABLE_DYNLOADING
-#define component_getFactory bootstrap_component_getFactory
-#endif
-
 //==================================================================================================
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL bootstrap_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
diff --git a/stoc/util/bootstrap.component b/stoc/util/bootstrap.component
index d6e9b0c4f03f..ec1aa548e2d1 100644
--- a/stoc/util/bootstrap.component
+++ b/stoc/util/bootstrap.component
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="bootstrap"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.stoc.DLLComponentLoader">
     <service name="com.sun.star.loader.SharedLibrary"/>
diff --git a/xmlhelp/source/cxxhelp/provider/services.cxx b/xmlhelp/source/cxxhelp/provider/services.cxx
index 43502a09ac08..ec4e5642efae 100644
--- a/xmlhelp/source/cxxhelp/provider/services.cxx
+++ b/xmlhelp/source/cxxhelp/provider/services.cxx
@@ -26,7 +26,7 @@
 using namespace com::sun::star;
 
 //=========================================================================
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpchelp_component_getFactory(
     const sal_Char * pImplName,
     void * pServiceManager,
     SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ )
diff --git a/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx
index d6dddaf05564..02b0a237f005 100644
--- a/xmlhelp/source/treeview/tvfactory.cxx
+++ b/xmlhelp/source/treeview/tvfactory.cxx
@@ -246,7 +246,7 @@ TVFactory::CreateInstance(
 }
 
 //=========================================================================
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL treeview_component_getFactory(
     const sal_Char * pImplName,void * pServiceManager,void * pRegistryKey )
 {
     (void)pRegistryKey;
diff --git a/xmlhelp/source/treeview/tvhlp1.component b/xmlhelp/source/treeview/tvhlp1.component
index 68577bb532dc..eb423154653c 100644
--- a/xmlhelp/source/treeview/tvhlp1.component
+++ b/xmlhelp/source/treeview/tvhlp1.component
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="treeview"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.help.TreeViewImpl">
     <service name="com.sun.star.help.TreeView"/>
diff --git a/xmlhelp/util/ucpchelp1.component b/xmlhelp/util/ucpchelp1.component
index 1642ae74e3eb..38ef9098b87d 100644
--- a/xmlhelp/util/ucpchelp1.component
+++ b/xmlhelp/util/ucpchelp1.component
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpchelp"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="CHelpContentProvider">
     <service name="com.sun.star.help.XMLHelp"/>