summaryrefslogtreecommitdiff
path: root/comphelper/source
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2006-11-08 11:01:30 +0000
committerKurt Zenker <kz@openoffice.org>2006-11-08 11:01:30 +0000
commitf30e524a03fe809486a597d8ffb7f5c170ab867d (patch)
tree0c93dfe23b8e91c4f9468f776995ef57fa0f22ad /comphelper/source
parentd2e50e0b0e676a0039c976df1fe4db7b915a64cb (diff)
INTEGRATION: CWS basmgr01 (1.4.4); FILE MERGED
2006/09/28 20:03:28 fs 1.4.4.1: more convenience for using this module
Diffstat (limited to 'comphelper/source')
-rw-r--r--comphelper/source/misc/componentmodule.cxx22
1 files changed, 20 insertions, 2 deletions
diff --git a/comphelper/source/misc/componentmodule.cxx b/comphelper/source/misc/componentmodule.cxx
index 794953e60f4a..d138040be3a7 100644
--- a/comphelper/source/misc/componentmodule.cxx
+++ b/comphelper/source/misc/componentmodule.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: componentmodule.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: obo $ $Date: 2006-09-17 17:10:24 $
+ * last change: $Author: kz $ $Date: 2006-11-08 12:01:30 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -150,6 +150,14 @@ namespace comphelper
}
//--------------------------------------------------------------------------
+ sal_Bool OModule::writeComponentInfos( void* pServiceManager, void* pRegistryKey )
+ {
+ Reference< XMultiServiceFactory > xFactory( static_cast< XMultiServiceFactory* >( pServiceManager ) );
+ Reference< XRegistryKey > xRegistryKey( static_cast< XRegistryKey* >( pRegistryKey ) );
+ return writeComponentInfos( xFactory, xRegistryKey );
+ }
+
+ //--------------------------------------------------------------------------
sal_Bool OModule::writeComponentInfos(
const Reference< XMultiServiceFactory >& /*_rxServiceManager*/,
const Reference< XRegistryKey >& _rxRootKey )
@@ -187,6 +195,16 @@ namespace comphelper
}
//--------------------------------------------------------------------------
+ void* OModule::getComponentFactory( const sal_Char* _pImplementationName, void* _pServiceManager, void* /*_pRegistryKey*/ )
+ {
+ Reference< XInterface > xFactory( getComponentFactory(
+ ::rtl::OUString::createFromAscii( _pImplementationName ),
+ Reference< XMultiServiceFactory >( static_cast< XMultiServiceFactory* >( _pServiceManager ) )
+ ) );
+ return xFactory.get();
+ }
+
+ //--------------------------------------------------------------------------
Reference< XInterface > OModule::getComponentFactory( const ::rtl::OUString& _rImplementationName,
const Reference< XMultiServiceFactory >& /* _rxServiceManager */ )
{