User: kz Date: 2008-03-05 17:06:44+0000 Modified: dba/dbaccess/source/core/misc/services.cxx
Log: INTEGRATION: CWS rptchart01_DEV300 (1.14.70); FILE MERGED 2008/03/05 09:12:02 oj 1.14.70.3: RESYNC: (1.15-1.16); FILE MERGED 2008/02/19 07:34:54 oj 1.14.70.2: RESYNC: (1.14-1.15); FILE MERGED 2008/01/24 12:15:10 oj 1.14.70.1: #i85225# new dataprovider for charts File Changes: Directory: /dba/dbaccess/source/core/misc/ ========================================== File [changed]: services.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/misc/services.cxx?r1=1.16&r2=1.17 Delta lines: +18 -3 -------------------- --- services.cxx 2008-02-26 14:38:54+0000 1.16 +++ services.cxx 2008-03-05 17:06:41+0000 1.17 @@ -36,9 +36,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaccess.hxx" +#include <cppuhelper/factory.hxx> +#include <cppuhelper/implementationentry.hxx> #include "module_dba.hxx" - #include <osl/diagnose.h> +#include "DatabaseDataProvider.hxx" /********************************************************************************************/ @@ -57,6 +59,15 @@ extern "C" void SAL_CALL createRegistryInfo_ODatabaseSource(); extern "C" void SAL_CALL createRegistryInfo_DataAccessDescriptorFactory(); +namespace { +//-------------------------------------------------------------------------- + ::cppu::ImplementationEntry entries[] = { + { &::dbaccess::DatabaseDataProvider::Create, &::dbaccess::DatabaseDataProvider::getImplementationName_Static, &::dbaccess::DatabaseDataProvider::getSupportedServiceNames_Static, + &cppu::createSingleComponentFactory, 0, 0 }, + { 0, 0, 0, 0, 0, 0 } + }; +} + //*************************************************************************************** // // Die vorgeschriebene C-Api muss erfuellt werden! @@ -100,7 +111,8 @@ { return ::dba::DbaModule::getInstance().writeComponentInfos( static_cast< XMultiServiceFactory* >( pServiceManager ), - static_cast< XRegistryKey* >( pRegistryKey ) ); + static_cast< XRegistryKey* >( pRegistryKey ) ) + && cppu::component_writeInfoHelper(pServiceManager, pRegistryKey, entries); } catch (InvalidRegistryException& ) { @@ -114,7 +126,7 @@ extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, - void* /*pRegistryKey*/) + void* pRegistryKey) { Reference< XInterface > xRet; if (pServiceManager && pImplementationName) @@ -126,5 +138,8 @@ if (xRet.is()) xRet->acquire(); + else + return cppu::component_getFactoryHelper( + pImplementationName, pServiceManager, pRegistryKey, entries); return xRet.get(); }; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
