diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-24 12:33:23 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-24 12:36:27 +0200 |
| commit | 76e8c614f7bbd74ddd8411b437b3c29f00d7b38d (patch) | |
| tree | 69eaad4739c5da02216d725bb72ea7695d7406ac /slideshow | |
| parent | ef5f02d94a88d4e6f18e4010dbbef47506e28a34 (diff) | |
loplugin:simplifybool
Change-Id: I427b32e79696bbdc521b78f4b4c1e6f4fce119a7
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/shapes/drawshape.cxx | 3 | ||||
| -rw-r--r-- | slideshow/source/inc/interruptabledelayevent.hxx | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx index a3b89b7d55fe..7c77a3c15f2b 100644 --- a/slideshow/source/engine/shapes/drawshape.cxx +++ b/slideshow/source/engine/shapes/drawshape.cxx @@ -731,8 +731,7 @@ namespace slideshow bool DrawShape::isContentChanged() const { - return mbForceUpdate ? - true : + return mbForceUpdate || getUpdateFlags() != ViewShape::NONE; } diff --git a/slideshow/source/inc/interruptabledelayevent.hxx b/slideshow/source/inc/interruptabledelayevent.hxx index 7f22bbc2dbf8..a0cec175948d 100644 --- a/slideshow/source/inc/interruptabledelayevent.hxx +++ b/slideshow/source/inc/interruptabledelayevent.hxx @@ -62,7 +62,7 @@ namespace slideshow // pass on to wrappee - this ensures that we return // false on isCharged(), even if the other event has // been fired outside our own fire() method - return !mpEvent ? false : mpEvent->isCharged(); + return mpEvent && mpEvent->isCharged(); } virtual double getActivationTime( double nCurrentTime ) const SAL_OVERRIDE |