diff options
| author | Matus Kukan <matus.kukan@gmail.com> | 2011-06-24 14:56:31 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-06-24 14:58:40 +0100 |
| commit | ec2ba4881538f485ed17dd1c44c2a9fd0a5d971a (patch) | |
| tree | ac1e3875eda7e380971b711e638ef6318f780196 /toolkit | |
| parent | 115feb261aec2d396b7a26f59da084860d7e550a (diff) | |
update component factory methods to use new prefixes, to add lib merging
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/helper/registerservices.cxx | 4 | ||||
| -rw-r--r-- | toolkit/util/tk.component | 2 |
2 files changed, 3 insertions, 3 deletions
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"/> |