diff options
Diffstat (limited to 'comphelper/source/property/genericpropertyset.cxx')
| -rw-r--r-- | comphelper/source/property/genericpropertyset.cxx | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx index b7fb09912153..008646001331 100644 --- a/comphelper/source/property/genericpropertyset.cxx +++ b/comphelper/source/property/genericpropertyset.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,11 +37,9 @@ #include <comphelper/genericpropertyset.hxx> #include <comphelper/propertysetinfo.hxx> #include <comphelper/stl_types.hxx> -#include <vos/mutex.hxx> +#include <comphelper/servicehelper.hxx> +#include <osl/mutex.hxx> #include <rtl/uuid.h> -#include <boost/mem_fn.hpp> -#include <boost/bind.hpp> -#include <boost/utility.hpp> /////////////////////////////////////////////////////////////////////// @@ -253,18 +252,15 @@ uno::Sequence< uno::Type > SAL_CALL GenericPropertySet::getTypes() return aTypes; } +namespace +{ + class theGenericPropertySetImplmentationId : public rtl::Static< UnoTunnelIdInit, theGenericPropertySetImplmentationId > {}; +} + uno::Sequence< sal_Int8 > SAL_CALL GenericPropertySet::getImplementationId() throw (uno::RuntimeException) { - MutexGuard aGuard( maMutex ); - - static uno::Sequence< sal_Int8 > aId; - if( aId.getLength() == 0 ) - { - aId.realloc( 16 ); - rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True ); - } - return aId; + return theGenericPropertySetImplmentationId::get().getSeq(); } // XServiceInfo @@ -299,3 +295,4 @@ Sequence< OUString > SAL_CALL GenericPropertySet::getSupportedServiceNames( ) return (XPropertySet*)new GenericPropertySet( pInfo ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |