loplugin:simplifybool

Change-Id: I427b32e79696bbdc521b78f4b4c1e6f4fce119a7
This commit is contained in:
Stephan Bergmann
2015-04-24 12:33:23 +02:00
parent ef5f02d94a
commit 76e8c614f7
2 changed files with 2 additions and 3 deletions

View File

@@ -731,8 +731,7 @@ namespace slideshow
bool DrawShape::isContentChanged() const bool DrawShape::isContentChanged() const
{ {
return mbForceUpdate ? return mbForceUpdate ||
true :
getUpdateFlags() != ViewShape::NONE; getUpdateFlags() != ViewShape::NONE;
} }

View File

@@ -62,7 +62,7 @@ namespace slideshow
// pass on to wrappee - this ensures that we return // pass on to wrappee - this ensures that we return
// false on isCharged(), even if the other event has // false on isCharged(), even if the other event has
// been fired outside our own fire() method // been fired outside our own fire() method
return !mpEvent ? false : mpEvent->isCharged(); return mpEvent && mpEvent->isCharged();
} }
virtual double getActivationTime( double nCurrentTime ) const SAL_OVERRIDE virtual double getActivationTime( double nCurrentTime ) const SAL_OVERRIDE