summaryrefslogtreecommitdiff
path: root/stoc/source/defaultregistry
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-06-01 15:34:41 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-06-01 15:35:10 +0100
commitc1abc2ec9efcae4c0da96699631ae7c12f1dc5eb (patch)
tree04ca153ba68c82394b8d019fa51837a07bd4896f /stoc/source/defaultregistry
parent91cbb7b7d0d0b45e5287a8d5f9f6c51380dab15a (diff)
fix up
Diffstat (limited to 'stoc/source/defaultregistry')
-rw-r--r--stoc/source/defaultregistry/defaultregistry.cxx27
1 files changed, 4 insertions, 23 deletions
diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx
index f36b2f172aa7..2dae9012cbab 100644
--- a/stoc/source/defaultregistry/defaultregistry.cxx
+++ b/stoc/source/defaultregistry/defaultregistry.cxx
@@ -66,33 +66,14 @@ namespace stoc_bootstrap
{
Sequence< OUString > defreg_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;
}
OUString defreg_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));
}
}