diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-06-01 15:34:41 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-06-01 15:35:10 +0100 |
commit | c1abc2ec9efcae4c0da96699631ae7c12f1dc5eb (patch) | |
tree | 04ca153ba68c82394b8d019fa51837a07bd4896f /stoc/source/invocation_adapterfactory | |
parent | 91cbb7b7d0d0b45e5287a8d5f9f6c51380dab15a (diff) |
fix up
Diffstat (limited to 'stoc/source/invocation_adapterfactory')
-rw-r--r-- | stoc/source/invocation_adapterfactory/iafactory.cxx | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx index 4b9b03bec845..b8d3939928d8 100644 --- a/stoc/source/invocation_adapterfactory/iafactory.cxx +++ b/stoc/source/invocation_adapterfactory/iafactory.cxx @@ -76,34 +76,15 @@ static rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT; static Sequence< OUString > invadp_getSupportedServiceNames() { - static Sequence < OUString > *pNames = 0; - if( ! pNames ) - { - MutexGuard guard( Mutex::getGlobalMutex() ); - if( !pNames ) - { - static Sequence< OUString > seqNames(1); - seqNames.getArray()[0] = - OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME)); - pNames = &seqNames; - } - } - return *pNames; + Sequence< OUString > seqNames(1); + seqNames.getArray()[0] = + OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME)); + return seqNames; } static OUString invadp_getImplementationName() { - static OUString *pImplName = 0; - if( ! pImplName ) - { - MutexGuard guard( Mutex::getGlobalMutex() ); - if( ! pImplName ) - { - static OUString implName( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME ) ); - pImplName = &implName; - } - } - return *pImplName; + return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME)); } struct hash_ptr |