Kaydet (Commit) 34fd3756 authored tarafından Matus Kukan's avatar Matus Kukan Kaydeden (comit) Michael Meeks

Move methods from component_getImplementationEnviron to component_getFactory

üst d77348bc
...@@ -61,7 +61,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron ...@@ -61,7 +61,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron
uno_Environment ** /*ppEnv*/ uno_Environment ** /*ppEnv*/
) )
{ {
abp_initializeModule();
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
} }
...@@ -71,6 +70,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( ...@@ -71,6 +70,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
void* pServiceManager, void* pServiceManager,
void* /*pRegistryKey*/) void* /*pRegistryKey*/)
{ {
abp_initializeModule();
Reference< XInterface > xRet; Reference< XInterface > xRet;
if (pServiceManager && pImplementationName) if (pServiceManager && pImplementationName)
{ {
......
...@@ -65,7 +65,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron ...@@ -65,7 +65,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron
uno_Environment ** /*ppEnv*/ uno_Environment ** /*ppEnv*/
) )
{ {
dbp_initializeModule();
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
} }
...@@ -75,6 +74,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( ...@@ -75,6 +74,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
void* pServiceManager, void* pServiceManager,
void* /*pRegistryKey*/) void* /*pRegistryKey*/)
{ {
dbp_initializeModule();
Reference< XInterface > xRet; Reference< XInterface > xRet;
if (pServiceManager && pImplementationName) if (pServiceManager && pImplementationName)
{ {
......
...@@ -97,7 +97,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron ...@@ -97,7 +97,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron
uno_Environment ** /*ppEnv*/ uno_Environment ** /*ppEnv*/
) )
{ {
pcr_initializeModule();
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
} }
...@@ -107,6 +106,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( ...@@ -107,6 +106,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
void* pServiceManager, void* pServiceManager,
void* /*pRegistryKey*/) void* /*pRegistryKey*/)
{ {
pcr_initializeModule();
Reference< XInterface > xRet; Reference< XInterface > xRet;
if (pServiceManager && pImplementationName) if (pServiceManager && pImplementationName)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment