summaryrefslogtreecommitdiff
path: root/animations
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 09:36:09 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 09:36:09 +0000
commite64837443e3f32f26bc91477d16281978a66db61 (patch)
treeb9eab049a7b546da4829b6a50985f5c48ce2778e /animations
parent5f247644126e55e6817b760183fd07e8156dac36 (diff)
INTEGRATION: CWS warnings01 (1.3.8); FILE MERGED
2005/11/09 16:40:31 pl 1.3.8.5: #i53898# removed warnings 2005/10/25 08:25:58 cl 1.3.8.4: fixed solaris compiler warnings 2005/09/22 15:46:18 sb 1.3.8.3: RESYNC: (1.3-1.4); FILE MERGED 2005/09/06 08:33:43 cl 1.3.8.2: #i53898# removed compiler warnings 2005/09/06 08:11:37 cl 1.3.8.1: #i53898# removed compiler warnings
Diffstat (limited to 'animations')
-rw-r--r--animations/source/animcore/animcore.cxx30
1 files changed, 16 insertions, 14 deletions
diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx
index f97b36eb36aa..b6320fbfac66 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: animcore.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: rt $ $Date: 2005-09-07 15:46:05 $
+ * last change: $Author: hr $ $Date: 2006-06-19 10:36:09 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -481,7 +481,8 @@ Sequence< Type >* AnimationNode::mpTypes[] = { NULL, NULL, NULL, NULL, NULL, NUL
Sequence< sal_Int8 >* AnimationNode::mpId[] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL };
AnimationNode::AnimationNode( sal_Int16 nNodeType )
-: mnNodeType( nNodeType ),
+: maChangeListener(maMutex),
+ mnNodeType( nNodeType ),
mnFill( AnimationFill::DEFAULT ),
mnFillDefault( AnimationFill::INHERIT ),
mnRestart( AnimationRestart:: DEFAULT ),
@@ -489,6 +490,7 @@ AnimationNode::AnimationNode( sal_Int16 nNodeType )
mfAcceleration( 0.0 ),
mfDecelerate( 0.0 ),
mbAutoReverse( sal_False ),
+ mpParent(0),
mnValueType( 0 ),
mnSubItem( 0 ),
mnCalcMode( (nNodeType == AnimationNodeType::ANIMATEMOTION) ? AnimationCalcMode::PACED : AnimationCalcMode::LINEAR),
@@ -504,14 +506,14 @@ AnimationNode::AnimationNode( sal_Int16 nNodeType )
mfVolume(1.0),
mnCommand(0),
mnIterateType( ::com::sun::star::presentation::ShapeAnimationSubType::AS_WHOLE ),
- mfIterateInterval(0.0),
- maChangeListener(maMutex),
- mpParent(0)
+ mfIterateInterval(0.0)
{
}
AnimationNode::AnimationNode( const AnimationNode& rNode )
-: mnNodeType( rNode.mnNodeType ),
+: AnimationNodeBase(),
+ maChangeListener(maMutex),
+ mnNodeType( rNode.mnNodeType ),
// attributes for the XAnimationNode interface implementation
maBegin( rNode.maBegin ),
@@ -528,6 +530,7 @@ AnimationNode::AnimationNode( const AnimationNode& rNode )
mfDecelerate( rNode.mfDecelerate ),
mbAutoReverse( rNode.mbAutoReverse ),
maUserData( rNode.maUserData ),
+ mpParent(0),
// attributes for XAnimate
maTarget( rNode.maTarget ),
@@ -571,9 +574,7 @@ AnimationNode::AnimationNode( const AnimationNode& rNode )
// XIterateContainer
mnIterateType( rNode.mnIterateType ),
- mfIterateInterval( rNode.mfIterateInterval ),
- maChangeListener(maMutex),
- mpParent(0)
+ mfIterateInterval( rNode.mfIterateInterval )
{
}
@@ -584,7 +585,7 @@ AnimationNode::~AnimationNode()
// --------------------------------------------------------------------
#define IMPL_NODE_FACTORY(N,IN,SN)\
-Reference< XInterface > SAL_CALL createInstance_##N( const Reference< XComponentContext > & rSMgr ) throw (Exception)\
+Reference< XInterface > SAL_CALL createInstance_##N( const Reference< XComponentContext > & ) throw (Exception)\
{\
return Reference < XInterface > ( SAL_STATIC_CAST( ::cppu::OWeakObject * , new AnimationNode( N ) ) );\
}\
@@ -1226,7 +1227,7 @@ void SAL_CALL AnimationNode::setParent( const Reference< XInterface >& Parent )
mpParent = 0;
Reference< XUnoTunnel > xTunnel( mxParent, UNO_QUERY );
if( xTunnel.is() )
- mpParent = ( AnimationNode* )xTunnel->getSomething( getUnoTunnelId() );
+ mpParent = reinterpret_cast< AnimationNode* >( sal::static_int_cast< sal_IntPtr >(xTunnel->getSomething( getUnoTunnelId() )));
fireChangeListener();
}
@@ -2087,7 +2088,8 @@ void SAL_CALL AnimationNode::removeChangesListener( const Reference< XChangesLis
{
if( rId.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) )
{
- return (sal_Int64)this;
+ return sal::static_int_cast< sal_Int64 >(reinterpret_cast< sal_IntPtr >(this));
+
}
else
{
@@ -2139,4 +2141,4 @@ void AnimationNode::fireChangeListener()
// --------------------------------------------------------------------
-}; // namespace animcore
+} // namespace animcore