diff options
| -rw-r--r-- | dbaccess/source/core/dataaccess/databasecontext.cxx | 5 | ||||
| -rw-r--r-- | dbaccess/source/core/misc/services.cxx | 20 |
2 files changed, 16 insertions, 9 deletions
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx index 9d4c6ecbfaac..5069c338c43b 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.cxx +++ b/dbaccess/source/core/dataaccess/databasecontext.cxx @@ -102,11 +102,6 @@ using ::com::sun::star::ucb::IOErrorCode_NOT_EXISTING; using ::com::sun::star::ucb::IOErrorCode_NOT_EXISTING_PATH; -extern "C" void SAL_CALL createRegistryInfo_ODatabaseContext() -{ - static ::dba::OLegacySingletonRegistration< ::dbaccess::ODatabaseContext > aODatabaseContext_AutoRegistration; -} - namespace dbaccess { diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx index 33a4b59b3a26..61e9c65d2e59 100644 --- a/dbaccess/source/core/misc/services.cxx +++ b/dbaccess/source/core/misc/services.cxx @@ -36,6 +36,8 @@ #include "DatabaseDataProvider.hxx" #include "dbadllapi.hxx" +#include <../dataaccess/databasecontext.hxx> + /********************************************************************************************/ using namespace ::com::sun::star::uno; @@ -45,7 +47,6 @@ using namespace ::com::sun::star::registry; //*************************************************************************************** // // registry functions -extern "C" void SAL_CALL createRegistryInfo_ODatabaseContext(); extern "C" void SAL_CALL createRegistryInfo_OCommandDefinition(); extern "C" void SAL_CALL createRegistryInfo_OComponentDefinition(); extern "C" void SAL_CALL createRegistryInfo_ORowSet(); @@ -56,8 +57,20 @@ extern "C" void SAL_CALL createRegistryInfo_DataAccessDescriptorFactory(); namespace dba{ //-------------------------------------------------------------------------- ::cppu::ImplementationEntry entries[] = { - { &::dbaccess::DatabaseDataProvider::Create, &::dbaccess::DatabaseDataProvider::getImplementationName_Static, &::dbaccess::DatabaseDataProvider::getSupportedServiceNames_Static, - &cppu::createSingleComponentFactory, 0, 0 }, + { + &::dbaccess::DatabaseDataProvider::Create, + &::dbaccess::DatabaseDataProvider::getImplementationName_Static, + &::dbaccess::DatabaseDataProvider::getSupportedServiceNames_Static, + &cppu::createSingleComponentFactory, 0, 0 + }, + + { + &dbaccess::ODatabaseContext::Create, + &dbaccess::ODatabaseContext::getImplementationName_static, + &dbaccess::ODatabaseContext::getSupportedServiceNames_static, + &cppu::createOneInstanceComponentFactory, 0, 0 + }, + { 0, 0, 0, 0, 0, 0 } }; } @@ -72,7 +85,6 @@ extern "C" void SAL_CALL createRegistryInfo_DBA() static sal_Bool bInit = sal_False; if (!bInit) { - createRegistryInfo_ODatabaseContext(); createRegistryInfo_OCommandDefinition(); createRegistryInfo_OComponentDefinition(); createRegistryInfo_ORowSet(); |