animations : use cppuhelper::BaseMutex

Change-Id: Ife2b5480ad26c01388f5803f1cc5ae1e9e44a123
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128842
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 122 insertions, 124 deletions

diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx
index 5f20fa16139b..f72c15701b53 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -47,6 +47,7 @@
 #include <com/sun/star/util/XChangesNotifier.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <comphelper/servicehelper.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <comphelper/interfacecontainer3.hxx>
 #include <cppuhelper/supportsservice.hxx>
@@ -102,8 +103,8 @@ namespace animcore
 {
 
 namespace {
-
-class AnimationNodeBase :   public XAnimateMotion,
+class AnimationNodeBase :   public cppu::BaseMutex,
+                            public XAnimateMotion,
                             public XAnimatePhysics,
                             public XAnimateColor,
                             public XTransitionFilter,
@@ -120,12 +121,10 @@ class AnimationNodeBase :   public XAnimateMotion,
                             public XUnoTunnel,
                             public OWeakObject
 {
-public:
-    // our first, last and only protection from multi-threads!
-    Mutex maMutex;
+
 };
 
-class AnimationNode final : public AnimationNodeBase
+class AnimationNode final:  public AnimationNodeBase
 {
 public:
     explicit AnimationNode(sal_Int16 nNodeType);
@@ -367,7 +366,8 @@ private:
 };
 
 
-class TimeContainerEnumeration : public ::cppu::WeakImplHelper< XEnumeration >
+class TimeContainerEnumeration : private cppu::BaseMutex,
+                                 public ::cppu::WeakImplHelper< XEnumeration >
 {
 public:
     explicit TimeContainerEnumeration( std::vector< Reference< XAnimationNode > >&& rChildren );
@@ -382,9 +382,6 @@ private:
 
     /** current iteration position */
     std::vector< Reference< XAnimationNode > >::iterator   maIter;
-
-    /** our first, last and only protection from multi-threads! */
-    Mutex                   maMutex;
 };
 
 }
@@ -398,14 +395,14 @@ TimeContainerEnumeration::TimeContainerEnumeration( std::vector< Reference< XAni
 // Methods
 sal_Bool SAL_CALL TimeContainerEnumeration::hasMoreElements()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
 
     return maIter != maChildren.end();
 }
 
 Any SAL_CALL TimeContainerEnumeration::nextElement()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
 
     if( maIter == maChildren.end() )
         throw NoSuchElementException();
@@ -417,7 +414,8 @@ Any SAL_CALL TimeContainerEnumeration::nextElement()
 std::array<Sequence< Type >*, 13> AnimationNode::mpTypes = { nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr };
 
 AnimationNode::AnimationNode( sal_Int16 nNodeType )
-:   maChangeListener(maMutex),
+:   AnimationNodeBase(),
+    maChangeListener(m_aMutex),
     mnNodeType( nNodeType ),
     mnFill( AnimationFill::DEFAULT ),
     mnFillDefault( AnimationFill::INHERIT ),
@@ -451,7 +449,7 @@ AnimationNode::AnimationNode( sal_Int16 nNodeType )
 
 AnimationNode::AnimationNode( const AnimationNode& rNode )
 :   AnimationNodeBase(),
-    maChangeListener(maMutex),
+    maChangeListener(m_aMutex),
     mnNodeType( rNode.mnNodeType ),
 
     // attributes for the XAnimationNode interface implementation
@@ -926,7 +924,7 @@ Sequence< OUString > AnimationNode::getSupportedServiceNames()
 // XAnimationNode
 sal_Int16 SAL_CALL AnimationNode::getType()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return mnNodeType;
 }
 
@@ -934,7 +932,7 @@ sal_Int16 SAL_CALL AnimationNode::getType()
 // XAnimationNode
 Any SAL_CALL AnimationNode::getBegin()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return maBegin;
 }
 
@@ -942,7 +940,7 @@ Any SAL_CALL AnimationNode::getBegin()
 // XAnimationNode
 void SAL_CALL AnimationNode::setBegin( const Any& _begin )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( _begin != maBegin )
     {
         maBegin = _begin;
@@ -954,7 +952,7 @@ void SAL_CALL AnimationNode::setBegin( const Any& _begin )
 // XAnimationNode
 Any SAL_CALL AnimationNode::getDuration()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return maDuration;
 }
 
@@ -962,7 +960,7 @@ Any SAL_CALL AnimationNode::getDuration()
 // XAnimationNode
 void SAL_CALL AnimationNode::setDuration( const Any& _duration )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( _duration != maDuration )
     {
         maDuration = _duration;
@@ -974,7 +972,7 @@ void SAL_CALL AnimationNode::setDuration( const Any& _duration )
 // XAnimationNode
 Any SAL_CALL AnimationNode::getEnd()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return maEnd;
 }
 
@@ -982,7 +980,7 @@ Any SAL_CALL AnimationNode::getEnd()
 // XAnimationNode
 void SAL_CALL AnimationNode::setEnd( const Any& _end )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( _end != maEnd )
     {
         maEnd = _end;
@@ -994,7 +992,7 @@ void SAL_CALL AnimationNode::setEnd( const Any& _end )
 // XAnimationNode
 Any SAL_CALL AnimationNode::getEndSync()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return maEndSync;
 }
 
@@ -1002,7 +1000,7 @@ Any SAL_CALL AnimationNode::getEndSync()
 // XAnimationNode
 void SAL_CALL AnimationNode::setEndSync( const Any& _endsync )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( _endsync != maEndSync )
     {
         maEndSync = _endsync;
@@ -1014,7 +1012,7 @@ void SAL_CALL AnimationNode::setEndSync( const Any& _endsync )
 // XAnimationNode
 Any SAL_CALL AnimationNode::getRepeatCount()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return maRepeatCount;
 }
 
@@ -1022,7 +1020,7 @@ Any SAL_CALL AnimationNode::getRepeatCount()
 // XAnimationNode
 void SAL_CALL AnimationNode::setRepeatCount( const Any& _repeatcount )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( _repeatcount != maRepeatCount )
     {
         maRepeatCount = _repeatcount;
@@ -1034,7 +1032,7 @@ void SAL_CALL AnimationNode::setRepeatCount( const Any& _repeatcount )
 // XAnimationNode
 Any SAL_CALL AnimationNode::getRepeatDuration()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return maRepeatDuration;
 }
 
@@ -1042,7 +1040,7 @@ Any SAL_CALL AnimationNode::getRepeatDuration()
 // XAnimationNode
 void SAL_CALL AnimationNode::setRepeatDuration( const Any& _repeatduration )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( _repeatduration != maRepeatDuration )
     {
         maRepeatDuration = _repeatduration;
@@ -1054,7 +1052,7 @@ void SAL_CALL AnimationNode::setRepeatDuration( const Any& _repeatduration )
 // XAnimationNode
 sal_Int16 SAL_CALL AnimationNode::getFill()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return mnFill;
 }
 
@@ -1062,7 +1060,7 @@ sal_Int16 SAL_CALL AnimationNode::getFill()
 // XAnimationNode
 void SAL_CALL AnimationNode::setFill( sal_Int16 _fill )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( _fill != mnFill )
     {
         mnFill = _fill;
@@ -1074,7 +1072,7 @@ void SAL_CALL AnimationNode::setFill( sal_Int16 _fill )
 // XAnimationNode
 sal_Int16 SAL_CALL AnimationNode::getFillDefault()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return mnFillDefault;
 }
 
@@ -1082,7 +1080,7 @@ sal_Int16 SAL_CALL AnimationNode::getFillDefault()
 // XAnimationNode
 void SAL_CALL AnimationNode::setFillDefault( sal_Int16 _filldefault )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( _filldefault != mnFillDefault )
     {
         mnFillDefault = _filldefault;
@@ -1094,7 +1092,7 @@ void SAL_CALL AnimationNode::setFillDefault( sal_Int16 _filldefault )
 // XAnimationNode
 sal_Int16 SAL_CALL AnimationNode::getRestart()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return mnRestart;
 }
 
@@ -1102,7 +1100,7 @@ sal_Int16 SAL_CALL AnimationNode::getRestart()
 // XAnimationNode
 void SAL_CALL AnimationNode::setRestart( sal_Int16 _restart )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( _restart != mnRestart )
     {
         mnRestart = _restart;
@@ -1114,7 +1112,7 @@ void SAL_CALL AnimationNode::setRestart( sal_Int16 _restart )
 // XAnimationNode
 sal_Int16 SAL_CALL AnimationNode::getRestartDefault()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return mnRestartDefault;
 }
 
@@ -1122,7 +1120,7 @@ sal_Int16 SAL_CALL AnimationNode::getRestartDefault()
 // XAnimationNode
 void SAL_CALL AnimationNode::setRestartDefault( sal_Int16 _restartdefault )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( _restartdefault != mnRestartDefault )
     {
         mnRestartDefault = _restartdefault;
@@ -1134,7 +1132,7 @@ void SAL_CALL AnimationNode::setRestartDefault( sal_Int16 _restartdefault )
 // XAnimationNode
 double SAL_CALL AnimationNode::getAcceleration()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return mfAcceleration;
 }
 
@@ -1142,7 +1140,7 @@ double SAL_CALL AnimationNode::getAcceleration()
 // XAnimationNode
 void SAL_CALL AnimationNode::setAcceleration( double _acceleration )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( _acceleration != mfAcceleration )
     {
         mfAcceleration = _acceleration;
@@ -1154,7 +1152,7 @@ void SAL_CALL AnimationNode::setAcceleration( double _acceleration )
 // XAnimationNode
 double SAL_CALL AnimationNode::getDecelerate()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return mfDecelerate;
 }
 
@@ -1162,7 +1160,7 @@ double SAL_CALL AnimationNode::getDecelerate()
 // XAnimationNode
 void SAL_CALL AnimationNode::setDecelerate( double _decelerate )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( _decelerate != mfDecelerate )
     {
         mfDecelerate = _decelerate;
@@ -1174,7 +1172,7 @@ void SAL_CALL AnimationNode::setDecelerate( double _decelerate )
 // XAnimationNode
 sal_Bool SAL_CALL AnimationNode::getAutoReverse()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return mbAutoReverse;
 }
 
@@ -1182,7 +1180,7 @@ sal_Bool SAL_CALL AnimationNode::getAutoReverse()
 // XAnimationNode
 void SAL_CALL AnimationNode::setAutoReverse( sal_Bool _autoreverse )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( bool(_autoreverse) != mbAutoReverse )
     {
         mbAutoReverse = _autoreverse;
@@ -1193,14 +1191,14 @@ void SAL_CALL AnimationNode::setAutoReverse( sal_Bool _autoreverse )
 
 Sequence< NamedValue > SAL_CALL AnimationNode::getUserData()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return maUserData;
 }
 
 
 void SAL_CALL AnimationNode::setUserData( const Sequence< NamedValue >& _userdata )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     maUserData = _userdata;
     fireChangeListener();
 }
@@ -1209,7 +1207,7 @@ void SAL_CALL AnimationNode::setUserData( const Sequence< NamedValue >& _userdat
 // XChild
 Reference< XInterface > SAL_CALL AnimationNode::getParent()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return mxParent.get();
 }
 
@@ -1217,7 +1215,7 @@ Reference< XInterface > SAL_CALL AnimationNode::getParent()
 // XChild
 void SAL_CALL AnimationNode::setParent( const Reference< XInterface >& Parent )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( Parent != mxParent.get() )
     {
         mxParent = Parent;
@@ -1231,7 +1229,7 @@ void SAL_CALL AnimationNode::setParent( const Reference< XInterface >& Parent )
 // XCloneable
 Reference< XCloneable > SAL_CALL AnimationNode::createClone()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
 
     Reference< XCloneable > xNewNode;
     try
@@ -1272,7 +1270,7 @@ Reference< XCloneable > SAL_CALL AnimationNode::createClone()
 // XAnimate
 Any SAL_CALL AnimationNode::getTarget()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return maTarget;
 }
 
@@ -1280,7 +1278,7 @@ Any SAL_CALL AnimationNode::getTarget()
 // XAnimate
 void SAL_CALL AnimationNode::setTarget( const Any& _target )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( _target != maTarget )
     {
         maTarget= _target;
@@ -1292,7 +1290,7 @@ void SAL_CALL AnimationNode::setTarget( const Any& _target )
 // XAnimate
 OUString SAL_CALL AnimationNode::getAttributeName()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return maAttributeName;
 }
 
@@ -1300,7 +1298,7 @@ OUString SAL_CALL AnimationNode::getAttributeName()
 // XAnimate
 void SAL_CALL AnimationNode::setAttributeName( const OUString& _attribute )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( _attribute != maAttributeName )
     {
         maAttributeName = _attribute;
@@ -1312,7 +1310,7 @@ void SAL_CALL AnimationNode::setAttributeName( const OUString& _attribute )
 // XAnimate
 Sequence< Any > SAL_CALL AnimationNode::getValues()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return maValues;
 }
 
@@ -1320,7 +1318,7 @@ Sequence< Any > SAL_CALL AnimationNode::getValues()
 // XAnimate
 void SAL_CALL AnimationNode::setValues( const Sequence< Any >& _values )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     maValues = _values;
     fireChangeListener();
 }
@@ -1329,7 +1327,7 @@ void SAL_CALL AnimationNode::setValues( const Sequence< Any >& _values )
 // XAnimate
 sal_Int16 SAL_CALL AnimationNode::getSubItem()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return mnSubItem;
 }
 
@@ -1337,7 +1335,7 @@ sal_Int16 SAL_CALL AnimationNode::getSubItem()
 // XAnimate
 void SAL_CALL AnimationNode::setSubItem( sal_Int16 _subitem )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( _subitem != mnSubItem )
     {
         mnSubItem = _subitem;
@@ -1349,7 +1347,7 @@ void SAL_CALL AnimationNode::setSubItem( sal_Int16 _subitem )
 // XAnimate
 Sequence< double > SAL_CALL AnimationNode::getKeyTimes()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return maKeyTimes;
 }
 
@@ -1357,7 +1355,7 @@ Sequence< double > SAL_CALL AnimationNode::getKeyTimes()
 // XAnimate
 void SAL_CALL AnimationNode::setKeyTimes( const Sequence< double >& _keytimes )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     maKeyTimes = _keytimes;
     fireChangeListener();
 }
@@ -1366,14 +1364,14 @@ void SAL_CALL AnimationNode::setKeyTimes( const Sequence< double >& _keytimes )
 // XAnimate
 sal_Int16 SAL_CALL AnimationNode::getValueType()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return mnValueType;
 }
 
 
 void SAL_CALL AnimationNode::setValueType( sal_Int16 _valuetype )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( _valuetype != mnValueType )
     {
         mnValueType = _valuetype;
@@ -1385,7 +1383,7 @@ void SAL_CALL AnimationNode::setValueType( sal_Int16 _valuetype )
 // XAnimate
 sal_Int16 SAL_CALL AnimationNode::getCalcMode()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return mnCalcMode;
 }
 
@@ -1393,7 +1391,7 @@ sal_Int16 SAL_CALL AnimationNode::getCalcMode()
 // XAnimate
 void SAL_CALL AnimationNode::setCalcMode( sal_Int16 _calcmode )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( _calcmode != mnCalcMode )
     {
         mnCalcMode = _calcmode;
@@ -1405,7 +1403,7 @@ void SAL_CALL AnimationNode::setCalcMode( sal_Int16 _calcmode )
 // XAnimate
 sal_Bool SAL_CALL AnimationNode::getAccumulate()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return mbAccumulate;
 }
 
@@ -1413,7 +1411,7 @@ sal_Bool SAL_CALL AnimationNode::getAccumulate()
 // XAnimate
 void SAL_CALL AnimationNode::setAccumulate( sal_Bool _accumulate )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( bool(_accumulate) != mbAccumulate )
     {
         mbAccumulate = _accumulate;
@@ -1425,7 +1423,7 @@ void SAL_CALL AnimationNode::setAccumulate( sal_Bool _accumulate )
 // XAnimate
 sal_Int16 SAL_CALL AnimationNode::getAdditive()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return mnAdditive;
 }
 
@@ -1433,7 +1431,7 @@ sal_Int16 SAL_CALL AnimationNode::getAdditive()
 // XAnimate
 void SAL_CALL AnimationNode::setAdditive( sal_Int16 _additive )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( _additive != mnAdditive )
     {
         mnAdditive = _additive;
@@ -1445,7 +1443,7 @@ void SAL_CALL AnimationNode::setAdditive( sal_Int16 _additive )
 // XAnimate
 Any SAL_CALL AnimationNode::getFrom()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return maFrom;
 }
 
@@ -1453,7 +1451,7 @@ Any SAL_CALL AnimationNode::getFrom()
 // XAnimate
 void SAL_CALL AnimationNode::setFrom( const Any& _from )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( _from != maFrom )
     {
         maFrom = _from;
@@ -1465,7 +1463,7 @@ void SAL_CALL AnimationNode::setFrom( const Any& _from )
 // XAnimate
 Any SAL_CALL AnimationNode::getTo()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return maTo;
 }
 
@@ -1473,7 +1471,7 @@ Any SAL_CALL AnimationNode::getTo()
 // XAnimate
 void SAL_CALL AnimationNode::setTo( const Any& _to )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( _to != maTo )
     {
         maTo = _to;
@@ -1485,7 +1483,7 @@ void SAL_CALL AnimationNode::setTo( const Any& _to )
 // XAnimate
 Any SAL_CALL AnimationNode::getBy()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return maBy;
 }
 
@@ -1493,7 +1491,7 @@ Any SAL_CALL AnimationNode::getBy()
 // XAnimate
 void SAL_CALL AnimationNode::setBy( const Any& _by )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( _by != maBy )
     {
         maBy = _by;
@@ -1505,7 +1503,7 @@ void SAL_CALL AnimationNode::setBy( const Any& _by )
 // XAnimate
 Sequence< TimeFilterPair > SAL_CALL AnimationNode::getTimeFilter()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return maTimeFilter;
 }
 
@@ -1513,7 +1511,7 @@ Sequence< TimeFilterPair > SAL_CALL AnimationNode::getTimeFilter()
 // XAnimate
 void SAL_CALL AnimationNode::setTimeFilter( const Sequence< TimeFilterPair >& _timefilter )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     maTimeFilter = _timefilter;
     fireChangeListener();
 }
@@ -1521,14 +1519,14 @@ void SAL_CALL AnimationNode::setTimeFilter( const Sequence< TimeFilterPair >& _t
 
 OUString SAL_CALL AnimationNode::getFormula()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return maFormula;
 }
 
 
 void SAL_CALL AnimationNode::setFormula( const OUString& _formula )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( _formula != maFormula )
     {
         maFormula = _formula;
@@ -1540,7 +1538,7 @@ void SAL_CALL AnimationNode::setFormula( const OUString& _formula )
 // XAnimateColor
 sal_Int16 SAL_CALL AnimationNode::getColorInterpolation()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return mnColorSpace;
 }
 
@@ -1548,7 +1546,7 @@ sal_Int16 SAL_CALL AnimationNode::getColorInterpolation()
 // XAnimateColor
 void SAL_CALL AnimationNode::setColorInterpolation( sal_Int16 _colorspace )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( _colorspace != mnColorSpace )
     {
         mnColorSpace = _colorspace;
@@ -1560,7 +1558,7 @@ void SAL_CALL AnimationNode::setColorInterpolation( sal_Int16 _colorspace )
 // XAnimateColor
 sal_Bool SAL_CALL AnimationNode::getDirection()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return mbDirection;
 }
 
@@ -1568,7 +1566,7 @@ sal_Bool SAL_CALL AnimationNode::getDirection()
 // XAnimateColor
 void SAL_CALL AnimationNode::setDirection( sal_Bool _direction )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( bool(_direction) != mbDirection )
     {
         mbDirection = _direction;
@@ -1580,7 +1578,7 @@ void SAL_CALL AnimationNode::setDirection( sal_Bool _direction )
 // XAnimateMotion
 Any SAL_CALL AnimationNode::getPath()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return maPath;
 }
 
@@ -1588,7 +1586,7 @@ Any SAL_CALL AnimationNode::getPath()
 // XAnimateMotion
 void SAL_CALL AnimationNode::setPath( const Any& _path )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     maPath = _path;
     fireChangeListener();
 }
@@ -1597,7 +1595,7 @@ void SAL_CALL AnimationNode::setPath( const Any& _path )
 // XAnimateMotion
 Any SAL_CALL AnimationNode::getOrigin()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return maOrigin;
 }
 
@@ -1605,7 +1603,7 @@ Any SAL_CALL AnimationNode::getOrigin()
 // XAnimateMotion
 void SAL_CALL AnimationNode::setOrigin( const Any& _origin )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     maOrigin = _origin;
     fireChangeListener();
 }
@@ -1613,7 +1611,7 @@ void SAL_CALL AnimationNode::setOrigin( const Any& _origin )
 // XAnimatePhysics
 Any SAL_CALL AnimationNode::getStartVelocityX()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return maStartVelocityX;
 }
 
@@ -1621,7 +1619,7 @@ Any SAL_CALL AnimationNode::getStartVelocityX()
 // XAnimatePhysics
 void SAL_CALL AnimationNode::setStartVelocityX( const Any& _startvelocityx )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     maStartVelocityX = _startvelocityx;
     fireChangeListener();
 }
@@ -1629,7 +1627,7 @@ void SAL_CALL AnimationNode::setStartVelocityX( const Any& _startvelocityx )
 // XAnimatePhysics
 Any SAL_CALL AnimationNode::getStartVelocityY()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return maStartVelocityY;
 }
 
@@ -1637,7 +1635,7 @@ Any SAL_CALL AnimationNode::getStartVelocityY()
 // XAnimatePhysics
 void SAL_CALL AnimationNode::setStartVelocityY( const Any& _startvelocityy )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     maStartVelocityY = _startvelocityy;
     fireChangeListener();
 }
@@ -1646,7 +1644,7 @@ void SAL_CALL AnimationNode::setStartVelocityY( const Any& _startvelocityy )
 // XAnimatePhysics
 Any SAL_CALL AnimationNode::getDensity()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return maDensity;
 }
 
@@ -1654,7 +1652,7 @@ Any SAL_CALL AnimationNode::getDensity()
 // XAnimatePhysics
 void SAL_CALL AnimationNode::setDensity( const Any& _density )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     maDensity = _density;
     fireChangeListener();
 }
@@ -1663,7 +1661,7 @@ void SAL_CALL AnimationNode::setDensity( const Any& _density )
 // XAnimatePhysics
 Any SAL_CALL AnimationNode::getBounciness()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return maBounciness;
 }
 
@@ -1671,7 +1669,7 @@ Any SAL_CALL AnimationNode::getBounciness()
 // XAnimatePhysics
 void SAL_CALL AnimationNode::setBounciness( const Any& _bounciness )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     maBounciness = _bounciness;
     fireChangeListener();
 }
@@ -1680,7 +1678,7 @@ void SAL_CALL AnimationNode::setBounciness( const Any& _bounciness )
 // XAnimateTransform
 sal_Int16 SAL_CALL AnimationNode::getTransformType()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return mnTransformType;
 }
 
@@ -1688,7 +1686,7 @@ sal_Int16 SAL_CALL AnimationNode::getTransformType()
 // XAnimateTransform
 void SAL_CALL AnimationNode::setTransformType( sal_Int16 _transformtype )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( _transformtype != mnTransformType )
     {
         mnTransformType = _transformtype;
@@ -1700,7 +1698,7 @@ void SAL_CALL AnimationNode::setTransformType( sal_Int16 _transformtype )
 // XTransitionFilter
 sal_Int16 SAL_CALL AnimationNode::getTransition()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return mnTransition;
 }
 
@@ -1708,7 +1706,7 @@ sal_Int16 SAL_CALL AnimationNode::getTransition()
 // XTransitionFilter
 void SAL_CALL AnimationNode::setTransition( sal_Int16 _transition )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( _transition != mnTransition )
     {
         mnTransition = _transition;
@@ -1720,7 +1718,7 @@ void SAL_CALL AnimationNode::setTransition( sal_Int16 _transition )
 // XTransitionFilter
 sal_Int16 SAL_CALL AnimationNode::getSubtype()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return mnSubtype;
 }
 
@@ -1728,7 +1726,7 @@ sal_Int16 SAL_CALL AnimationNode::getSubtype()
 // XTransitionFilter
 void SAL_CALL AnimationNode::setSubtype( sal_Int16 _subtype )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( _subtype != mnSubtype )
     {
         mnSubtype = _subtype;
@@ -1740,7 +1738,7 @@ void SAL_CALL AnimationNode::setSubtype( sal_Int16 _subtype )
 // XTransitionFilter
 sal_Bool SAL_CALL AnimationNode::getMode()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return mbMode;
 }
 
@@ -1748,7 +1746,7 @@ sal_Bool SAL_CALL AnimationNode::getMode()
 // XTransitionFilter
 void SAL_CALL AnimationNode::setMode( sal_Bool _mode )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( bool(_mode) != mbMode )
     {
         mbMode = _mode;
@@ -1760,7 +1758,7 @@ void SAL_CALL AnimationNode::setMode( sal_Bool _mode )
 // XTransitionFilter
 sal_Int32 SAL_CALL AnimationNode::getFadeColor()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return mnFadeColor;
 }
 
@@ -1768,7 +1766,7 @@ sal_Int32 SAL_CALL AnimationNode::getFadeColor()
 // XTransitionFilter
 void SAL_CALL AnimationNode::setFadeColor( sal_Int32 _fadecolor )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( _fadecolor != mnFadeColor )
     {
         mnFadeColor = _fadecolor;
@@ -1780,7 +1778,7 @@ void SAL_CALL AnimationNode::setFadeColor( sal_Int32 _fadecolor )
 // XAudio
 Any SAL_CALL AnimationNode::getSource()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return maTarget;
 }
 
@@ -1788,7 +1786,7 @@ Any SAL_CALL AnimationNode::getSource()
 // XAudio
 void SAL_CALL AnimationNode::setSource( const Any& _source )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     maTarget = _source;
     fireChangeListener();
 }
@@ -1797,7 +1795,7 @@ void SAL_CALL AnimationNode::setSource( const Any& _source )
 // XAudio
 double SAL_CALL AnimationNode::getVolume()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return mfVolume;
 }
 
@@ -1805,7 +1803,7 @@ double SAL_CALL AnimationNode::getVolume()
 // XAudio
 void SAL_CALL AnimationNode::setVolume( double _volume )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( _volume != mfVolume )
     {
         mfVolume = _volume;
@@ -1815,13 +1813,13 @@ void SAL_CALL AnimationNode::setVolume( double _volume )
 
 sal_Bool SAL_CALL AnimationNode::getHideDuringShow()
 {
-    osl::Guard<osl::Mutex> aGuard(maMutex);
+    osl::Guard<osl::Mutex> aGuard(m_aMutex);
     return mbHideDuringShow;
 }
 
 void SAL_CALL AnimationNode::setHideDuringShow(sal_Bool bHideDuringShow)
 {
-    osl::Guard<osl::Mutex> aGuard(maMutex);
+    osl::Guard<osl::Mutex> aGuard(m_aMutex);
     if (static_cast<bool>(bHideDuringShow) != mbHideDuringShow)
     {
         mbHideDuringShow = bHideDuringShow;
@@ -1831,13 +1829,13 @@ void SAL_CALL AnimationNode::setHideDuringShow(sal_Bool bHideDuringShow)
 
 sal_Bool SAL_CALL AnimationNode::getNarration()
 {
-    osl::Guard<osl::Mutex> aGuard(maMutex);
+    osl::Guard<osl::Mutex> aGuard(m_aMutex);
     return mbNarration;
 }
 
 void SAL_CALL AnimationNode::setNarration(sal_Bool bNarration)
 {
-    osl::Guard<osl::Mutex> aGuard(maMutex);
+    osl::Guard<osl::Mutex> aGuard(m_aMutex);
     if (static_cast<bool>(bNarration) != mbNarration)
     {
         mbNarration = bNarration;
@@ -1848,7 +1846,7 @@ void SAL_CALL AnimationNode::setNarration(sal_Bool bNarration)
 // XCommand
 sal_Int16 SAL_CALL AnimationNode::getCommand()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return mnCommand;
 }
 
@@ -1856,7 +1854,7 @@ sal_Int16 SAL_CALL AnimationNode::getCommand()
 // XCommand
 void SAL_CALL AnimationNode::setCommand( sal_Int16 _command )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( _command != mnCommand )
     {
         mnCommand = _command;
@@ -1868,7 +1866,7 @@ void SAL_CALL AnimationNode::setCommand( sal_Int16 _command )
 // XCommand
 Any SAL_CALL AnimationNode::getParameter()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return maParameter;
 }
 
@@ -1876,7 +1874,7 @@ Any SAL_CALL AnimationNode::getParameter()
 // XCommand
 void SAL_CALL AnimationNode::setParameter( const Any& _parameter )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     maParameter = _parameter;
     fireChangeListener();
 }
@@ -1892,7 +1890,7 @@ Type SAL_CALL AnimationNode::getElementType()
 // XElementAccess
 sal_Bool SAL_CALL AnimationNode::hasElements()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return !maChildren.empty();
 }
 
@@ -1900,7 +1898,7 @@ sal_Bool SAL_CALL AnimationNode::hasElements()
 // XEnumerationAccess
 Reference< XEnumeration > SAL_CALL AnimationNode::createEnumeration()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
 
     return new TimeContainerEnumeration(std::vector(maChildren));
 }
@@ -1909,7 +1907,7 @@ Reference< XEnumeration > SAL_CALL AnimationNode::createEnumeration()
 // XTimeContainer
 Reference< XAnimationNode > SAL_CALL AnimationNode::insertBefore( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
 
     if( !newChild.is() || !refChild.is() )
         throw IllegalArgumentException("no child", static_cast<cppu::OWeakObject*>(this), -1);
@@ -1933,7 +1931,7 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::insertBefore( const Referenc
 // XTimeContainer
 Reference< XAnimationNode > SAL_CALL AnimationNode::insertAfter( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
 
     if( !newChild.is() || !refChild.is() )
         throw IllegalArgumentException("no child", static_cast<cppu::OWeakObject*>(this), -1);
@@ -1961,7 +1959,7 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::insertAfter( const Reference
 // XTimeContainer
 Reference< XAnimationNode > SAL_CALL AnimationNode::replaceChild( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& oldChild )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
 
     if( !newChild.is() || !oldChild.is() )
         throw IllegalArgumentException("no child", static_cast<cppu::OWeakObject*>(this), -1);
@@ -1987,7 +1985,7 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::replaceChild( const Referenc
 // XTimeContainer
 Reference< XAnimationNode > SAL_CALL AnimationNode::removeChild( const Reference< XAnimationNode >& oldChild )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
 
     if( !oldChild.is() )
         throw IllegalArgumentException("no child", static_cast<cppu::OWeakObject*>(this), 1);
@@ -2007,7 +2005,7 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::removeChild( const Reference
 // XTimeContainer
 Reference< XAnimationNode > SAL_CALL AnimationNode::appendChild( const Reference< XAnimationNode >& newChild )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
 
     if( !newChild.is() )
         throw IllegalArgumentException("no child", static_cast<cppu::OWeakObject*>(this), 1);
@@ -2032,7 +2030,7 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::appendChild( const Reference
 // XIterateContainer
 sal_Int16 SAL_CALL AnimationNode::getIterateType()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return mnIterateType;
 }
 
@@ -2040,7 +2038,7 @@ sal_Int16 SAL_CALL AnimationNode::getIterateType()
 // XIterateContainer
 void SAL_CALL AnimationNode::setIterateType( sal_Int16 _iteratetype )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( _iteratetype != mnIterateType )
     {
         mnIterateType = _iteratetype;
@@ -2052,7 +2050,7 @@ void SAL_CALL AnimationNode::setIterateType( sal_Int16 _iteratetype )
 // XIterateContainer
 double SAL_CALL AnimationNode::getIterateInterval()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     return mfIterateInterval;
 }
 
@@ -2060,7 +2058,7 @@ double SAL_CALL AnimationNode::getIterateInterval()
 // XIterateContainer
 void SAL_CALL AnimationNode::setIterateInterval( double _iterateinterval )
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
     if( _iterateinterval != mfIterateInterval )
     {
         mfIterateInterval = _iterateinterval;
@@ -2098,7 +2096,7 @@ const css::uno::Sequence< sal_Int8 > & AnimationNode::getUnoTunnelId()
 
 void AnimationNode::fireChangeListener()
 {
-    Guard< Mutex > aGuard( maMutex );
+    Guard< Mutex > aGuard( m_aMutex );
 
     OInterfaceIteratorHelper3 aIterator( maChangeListener );
     if( aIterator.hasMoreElements() )