tdf#43157: convert slideshow module away from OSL_ASSERT to assert

Change-Id: I6a067922bd701387172d94713ec05fc3313de19c

3 files changed, 10 insertions, 10 deletions

diff --git a/slideshow/source/engine/animationnodes/basecontainernode.cxx b/slideshow/source/engine/animationnodes/basecontainernode.cxx
index 83f72a96b457..d293a2ca4a79 100644
--- a/slideshow/source/engine/animationnodes/basecontainernode.cxx
+++ b/slideshow/source/engine/animationnodes/basecontainernode.cxx
@@ -119,10 +119,10 @@ bool BaseContainerNode::isChildNode( AnimationNodeSharedPtr const& pNode ) const
 bool BaseContainerNode::notifyDeactivatedChild(
     AnimationNodeSharedPtr const& pChildNode )
 {
-    OSL_ASSERT( pChildNode->getState() == FROZEN ||
+    assert( pChildNode->getState() == FROZEN ||
                 pChildNode->getState() == ENDED );
     // early exit on invalid nodes
-    OSL_ASSERT( getState() != INVALID );
+    assert( getState() != INVALID );
     if( getState() == INVALID )
         return false;
 
@@ -132,7 +132,7 @@ bool BaseContainerNode::notifyDeactivatedChild(
     }
 
     std::size_t const nSize = maChildren.size();
-    OSL_ASSERT( mnFinishedChildren < nSize );
+    assert( mnFinishedChildren < nSize );
     ++mnFinishedChildren;
     bool bFinished = (mnFinishedChildren >= nSize);
 
diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx
index 7a7f63518c32..6d1ea6a1b441 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) {
-            OSL_ASSERT( (mpNode->meCurrentStateTransition & meToState) != 0 );
+            assert( (mpNode->meCurrentStateTransition & meToState) != 0 );
             mpNode->meCurrentStateTransition &= ~meToState;
             meToState = INVALID;
         }
@@ -432,7 +432,7 @@ bool BaseNode::resolve()
     if (! checkValidNode())
         return false;
 
-    OSL_ASSERT( meCurrState != RESOLVED );
+    assert( meCurrState != RESOLVED );
     if (inStateOrTransition( RESOLVED ))
         return true;
 
@@ -495,7 +495,7 @@ void BaseNode::activate()
     if (! checkValidNode())
         return;
 
-    OSL_ASSERT( meCurrState != ACTIVE );
+    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 OSL_ASSERT */ )) {
+    if (isTransition( meCurrState, FROZEN, false /* no 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
-    OSL_ASSERT( rNotifier->getState() == FROZEN ||
+    assert( rNotifier->getState() == FROZEN ||
                 rNotifier->getState() == ENDED );
     // TODO(F1): for end sync functionality, this might indeed be used some day
 }
diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
index 68bda1a56999..aec8432e1a0b 100644
--- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
+++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
@@ -113,9 +113,9 @@ void SequentialTimeContainer::notifyDeactivating(
     if (notifyDeactivatedChild( rNotifier ))
         return;
 
-    OSL_ASSERT( mnFinishedChildren < maChildren.size() );
+    assert( mnFinishedChildren < maChildren.size() );
     AnimationNodeSharedPtr const& pNextChild = maChildren[mnFinishedChildren];
-    OSL_ASSERT( pNextChild->getState() == UNRESOLVED );
+    assert( pNextChild->getState() == UNRESOLVED );
 
     if (! resolveChild( pNextChild )) {
         // could not resolve child - since we risk to