From ec2ba4881538f485ed17dd1c44c2a9fd0a5d971a Mon Sep 17 00:00:00 2001
From: Matus Kukan <matus.kukan@gmail.com>
Date: Fri, 24 Jun 2011 14:56:31 +0100
Subject: update component factory methods to use new prefixes, to add lib
 merging

---
 toolkit/source/helper/registerservices.cxx | 4 ++--
 toolkit/util/tk.component                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'toolkit')

diff --git a/toolkit/source/helper/registerservices.cxx b/toolkit/source/helper/registerservices.cxx
index cadd228d1c4b..6e11e72970be 100644
--- a/toolkit/source/helper/registerservices.cxx
+++ b/toolkit/source/helper/registerservices.cxx
@@ -236,12 +236,12 @@ extern void * SAL_CALL comp_Layout_component_getFactory( const char * implName,
 extern "C"
 {
 
-TOOLKIT_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment( const sal_Char** ppEnvTypeName, uno_Environment** )
+TOOLKIT_DLLPUBLIC void SAL_CALL tk_component_getImplementationEnvironment( const sal_Char** ppEnvTypeName, uno_Environment** )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-TOOLKIT_DLLPUBLIC void* SAL_CALL component_getFactory( const sal_Char* sImplementationName, void* _pServiceManager, void* _pRegistryKey )
+TOOLKIT_DLLPUBLIC void* SAL_CALL tk_component_getFactory( const sal_Char* sImplementationName, void* _pServiceManager, void* _pRegistryKey )
 {
     void* pRet = NULL;
 
diff --git a/toolkit/util/tk.component b/toolkit/util/tk.component
index 4d4713e87c45..f6638794de12 100644
--- a/toolkit/util/tk.component
+++ b/toolkit/util/tk.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="tk"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.awt.comp.AsyncCallback">
     <service name="com.sun.star.awt.AsyncCallback"/>
-- 
cgit