Tag: cws_src680_rptchart01 User: oj Date: 2008-01-24 12:15:12+0000 Modified: dba/dbaccess/source/core/misc/makefile.mk dba/dbaccess/source/core/misc/services.cxx
Log: #i85225# new dataprovider for charts File Changes: Directory: /dba/dbaccess/source/core/misc/ ========================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/misc/makefile.mk?r1=1.15&r2=1.15.130.1 Delta lines: +5 -4 ------------------- --- makefile.mk 2007-05-10 10:13:59+0000 1.15 +++ makefile.mk 2008-01-24 12:15:10+0000 1.15.130.1 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.15 $ +# $Revision: 1.15.130.1 $ # -# last change: $Author: kz $ $Date: 2007/05/10 10:13:59 $ +# last change: $Author: oj $ $Date: 2008/01/24 12:15:10 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -56,7 +56,8 @@ $(SLO)$/ContainerListener.obj \ $(SLO)$/objectnameapproval.obj \ $(SLO)$/warnings.obj \ - $(SLO)$/veto.obj + $(SLO)$/veto.obj \ + $(SLO)$/DatabaseDataProvider.obj # --- Targets ---------------------------------- File [changed]: services.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/misc/services.cxx?r1=1.14&r2=1.14.70.1 Delta lines: +20 -7 -------------------- --- services.cxx 2007-09-26 14:41:24+0000 1.14 +++ services.cxx 2008-01-24 12:15:10+0000 1.14.70.1 @@ -4,9 +4,9 @@ * * $RCSfile: services.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.14.70.1 $ * - * last change: $Author: hr $ $Date: 2007/09/26 14:41:24 $ + * last change: $Author: oj $ $Date: 2008/01/24 12:15:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -39,12 +39,14 @@ #ifndef _CPPUHELPER_FACTORY_HXX_ #include <cppuhelper/factory.hxx> #endif +#include <cppuhelper/implementationentry.hxx> #ifndef _OSL_DIAGNOSE_H_ #include <osl/diagnose.h> #endif #ifndef _DBA_REGHELPER_HXX_ #include "dba_reghelper.hxx" #endif +#include "DatabaseDataProvider.hxx" /********************************************************************************************/ @@ -63,6 +65,15 @@ extern "C" void SAL_CALL createRegistryInfo_ODatabaseSource(); extern "C" void SAL_CALL createRegistryInfo_OPropertyBag(); +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! @@ -104,9 +115,8 @@ if (pRegistryKey) try { - return ::dbaccess::OModuleRegistration::writeComponentInfos( - static_cast<XMultiServiceFactory*>(pServiceManager), - static_cast<XRegistryKey*>(pRegistryKey)); + return ::dbaccess::OModuleRegistration::writeComponentInfos(static_cast<XMultiServiceFactory*>(pServiceManager),static_cast<XRegistryKey*>(pRegistryKey)) + && cppu::component_writeInfoHelper(pServiceManager, pRegistryKey, entries); } catch (InvalidRegistryException& ) { @@ -120,7 +130,7 @@ extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, - void* /*pRegistryKey*/) + void* pRegistryKey) { Reference< XInterface > xRet; if (pServiceManager && pImplementationName) @@ -132,5 +142,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]
