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

Change-Id: I6a067922bd701387172d94713ec05fc3313de19c

19 files changed, 58 insertions, 58 deletions

diff --git a/slideshow/source/engine/activities/activitybase.cxx b/slideshow/source/engine/activities/activitybase.cxx
index 31b6854091f3..aee2b31e5b66 100644
--- a/slideshow/source/engine/activities/activitybase.cxx
+++ b/slideshow/source/engine/activities/activitybase.cxx
@@ -78,7 +78,7 @@ namespace slideshow
             if( !isActive() )
                 return false; // no, early exit.
 
-            OSL_ASSERT( ! mbFirstPerformCall );
+            assert( ! mbFirstPerformCall );
 
             return true;
         }
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
diff --git a/slideshow/source/engine/delayevent.cxx b/slideshow/source/engine/delayevent.cxx
index 78dd0350d4ba..131630488288 100644
--- a/slideshow/source/engine/delayevent.cxx
+++ b/slideshow/source/engine/delayevent.cxx
@@ -26,7 +26,7 @@ namespace internal {
 
 bool Delay::fire()
 {
-    OSL_ASSERT( isCharged() );
+    assert( isCharged() );
     if (isCharged()) {
         mbWasFired = true;
         maFunc();
diff --git a/slideshow/source/engine/effectrewinder.cxx b/slideshow/source/engine/effectrewinder.cxx
index 96ba0e048281..a318d9c2d9b7 100644
--- a/slideshow/source/engine/effectrewinder.cxx
+++ b/slideshow/source/engine/effectrewinder.cxx
@@ -164,7 +164,7 @@ bool EffectRewinder::rewind (
     // Do not allow nested rewinds.
     if (mpAsynchronousRewindEvent)
     {
-        OSL_ASSERT( ! mpAsynchronousRewindEvent);
+        assert( ! mpAsynchronousRewindEvent);
         return false;
     }
 
@@ -177,7 +177,7 @@ bool EffectRewinder::rewind (
     {
         if ( ! rPreviousSlideFunctor)
         {
-            OSL_ASSERT(rPreviousSlideFunctor);
+            assert(rPreviousSlideFunctor);
             return false;
         }
 
@@ -216,7 +216,7 @@ void EffectRewinder::skipAllMainSequenceEffects()
     // Do not allow nested rewinds.
     if (mpAsynchronousRewindEvent)
     {
-        OSL_ASSERT(!mpAsynchronousRewindEvent);
+        assert(!mpAsynchronousRewindEvent);
         return;
     }
 
@@ -330,7 +330,7 @@ void EffectRewinder::asynchronousRewind (
     const bool bRedisplayCurrentSlide,
     const std::function<void ()>& rSlideRewindFunctor)
 {
-    OSL_ASSERT(mpAsynchronousRewindEvent);
+    assert(mpAsynchronousRewindEvent);
 
     if (bRedisplayCurrentSlide)
     {
@@ -372,7 +372,7 @@ void EffectRewinder::asynchronousRewind (
 void EffectRewinder::asynchronousRewindToPreviousSlide (
     const ::std::function<void ()>& rSlideRewindFunctor)
 {
-    OSL_ASSERT(mpAsynchronousRewindEvent);
+    assert(mpAsynchronousRewindEvent);
 
     mpAsynchronousRewindEvent.reset();
     rSlideRewindFunctor();
diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx
index c707af32e91e..ffe37a16d266 100644
--- a/slideshow/source/engine/eventmultiplexer.cxx
+++ b/slideshow/source/engine/eventmultiplexer.cxx
@@ -411,7 +411,7 @@ void EventMultiplexerImpl::forEachView( XSlideShowViewFunc pViewMethod )
             }
             else
             {
-                OSL_ASSERT(xView.is());
+                assert(xView.is());
             }
         }
     }
diff --git a/slideshow/source/engine/pointersymbol.cxx b/slideshow/source/engine/pointersymbol.cxx
index 2b50addcd71c..6f53bbd7e272 100644
--- a/slideshow/source/engine/pointersymbol.cxx
+++ b/slideshow/source/engine/pointersymbol.cxx
@@ -155,7 +155,7 @@ void PointerSymbol::viewChanged( const UnoViewSharedPtr& rView )
             ( const ViewsVecT::value_type& cp )
             { return rView == cp.first; } ) );
 
-    OSL_ASSERT( aModifiedEntry != maViews.end() );
+    assert( aModifiedEntry != maViews.end() );
     if( aModifiedEntry == maViews.end() )
         return;
 
diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx
index 861edc70144e..c3945fe8b0b3 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.cxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
@@ -371,7 +371,7 @@ void RehearseTimingsActivity::viewChanged( const UnoViewSharedPtr& rView )
             { return rView == cp.first; } )
         );
 
-    OSL_ASSERT( aModifiedEntry != maViews.end() );
+    assert( aModifiedEntry != maViews.end() );
     if( aModifiedEntry == maViews.end() )
         return;
 
@@ -467,7 +467,7 @@ void RehearseTimingsActivity::paint( cppcanvas::CanvasSharedPtr const & canvas )
         cppcanvas::VCLFactory::createRenderer(
             canvas, metaFile, cppcanvas::Renderer::Parameters() ) );
     const bool succ = renderer->draw();
-    OSL_ASSERT( succ );
+    assert( succ );
     (void)succ;
 }
 
diff --git a/slideshow/source/engine/screenupdater.cxx b/slideshow/source/engine/screenupdater.cxx
index 597da9daf600..5616f8e1ac4c 100644
--- a/slideshow/source/engine/screenupdater.cxx
+++ b/slideshow/source/engine/screenupdater.cxx
@@ -198,12 +198,12 @@ namespace internal
     void ScreenUpdater::lockUpdates()
     {
         ++mpImpl->mnLockCount;
-        OSL_ASSERT(mpImpl->mnLockCount>0);
+        assert(mpImpl->mnLockCount>0);
     }
 
     void ScreenUpdater::unlockUpdates()
     {
-        OSL_ASSERT(mpImpl->mnLockCount>0);
+        assert(mpImpl->mnLockCount>0);
         if (mpImpl->mnLockCount > 0)
         {
             --mpImpl->mnLockCount;
diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
index d4941f8300cf..7fdbc2f3a8fb 100644
--- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx
+++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
@@ -581,7 +581,7 @@ sal_uInt32 ActivityImpl::ImpRegisterAgainScrollTextMixerState(sal_uInt32 nTime)
 void ActivityImpl::updateShapeAttributes(
     double fTime, basegfx::B2DRectangle const& parentBounds )
 {
-    OSL_ASSERT( meAnimKind != drawing::TextAnimationKind_NONE );
+    assert( meAnimKind != drawing::TextAnimationKind_NONE );
     if( meAnimKind == drawing::TextAnimationKind_NONE )
         return;
 
@@ -780,7 +780,7 @@ ActivityImpl::ActivityImpl(
     uno::Reference<beans::XPropertySet> const xProps( xShape, uno::UNO_QUERY_THROW );
 
     getPropertyValue( meAnimKind, xProps, "TextAnimationKind" );
-    OSL_ASSERT( meAnimKind != drawing::TextAnimationKind_NONE );
+    assert( meAnimKind != drawing::TextAnimationKind_NONE );
     mbAlternate = (meAnimKind == drawing::TextAnimationKind_ALTERNATE);
     mbScrollIn = (meAnimKind == drawing::TextAnimationKind_SLIDE);
 
diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx
index 98f1cae40ac7..dfb7b89b892d 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -525,7 +525,7 @@ namespace slideshow
 
             if( pShape->hasIntrinsicAnimation() )
             {
-                OSL_ASSERT( pShape->maAnimationFrames.empty() );
+                assert( pShape->maAnimationFrames.empty() );
                 if( pShape->getNumberOfTreeNodes(
                         DocTreeNode::NodeType::LogicalParagraph) > 0 )
                 {
@@ -557,7 +557,7 @@ namespace slideshow
 
             if( pShape->hasIntrinsicAnimation() )
             {
-                OSL_ASSERT( !pShape->maAnimationFrames.empty() );
+                assert( !pShape->maAnimationFrames.empty() );
 
                 std::vector<double> aTimeout;
                 std::transform(
@@ -900,7 +900,7 @@ namespace slideshow
                 maHyperlinkIndices.pop_back();
                 maHyperlinkRegions.pop_back();
             }
-            OSL_ASSERT( maHyperlinkIndices.size() == maHyperlinkRegions.size());
+            assert( maHyperlinkIndices.size() == maHyperlinkRegions.size());
         }
 
         bool DrawShape::hasHyperlinks() const
@@ -910,7 +910,7 @@ namespace slideshow
 
         HyperlinkArea::HyperlinkRegions DrawShape::getHyperlinkRegions() const
         {
-            OSL_ASSERT( !maViewShapes.empty() );
+            assert( !maViewShapes.empty() );
 
             if( !isVisible() )
                 return HyperlinkArea::HyperlinkRegions();
@@ -934,7 +934,7 @@ namespace slideshow
                     pViewShape->getRenderer(
                         pCanvas, mpCurrMtf, mpAttributeLayer ) );
 
-                OSL_ASSERT( pRenderer );
+                assert( pRenderer );
 
                 if (pRenderer)
                 {
diff --git a/slideshow/source/engine/slide/layer.cxx b/slideshow/source/engine/slide/layer.cxx
index 0aa3352192a8..5229d1190d69 100644
--- a/slideshow/source/engine/slide/layer.cxx
+++ b/slideshow/source/engine/slide/layer.cxx
@@ -56,7 +56,7 @@ namespace slideshow
 
         ViewLayerSharedPtr Layer::addView( const ViewSharedPtr& rNewView )
         {
-            OSL_ASSERT( rNewView );
+            assert( rNewView );
 
             ViewEntryVector::iterator aIter;
             const ViewEntryVector::iterator aEnd( maViewEntries.end() );
@@ -87,7 +87,7 @@ namespace slideshow
 
         ViewLayerSharedPtr Layer::removeView( const ViewSharedPtr& rView )
         {
-            OSL_ASSERT( rView );
+            assert( rView );
 
             ViewEntryVector::iterator       aIter;
             const ViewEntryVector::iterator aEnd( maViewEntries.end() );
diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx
index e3c024398f6f..0ccbb62e5562 100644
--- a/slideshow/source/engine/slide/layermanager.cxx
+++ b/slideshow/source/engine/slide/layermanager.cxx
@@ -134,13 +134,13 @@ namespace slideshow
             mbActive = false;
 
             // only background layer left
-            OSL_ASSERT( maLayers.size() == 1 && maLayers.front()->isBackgroundLayer() );
+            assert( maLayers.size() == 1 && maLayers.front()->isBackgroundLayer() );
         }
 
         void LayerManager::viewAdded( const UnoViewSharedPtr& rView )
         {
             // view must be member of mrViews container
-            OSL_ASSERT( std::find(mrViews.begin(),
+            assert( std::find(mrViews.begin(),
                                   mrViews.end(),
                                   rView) != mrViews.end() );
 
@@ -164,7 +164,7 @@ namespace slideshow
         void LayerManager::viewRemoved( const UnoViewSharedPtr& rView )
         {
             // view must not be member of mrViews container anymore
-            OSL_ASSERT( std::find(mrViews.begin(),
+            assert( std::find(mrViews.begin(),
                                   mrViews.end(),
                                   rView) == mrViews.end() );
 
@@ -186,7 +186,7 @@ namespace slideshow
             (void)rView;
 
             // view must be member of mrViews container
-            OSL_ASSERT( std::find(mrViews.begin(),
+            assert( std::find(mrViews.begin(),
                                   mrViews.end(),
                                   rView) != mrViews.end() );
 
@@ -212,7 +212,7 @@ namespace slideshow
 
         void LayerManager::addShape( const ShapeSharedPtr& rShape )
         {
-            OSL_ASSERT( !maLayers.empty() ); // always at least background layer
+            assert( !maLayers.empty() ); // always at least background layer
             ENSURE_OR_THROW( rShape, "LayerManager::addShape(): invalid Shape" );
 
             // add shape to XShape hash map
@@ -237,12 +237,12 @@ namespace slideshow
 
         void LayerManager::implAddShape( const ShapeSharedPtr& rShape )
         {
-            OSL_ASSERT( !maLayers.empty() ); // always at least background layer
+            assert( !maLayers.empty() ); // always at least background layer
             ENSURE_OR_THROW( rShape, "LayerManager::implAddShape(): invalid Shape" );
 
             LayerShapeMap::value_type aValue (rShape, LayerWeakPtr());
 
-            OSL_ASSERT( maAllShapes.find(rShape) == maAllShapes.end() ); // shape must not be added already
+            assert( maAllShapes.find(rShape) == maAllShapes.end() ); // shape must not be added already
             mbLayerAssociationDirty = true;
 
             if( mbDisableAnimationZOrder )
@@ -258,7 +258,7 @@ namespace slideshow
 
         void LayerManager::implRemoveShape( const ShapeSharedPtr& rShape )
         {
-            OSL_ASSERT( !maLayers.empty() ); // always at least background layer
+            assert( !maLayers.empty() ); // always at least background layer
             ENSURE_OR_THROW( rShape, "LayerManager::implRemoveShape(): invalid Shape" );
 
             const LayerShapeMap::iterator aShapeEntry( maAllShapes.find(rShape) );
@@ -307,7 +307,7 @@ namespace slideshow
         AttributableShapeSharedPtr LayerManager::getSubsetShape( const AttributableShapeSharedPtr&  rOrigShape,
                                                                  const DocTreeNode&                 rTreeNode )
         {
-            OSL_ASSERT( !maLayers.empty() ); // always at least background layer
+            assert( !maLayers.empty() ); // always at least background layer
 
             AttributableShapeSharedPtr pSubset;
 
@@ -338,11 +338,11 @@ namespace slideshow
         void LayerManager::revokeSubset( const AttributableShapeSharedPtr& rOrigShape,
                                          const AttributableShapeSharedPtr& rSubsetShape )
         {
-            OSL_ASSERT( !maLayers.empty() ); // always at least background layer
+            assert( !maLayers.empty() ); // always at least background layer
 
             if( rOrigShape->revokeSubset( rSubsetShape ) )
             {
-                OSL_ASSERT( maAllShapes.find(rSubsetShape) != maAllShapes.end() );
+                assert( maAllShapes.find(rSubsetShape) != maAllShapes.end() );
 
                 implRemoveShape( rSubsetShape );
 
@@ -355,7 +355,7 @@ namespace slideshow
 
         void LayerManager::enterAnimationMode( const AnimatableShapeSharedPtr& rShape )
         {
-            OSL_ASSERT( !maLayers.empty() ); // always at least background layer
+            assert( !maLayers.empty() ); // always at least background layer
             ENSURE_OR_THROW( rShape, "LayerManager::enterAnimationMode(): invalid Shape" );
 
             const bool bPrevAnimState( rShape->isBackgroundDetached() );
@@ -638,7 +638,7 @@ namespace slideshow
 
         void LayerManager::addUpdateArea( ShapeSharedPtr const& rShape )
         {
-            OSL_ASSERT( !maLayers.empty() ); // always at least background layer
+            assert( !maLayers.empty() ); // always at least background layer
             ENSURE_OR_THROW( rShape, "LayerManager::addUpdateArea(): invalid Shape" );
 
             const LayerShapeMap::const_iterator aShapeEntry( maAllShapes.find(rShape) );
@@ -682,7 +682,7 @@ namespace slideshow
 
         LayerSharedPtr LayerManager::createForegroundLayer() const
         {
-            OSL_ASSERT( mbActive );
+            assert( mbActive );
 
             LayerSharedPtr pLayer( Layer::createLayer() );
 
@@ -696,8 +696,8 @@ namespace slideshow
 
         void LayerManager::updateShapeLayers( bool bBackgroundLayerPainted )
         {
-            OSL_ASSERT( !maLayers.empty() ); // always at least background layer
-            OSL_ASSERT( mbActive );
+            assert( !maLayers.empty() ); // always at least background layer
+            assert( mbActive );
 
             // do we need to process shapes?
             if( !mbLayerAssociationDirty )
@@ -762,7 +762,7 @@ namespace slideshow
                     }
                 }
 
-                OSL_ASSERT( maLayers.size() == aWeakLayers.size() );
+                assert( maLayers.size() == aWeakLayers.size() );
 
                 // note: using indices here, since vector::insert
                 // above invalidates iterators
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 8e8023e0146f..571725304e4b 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -923,7 +923,7 @@ SlideSharedPtr SlideShowImpl::makeSlide(
 void SlideShowImpl::requestWaitSymbol()
 {
     ++mnWaitSymbolRequestCount;
-    OSL_ASSERT(mnWaitSymbolRequestCount>0);
+    assert(mnWaitSymbolRequestCount>0);
 
     if (mnWaitSymbolRequestCount == 1)
     {
@@ -940,7 +940,7 @@ void SlideShowImpl::requestWaitSymbol()
 void SlideShowImpl::releaseWaitSymbol()
 {
     --mnWaitSymbolRequestCount;
-    OSL_ASSERT(mnWaitSymbolRequestCount>=0);
+    assert(mnWaitSymbolRequestCount>=0);
 
     if (mnWaitSymbolRequestCount == 0)
     {
@@ -1099,7 +1099,7 @@ void SlideShowImpl::displaySlide(
         else
             mpCurrentSlide = makeSlide( xSlide, xDrawPages, xRootNode );
 
-        OSL_ASSERT( mpCurrentSlide );
+        assert( mpCurrentSlide );
         if (mpCurrentSlide)
         {
             basegfx::B2DSize oldSlideSize;
@@ -2279,7 +2279,7 @@ void SlideShowImpl::notifySlideEnded (const bool bReverse)
             // save time at current drawpage:
             uno::Reference<beans::XPropertySet> xPropSet(
                 mpCurrentSlide->getXDrawPage(), uno::UNO_QUERY );
-            OSL_ASSERT( xPropSet.is() );
+            assert( xPropSet.is() );
             if (xPropSet.is())
             {
                 xPropSet->setPropertyValue(
diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx
index 4d13d8b1d05f..9620ab7b4c08 100644
--- a/slideshow/source/engine/slideview.cxx
+++ b/slideshow/source/engine/slideview.cxx
@@ -1021,7 +1021,7 @@ void SlideView::disposing( lang::EventObject const& evt )
 
     if (mxView.is())
     {
-        OSL_ASSERT( evt.Source == mxView );
+        assert( evt.Source == mxView );
         mxView.clear();
     }
 
diff --git a/slideshow/source/engine/transitions/slidechangebase.cxx b/slideshow/source/engine/transitions/slidechangebase.cxx
index cdc1d22134c8..1f10a158c2f7 100644
--- a/slideshow/source/engine/transitions/slidechangebase.cxx
+++ b/slideshow/source/engine/transitions/slidechangebase.cxx
@@ -308,7 +308,7 @@ bool SlideChangeBase::operator()( double nValue )
                     // between different canvases!
 
                     // render the content
-                    OSL_ASSERT( getLeavingBitmap( rViewEntry ) );
+                    assert( getLeavingBitmap( rViewEntry ) );
                     if( getLeavingBitmap( rViewEntry ) )
                         getLeavingBitmap( rViewEntry )->draw( pOutContentCanvas );
                 }
@@ -430,7 +430,7 @@ void SlideChangeBase::viewChanged( const UnoViewSharedPtr& rView )
             [rView]( const ViewEntry& rViewEntry )
             { return rView == rViewEntry.getView(); } ) );
 
-    OSL_ASSERT( aModifiedEntry != maViewData.end() );
+    assert( aModifiedEntry != maViewData.end() );
     if( aModifiedEntry == maViewData.end() )
         return;
 
diff --git a/slideshow/source/engine/transitions/snakewipe.cxx b/slideshow/source/engine/transitions/snakewipe.cxx
index 99b34d5d3af6..c38623780081 100644
--- a/slideshow/source/engine/transitions/snakewipe.cxx
+++ b/slideshow/source/engine/transitions/snakewipe.cxx
@@ -196,7 +196,7 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis )
     ::basegfx::B2DPolyPolygon res;
     if (m_diagonal)
     {
-        OSL_ASSERT( m_opposite );
+        assert( m_opposite );
         ::basegfx::B2DPolyPolygon half(
             calcHalfDiagonalSnake( t, false /* out */ ) );
         // flip on x axis and rotate 90 degrees:
diff --git a/slideshow/source/engine/waitsymbol.cxx b/slideshow/source/engine/waitsymbol.cxx
index e278d609c464..eea386f32284 100644
--- a/slideshow/source/engine/waitsymbol.cxx
+++ b/slideshow/source/engine/waitsymbol.cxx
@@ -159,7 +159,7 @@ void WaitSymbol::viewChanged( const UnoViewSharedPtr& rView )
             ( const ViewsVecT::value_type& cp )
             { return rView == cp.first; } ) );
 
-    OSL_ASSERT( aModifiedEntry != maViews.end() );
+    assert( aModifiedEntry != maViews.end() );
     if( aModifiedEntry == maViews.end() )
         return;