diff options
| author | Matus Kukan <matus.kukan@gmail.com> | 2011-07-02 17:26:05 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-07-11 20:35:41 +0100 |
| commit | 7d23e260cce288878b61e78a1db523b7678ba299 (patch) | |
| tree | dcbfb614ede464f74df2c370c309871a9fa407b8 | |
| parent | d9a8459a5e80e648440a71a245809736b77b88e1 (diff) | |
Move methods from component_getImplementationEnviron to component_getFactory
| -rw-r--r-- | extensions/source/abpilot/abpservices.cxx | 3 | ||||
| -rw-r--r-- | extensions/source/dbpilots/dbpservices.cxx | 3 | ||||
| -rw-r--r-- | extensions/source/propctrlr/pcrservices.cxx | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/extensions/source/abpilot/abpservices.cxx b/extensions/source/abpilot/abpservices.cxx index 8703dc8cb..ef519a353 100644 --- a/extensions/source/abpilot/abpservices.cxx +++ b/extensions/source/abpilot/abpservices.cxx @@ -61,7 +61,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron uno_Environment ** /*ppEnv*/ ) { - abp_initializeModule(); *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } @@ -71,6 +70,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( void* pServiceManager, void* /*pRegistryKey*/) { + abp_initializeModule(); + Reference< XInterface > xRet; if (pServiceManager && pImplementationName) { diff --git a/extensions/source/dbpilots/dbpservices.cxx b/extensions/source/dbpilots/dbpservices.cxx index 0600af0fe..97eb6975c 100644 --- a/extensions/source/dbpilots/dbpservices.cxx +++ b/extensions/source/dbpilots/dbpservices.cxx @@ -65,7 +65,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron uno_Environment ** /*ppEnv*/ ) { - dbp_initializeModule(); *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } @@ -75,6 +74,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( void* pServiceManager, void* /*pRegistryKey*/) { + dbp_initializeModule(); + Reference< XInterface > xRet; if (pServiceManager && pImplementationName) { diff --git a/extensions/source/propctrlr/pcrservices.cxx b/extensions/source/propctrlr/pcrservices.cxx index 90ddc35a3..b85e344f6 100644 --- a/extensions/source/propctrlr/pcrservices.cxx +++ b/extensions/source/propctrlr/pcrservices.cxx @@ -97,7 +97,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron uno_Environment ** /*ppEnv*/ ) { - pcr_initializeModule(); *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } @@ -107,6 +106,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( void* pServiceManager, void* /*pRegistryKey*/) { + pcr_initializeModule(); + Reference< XInterface > xRet; if (pServiceManager && pImplementationName) { |