diff options
Diffstat (limited to 'dbaccess/source/core/misc/services.cxx')
| -rw-r--r-- | dbaccess/source/core/misc/services.cxx | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx index 1853ac167ce3..61e9c65d2e59 100644 --- a/dbaccess/source/core/misc/services.cxx +++ b/dbaccess/source/core/misc/services.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,6 +36,8 @@ #include "DatabaseDataProvider.hxx" #include "dbadllapi.hxx" +#include <../dataaccess/databasecontext.hxx> + /********************************************************************************************/ using namespace ::com::sun::star::uno; @@ -44,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(); @@ -55,23 +57,34 @@ 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 } }; } //*************************************************************************************** // -// Die vorgeschriebene C-Api muss erfuellt werden! -// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen. +// The prescribed C api must be complied with +// It consists of three functions which must be exported by the module. // extern "C" void SAL_CALL createRegistryInfo_DBA() { static sal_Bool bInit = sal_False; if (!bInit) { - createRegistryInfo_ODatabaseContext(); createRegistryInfo_OCommandDefinition(); createRegistryInfo_OComponentDefinition(); createRegistryInfo_ORowSet(); @@ -84,7 +97,7 @@ extern "C" void SAL_CALL createRegistryInfo_DBA() //--------------------------------------------------------------------------------------- -extern "C" OOO_DLLPUBLIC_DBA void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** ) @@ -94,7 +107,7 @@ extern "C" OOO_DLLPUBLIC_DBA void SAL_CALL component_getImplementationEnvironmen } //--------------------------------------------------------------------------------------- -extern "C" OOO_DLLPUBLIC_DBA void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* pRegistryKey) @@ -114,3 +127,5 @@ extern "C" OOO_DLLPUBLIC_DBA void* SAL_CALL component_getFactory( pImplementationName, pServiceManager, pRegistryKey, dba::entries); return xRet.get(); }; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |