diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-06-03 12:32:14 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-06-03 13:43:35 +0100 |
| commit | 92e87955954bdbd07fe103611077e6409f3f4a0d (patch) | |
| tree | 00130f1ff6de54e7a33dc06d0efc6dc0e298b725 /animations | |
| parent | c8265c1582c8f5f8befd0b7ef73561846b270396 (diff) | |
use standard template for this
Diffstat (limited to 'animations')
| -rw-r--r-- | animations/source/animcore/animcore.cxx | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx index 3d7902ce89e8..1a1258f7312f 100644 --- a/animations/source/animcore/animcore.cxx +++ b/animations/source/animcore/animcore.cxx @@ -53,8 +53,8 @@ #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/util/XChangesNotifier.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> +#include <comphelper/servicehelper.hxx> #include <cppuhelper/interfacecontainer.hxx> - #include <cppuhelper/implbase1.hxx> #include <rtl/uuid.h> @@ -2041,22 +2041,14 @@ void SAL_CALL AnimationNode::removeChangesListener( const Reference< XChangesLis } } -// -------------------------------------------------------------------- +namespace +{ + class theAnimationNodeUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theAnimationNodeUnoTunnelId > {}; +} const ::com::sun::star::uno::Sequence< sal_Int8 > & AnimationNode::getUnoTunnelId() { - static ::com::sun::star::uno::Sequence< sal_Int8 > * pSeq = 0; - if( !pSeq ) - { - ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ); - if( !pSeq ) - { - static ::com::sun::star::uno::Sequence< sal_Int8 > aSeq( 16 ); - rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True ); - pSeq = &aSeq; - } - } - return *pSeq; + return theAnimationNodeUnoTunnelId::get().getSeq(); } // -------------------------------------------------------------------- |