3 files changed, 6 insertions, 3 deletions
diff --git a/extensions/source/abpilot/abpservices.cxx b/extensions/source/abpilot/abpservices.cxx
index 2c2d86591055..c91d3e220d92 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 b9e78cdadadb..d2735b775752 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 f8818fe5f042..2b0013e4a5ab 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)
     {