diff options
| author | Jörg Barfurth <jb@openoffice.org> | 2001-05-22 08:52:14 +0000 |
|---|---|---|
| committer | Jörg Barfurth <jb@openoffice.org> | 2001-05-22 08:52:14 +0000 |
| commit | 11287b21ed1d73f4d439056b9888dbc0569e2b31 (patch) | |
| tree | 3f198e9c87ccdadf0a0923a803590e36afde2d3f /configmgr/source | |
| parent | 5ea5bfe6136ec6012b1d9a508e4875ecef35d7f7 (diff) | |
Missed required change
Diffstat (limited to 'configmgr/source')
| -rw-r--r-- | configmgr/source/misc/configunoreg.cxx | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/configmgr/source/misc/configunoreg.cxx b/configmgr/source/misc/configunoreg.cxx index 7064fce35bfe..145f9f5300ec 100644 --- a/configmgr/source/misc/configunoreg.cxx +++ b/configmgr/source/misc/configunoreg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: configunoreg.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: jb $ $Date: 2001-04-03 16:33:58 $ + * last change: $Author: jb $ $Date: 2001-05-22 09:52:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,6 +84,7 @@ using ::com::sun::star::lang::XMultiServiceFactory; using ::configmgr::ServiceInfo; using ::configmgr::AsciiServiceName; +#if SUPD<633 typedef Reference< XSingleServiceFactory > (SAL_CALL * createFactoryFunc) ( const Reference< XMultiServiceFactory > & rServiceManager, @@ -91,6 +92,16 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL * createFactoryFunc) ::cppu::ComponentInstantiation pCreateFunction, const Sequence< OUString > & rServiceNames ); +#else +typedef Reference< XSingleServiceFactory > (SAL_CALL * createFactoryFunc) + ( + const Reference< XMultiServiceFactory > & rServiceManager, + const OUString & rComponentName, + ::cppu::ComponentInstantiation pCreateFunction, + const Sequence< OUString > & rServiceNames, + rtl_ModuleCount* + ); +#endif typedef Reference< XSingleServiceFactory > (SAL_CALL * createProviderFactoryFunc) ( @@ -168,7 +179,11 @@ struct ServiceImplementationRequest { const Sequence< OUString > Services= configmgr::ServiceComponentImpl::getServiceNames(pInfo); +#if SUPD<633 xRet = creator( m_xServiceManager, OUString::createFromAscii(pInfo->implementationName),Factory, Services); +#else + xRet = creator( m_xServiceManager, OUString::createFromAscii(pInfo->implementationName),Factory, Services,0); +#endif OSL_ENSURE(xRet.is(), "CreateProvider : WHERE IS THE return value !"); } catch(Exception&) |