diff options
author | Noel Grandin <noel@peralex.com> | 2014-05-02 15:42:25 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-05-05 12:47:48 +0200 |
commit | 4f9b21248ffdf55cef9f3f9d1da76778ee000775 (patch) | |
tree | b059d288339a68aa4c3901f1100e99b04d05a23d /sd/source/ui/slideshow | |
parent | b4107411900f5bb4c215e2d9db09fc2b2b82939b (diff) |
simplify ternary conditions "xxx ? yyy : false"
Look for code like:
xxx ? yyy : false;
Which can be simplified to:
xxx && yyy
Change-Id: Ia33c0e452aa28af3f0658a5382895aaad0246b4d
Diffstat (limited to 'sd/source/ui/slideshow')
-rw-r--r-- | sd/source/ui/slideshow/slideshow.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 279bd8b45445..aa81b00be39c 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -1027,7 +1027,7 @@ void SlideShow::jumpToBookmark( const OUString& sBookmark ) bool SlideShow::isFullScreen() { - return mxController.is() ? mxController->maPresSettings.mbFullScreen : false; + return mxController.is() && mxController->maPresSettings.mbFullScreen; } @@ -1082,7 +1082,7 @@ void SlideShow::deactivate( ViewShellBase& /*rBase*/ ) bool SlideShow::keyInput(const KeyEvent& rKEvt) { - return mxController.is() ? mxController->keyInput(rKEvt) : false; + return mxController.is() && mxController->keyInput(rKEvt); } @@ -1097,7 +1097,7 @@ void SlideShow::paint( const Rectangle& rRect ) bool SlideShow::isAlwaysOnTop() { - return mxController.is() ? mxController->maPresSettings.mbAlwaysOnTop : false; + return mxController.is() && mxController->maPresSettings.mbAlwaysOnTop; } @@ -1140,14 +1140,14 @@ sal_Int32 SlideShow::getLastPageNumber() bool SlideShow::isEndless() { - return mxController.is() ? mxController->isEndless() : false; + return mxController.is() && mxController->isEndless(); } bool SlideShow::isDrawingPossible() { - return mxController.is() ? mxController->getUsePen() : false; + return mxController.is() && mxController->getUsePen(); } |