summaryrefslogtreecommitdiff
path: root/stoc
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-02-12 11:44:09 +0000
committerOliver Bolte <obo@openoffice.org>2009-02-12 11:44:09 +0000
commitea6bc1e6afd4c8f902f4e2da3924a90bd1c73ecf (patch)
tree69b3ee6e65aa1fc837e6aaf191c0ddd62faa4d3c /stoc
parente591a08dc3d37e13703c855a7f4056faa4e34406 (diff)
CWS-TOOLING: integrate CWS jl115
2009-01-29 13:13:16 +0100 jsk r267121 : #i98596# 2009-01-23 14:50:24 +0100 jl r266821 : #98273# climaker.exe.config prevents using publisher policy 2009-01-23 14:10:51 +0100 jl r266817 : #i98392# wrong use of iterator when removing a factory, which may lead to a crash 2009-01-19 11:36:29 +0100 jl r266484 : #i96690# test extension 2009-01-19 11:32:46 +0100 jl r266483 : #i96690# 2009-01-16 17:09:19 +0100 jl r266439 : #i96690# ignore duplicate path URLs in manifest.xml. These may be introduces by copy/paste and lead to nasty errors 2009-01-16 14:04:00 +0100 jl r266416 : #i92032# increasing minimum version of Java 2009-01-16 10:57:02 +0100 jl r266407 : #i96816# compiler warning breaks build 2009-01-15 16:58:54 +0100 jl r266384 : #i94938# patch from cmc. 2009-01-15 16:35:18 +0100 jl r266383 : #i95838# applying patch 2009-01-15 16:15:58 +0100 jl r266381 : #i70855# #i96102# WaitForMultipleObjects wrong implemented 2009-01-14 12:46:21 +0100 jl r266287 : #i98038# increased assembly versions 2009-01-14 12:44:55 +0100 jl r266285 : #i98038# increased assembly versions 2009-01-13 17:11:20 +0100 jl r266239 : #i98038# new test library for assemblies from 3.0.1
Diffstat (limited to 'stoc')
-rw-r--r--stoc/source/servicemanager/servicemanager.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index 8b528afc953f..78dffbcb9c32 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -1646,11 +1646,12 @@ void OServiceManager::remove( const Any & Element )
OUString( RTL_CONSTASCII_USTRINGPARAM("element is not in!") ),
static_cast< OWeakObject * >(this) );
}
-
- // remove from the implementation map
+ //First remove all factories which have been loaded by ORegistryServiceManager.
+ m_SetLoadedFactories.erase( *aIt);
+ //Remove from the implementation map. It contains all factories of m_SetLoadedFactories
+ //which have been added directly through XSet, that is not via ORegistryServiceManager
m_ImplementationMap.erase( aIt );
- m_SetLoadedFactories.erase( *aIt);
// remove from the implementation name hashmap
Reference<XServiceInfo > xInfo( Reference<XServiceInfo >::query( xEle ) );
if( xInfo.is() )