summaryrefslogtreecommitdiff
path: root/remotebridges
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 /remotebridges
parent91cbb7b7d0d0b45e5287a8d5f9f6c51380dab15a (diff)
fix up
Diffstat (limited to 'remotebridges')
-rw-r--r--remotebridges/source/unourl_resolver/unourl_resolver.cxx28
1 files changed, 4 insertions, 24 deletions
diff --git a/remotebridges/source/unourl_resolver/unourl_resolver.cxx b/remotebridges/source/unourl_resolver/unourl_resolver.cxx
index 5de6e0478ac7..422241e6dbe5 100644
--- a/remotebridges/source/unourl_resolver/unourl_resolver.cxx
+++ b/remotebridges/source/unourl_resolver/unourl_resolver.cxx
@@ -63,34 +63,14 @@ namespace unourl_resolver
//--------------------------------------------------------------------------------------------------
Sequence< OUString > resolver_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 resolver_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));
}
//==================================================================================================