summaryrefslogtreecommitdiff
path: root/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 17:03:35 +1000
committerChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 17:03:35 +1000
commit97eb00c75e173d4c8d0b483a7941ad3d2f23783e (patch)
tree7974a8b9423c56982646366b0859dfb2a1a88d50 /sd/source/ui/slidesorter/controller/SlsAnimator.cxx
parentd0a99cc2ed76be220f7e868e332ba19f6e48a440 (diff)
revert OSL_ASSERT changes
Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380
Diffstat (limited to 'sd/source/ui/slidesorter/controller/SlsAnimator.cxx')
-rw-r--r--sd/source/ui/slidesorter/controller/SlsAnimator.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
index 19fe97286de0..fd6a63ebdf6a 100644
--- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
@@ -74,7 +74,7 @@ Animator::~Animator()
{
if ( ! mbIsDisposed)
{
- assert(mbIsDisposed);
+ OSL_ASSERT(mbIsDisposed);
Dispose();
}
}
@@ -102,7 +102,7 @@ Animator::AnimationId Animator::AddAnimation (
{
// When the animator is already disposed then ignore this call
// silently (well, we show an assertion, but do not throw an exception.)
- assert( ! mbIsDisposed);
+ OSL_ASSERT( ! mbIsDisposed);
if (mbIsDisposed)
return -1;
@@ -123,7 +123,7 @@ Animator::AnimationId Animator::AddAnimation (
void Animator::RemoveAnimation (const Animator::AnimationId nId)
{
- assert( ! mbIsDisposed);
+ OSL_ASSERT( ! mbIsDisposed);
const AnimationList::iterator iAnimation (::std::find_if(
maAnimations.begin(),
@@ -132,7 +132,7 @@ void Animator::RemoveAnimation (const Animator::AnimationId nId)
{ return nId == pAnim->mnAnimationId; }));
if (iAnimation != maAnimations.end())
{
- assert((*iAnimation)->mnAnimationId == nId);
+ OSL_ASSERT((*iAnimation)->mnAnimationId == nId);
(*iAnimation)->Expire();
maAnimations.erase(iAnimation);
}
@@ -166,7 +166,7 @@ bool Animator::ProcessAnimations (const double nTime)
{
bool bExpired (false);
- assert( ! mbIsDisposed);
+ OSL_ASSERT( ! mbIsDisposed);
if (mbIsDisposed)
return bExpired;
@@ -182,7 +182,7 @@ bool Animator::ProcessAnimations (const double nTime)
void Animator::CleanUpAnimationList()
{
- assert( ! mbIsDisposed);
+ OSL_ASSERT( ! mbIsDisposed);
if (mbIsDisposed)
return;