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 /unotools | |
| parent | 115feb261aec2d396b7a26f59da084860d7e550a (diff) | |
update component factory methods to use new prefixes, to add lib merging
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/ucbhelper/xtempfile.cxx | 4 | ||||
| -rw-r--r-- | unotools/util/utl.component | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/unotools/source/ucbhelper/xtempfile.cxx b/unotools/source/ucbhelper/xtempfile.cxx index 7883a3e85cb2..d73981670d5d 100644 --- a/unotools/source/ucbhelper/xtempfile.cxx +++ b/unotools/source/ucbhelper/xtempfile.cxx @@ -486,7 +486,7 @@ throw ( ::css::uno::RuntimeException ) // C functions to implement this as a component -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL utl_component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; @@ -499,7 +499,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron * @param pRegistryKey registry data key to read and write component persistent data * @return a component factory (generic uno interface) */ -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL utl_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/unotools/util/utl.component b/unotools/util/utl.component index 8c8198741f55..ab4b67b61da4 100644 --- a/unotools/util/utl.component +++ b/unotools/util/utl.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="utl" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.io.comp.TempFile"> <service name="com.sun.star.io.TempFile"/> |