From cd79d51420b90117d0f3e1d5f3cdf9187bd61b88 Mon Sep 17 00:00:00 2001
From: Peter Foley <pefoley2@verizon.net>
Date: Mon, 15 Apr 2013 08:36:13 -0400
Subject: prefix all component_getFactory methods

Change-Id: I954176fdab9103125444dd2fb397673406f7aff9
---
 stoc/source/bootstrap/services.cxx | 6 +-----
 stoc/util/bootstrap.component      | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'stoc')

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"/>
-- 
cgit