[Libreoffice-commits] .: dbaccess/source

[Michael Meeks]

 dbaccess/source/core/misc/services.cxx          |    3 ++-
 dbaccess/source/ext/adabas/Aservices.cxx        |    3 ++-
 dbaccess/source/filter/xml/xmlservices.cxx      |    3 ++-
 dbaccess/source/sdbtools/misc/sdbt_services.cxx |    3 ++-
 dbaccess/source/ui/misc/uiservices.cxx          |    3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit be20762e2e6c0c188ab15888564c318abd4ab759
Author: Matus Kukan <matus.kukan at gmail.com>
Date:   Sat Jul 2 17:28:27 2011 +0200

    Move methods from component_getImplementationEnviron to component_getFactory

diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx
index dcd6278..578ea70 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 49d88f9..da16faf 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 a3410c4..b3000d6 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 af6c160..88824cb 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 5a3eb62..12c5afe 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)
     {