diff options
| author | Matus Kukan <matus.kukan@gmail.com> | 2011-07-02 17:28:27 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-07-11 20:34:42 +0100 |
| commit | 0eec34568c56b1e23747d1dcdceab33e6104b95f (patch) | |
| tree | b187a9619bd4c09b52e56c593a3b1f8ba0455c95 /dbaccess | |
| parent | 9acfb18b030dfdfbeaf5e87abaec2caef1e2d8b1 (diff) | |
Move methods from component_getImplementationEnviron to component_getFactory
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/core/misc/services.cxx | 3 | ||||
| -rw-r--r-- | dbaccess/source/ext/adabas/Aservices.cxx | 3 | ||||
| -rw-r--r-- | dbaccess/source/filter/xml/xmlservices.cxx | 3 | ||||
| -rw-r--r-- | dbaccess/source/sdbtools/misc/sdbt_services.cxx | 3 | ||||
| -rw-r--r-- | dbaccess/source/ui/misc/uiservices.cxx | 3 |
5 files changed, 10 insertions, 5 deletions
diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx index 61e9c65d2e59..15918ac99f72 100644 --- a/dbaccess/source/core/misc/services.cxx +++ b/dbaccess/source/core/misc/services.cxx @@ -102,7 +102,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron uno_Environment ** ) { - createRegistryInfo_DBA(); *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } @@ -112,6 +111,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( void* pServiceManager, void* pRegistryKey) { + createRegistryInfo_DBA(); + Reference< XInterface > xRet; if (pServiceManager && pImplementationName) { diff --git a/dbaccess/source/ext/adabas/Aservices.cxx b/dbaccess/source/ext/adabas/Aservices.cxx index eb83f464b473..14fc336ce38f 100644 --- a/dbaccess/source/ext/adabas/Aservices.cxx +++ b/dbaccess/source/ext/adabas/Aservices.cxx @@ -63,7 +63,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron uno_Environment ** ) { - createRegistryInfo_adabasui(); *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } @@ -73,6 +72,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( void* pServiceManager, void* /*pRegistryKey*/) { + createRegistryInfo_adabasui(); + Reference< XInterface > xRet; if (pServiceManager && pImplementationName) { diff --git a/dbaccess/source/filter/xml/xmlservices.cxx b/dbaccess/source/filter/xml/xmlservices.cxx index 446930872ce0..8981f83e5852 100644 --- a/dbaccess/source/filter/xml/xmlservices.cxx +++ b/dbaccess/source/filter/xml/xmlservices.cxx @@ -74,7 +74,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron uno_Environment ** ) { - createRegistryInfo_dbaxml(); *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } @@ -84,6 +83,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( void* pServiceManager, void* /*pRegistryKey*/) { + createRegistryInfo_dbaxml(); + Reference< XInterface > xRet; if (pServiceManager && pImplementationName) { diff --git a/dbaccess/source/sdbtools/misc/sdbt_services.cxx b/dbaccess/source/sdbtools/misc/sdbt_services.cxx index 3bef9a0b26b4..76e22563643a 100644 --- a/dbaccess/source/sdbtools/misc/sdbt_services.cxx +++ b/dbaccess/source/sdbtools/misc/sdbt_services.cxx @@ -60,7 +60,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron uno_Environment ** ) { - sdbt_initializeModule(); *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } @@ -70,6 +69,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( void* pServiceManager, void* /*pRegistryKey*/) { + sdbt_initializeModule(); + Reference< XInterface > xRet; if (pServiceManager && pImplementationName) { diff --git a/dbaccess/source/ui/misc/uiservices.cxx b/dbaccess/source/ui/misc/uiservices.cxx index e235adc69b96..2e5799fd92f6 100644 --- a/dbaccess/source/ui/misc/uiservices.cxx +++ b/dbaccess/source/ui/misc/uiservices.cxx @@ -113,7 +113,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron uno_Environment ** ) { - createRegistryInfo_DBU(); *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } @@ -123,6 +122,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( void* pServiceManager, void* /*pRegistryKey*/) { + createRegistryInfo_DBU(); + Reference< XInterface > xRet; if (pServiceManager && pImplementationName) { |