diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:58:02 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:58:02 +0100 |
commit | a3a19632f413a6fe8dee97f02d637e7197869b50 (patch) | |
tree | b8a01b5b560e18bdb007ec5ff2fafd50a3c508a9 /stoc/source/bootstrap/services.cxx | |
parent | 999dce7d69e20561c3f39476e074043838eb7514 (diff) | |
parent | 793a9a799346aebbf0a50d8d4f15081d9032d57c (diff) |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
bridges/source/remote/urp/urp_environment.cxx
bridges/source/remote/urp/urp_propertyobject.cxx
bridges/source/remote/urp/urp_reader.cxx
remotebridges/source/factory/bridgefactory.cxx
stoc/source/corereflection/crefl.cxx
stoc/source/javavm/javavm.cxx
stoc/source/simpleregistry/simpleregistry.cxx
Diffstat (limited to 'stoc/source/bootstrap/services.cxx')
-rw-r--r-- | stoc/source/bootstrap/services.cxx | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/stoc/source/bootstrap/services.cxx b/stoc/source/bootstrap/services.cxx index 53e9bdcce3aa..5e97e5802c0b 100644 --- a/stoc/source/bootstrap/services.cxx +++ b/stoc/source/bootstrap/services.cxx @@ -132,12 +132,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //================================================================================================== -sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, void * pRegistryKey ) -{ - return component_writeInfoHelper( pServiceManager, pRegistryKey, g_entries ); -} -//================================================================================================== void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { |