diff options
Diffstat (limited to 'slideshow/source/engine/animationnodes/basenode.cxx')
| -rw-r--r-- | slideshow/source/engine/animationnodes/basenode.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx index 6d1ea6a1b441..7a7f63518c32 100644 --- a/slideshow/source/engine/animationnodes/basenode.cxx +++ b/slideshow/source/engine/animationnodes/basenode.cxx @@ -301,7 +301,7 @@ public: void clear() { if (meToState != INVALID) { - assert( (mpNode->meCurrentStateTransition & meToState) != 0 ); + OSL_ASSERT( (mpNode->meCurrentStateTransition & meToState) != 0 ); mpNode->meCurrentStateTransition &= ~meToState; meToState = INVALID; } @@ -432,7 +432,7 @@ bool BaseNode::resolve() if (! checkValidNode()) return false; - assert( meCurrState != RESOLVED ); + OSL_ASSERT( meCurrState != RESOLVED ); if (inStateOrTransition( RESOLVED )) return true; @@ -495,7 +495,7 @@ void BaseNode::activate() if (! checkValidNode()) return; - assert( meCurrState != ACTIVE ); + OSL_ASSERT( meCurrState != ACTIVE ); if (inStateOrTransition( ACTIVE )) return; @@ -551,7 +551,7 @@ void BaseNode::deactivate() if (inStateOrTransition( ENDED | FROZEN ) || !checkValidNode()) return; - if (isTransition( meCurrState, FROZEN, false /* no assert */ )) { + if (isTransition( meCurrState, FROZEN, false /* no OSL_ASSERT */ )) { // do transition to FROZEN: StateTransition st(this); if (st.enter( FROZEN, StateTransition::FORCE )) { @@ -612,7 +612,7 @@ void BaseNode::end() void BaseNode::notifyDeactivating( const AnimationNodeSharedPtr& rNotifier ) { (void) rNotifier; // avoid warning - assert( rNotifier->getState() == FROZEN || + OSL_ASSERT( rNotifier->getState() == FROZEN || rNotifier->getState() == ENDED ); // TODO(F1): for end sync functionality, this might indeed be used some day } |