[Libreoffice-commits] .: animations/source
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Jun 3 05:46:03 PDT 2011
animations/source/animcore/animcore.cxx | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
New commits:
commit 6b1f0490fb5e47825746ed5c7f911fb0b844cef6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jun 3 12:32:14 2011 +0100
use standard template for this
diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx
index debcd48..cfed7a2 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();
}
// --------------------------------------------------------------------
More information about the Libreoffice-commits
mailing list