diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 11:16:44 +1000 |
---|---|---|
committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 11:16:44 +1000 |
commit | 6ffc3cf9e54ab92f2e7811f5e0ff0c9609c65f3a (patch) | |
tree | 8b885a493397fb8217e674e6aaff1d6b4344afac /slideshow/source/engine/effectrewinder.cxx | |
parent | ff76c90fb40c4246a835686ca0b4db8fe6b7dbd1 (diff) |
tdf#43157: convert slideshow module away from OSL_ASSERT to assert
Change-Id: I6a067922bd701387172d94713ec05fc3313de19c
Diffstat (limited to 'slideshow/source/engine/effectrewinder.cxx')
-rw-r--r-- | slideshow/source/engine/effectrewinder.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
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(); |