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 /avmedia/source/viewer | |
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 'avmedia/source/viewer')
-rw-r--r-- | avmedia/source/viewer/mediawindow_impl.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 96f7a46b11d5..e52e52463ab1 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -331,7 +331,7 @@ Size MediaWindowImpl::getPreferredSize() const bool MediaWindowImpl::start() { - return( mxPlayer.is() ? ( mxPlayer->start(), true ) : false ); + return mxPlayer.is() && ( mxPlayer->start(), true ); } void MediaWindowImpl::updateMediaItem( MediaItem& rItem ) const @@ -414,7 +414,7 @@ void MediaWindowImpl::executeMediaItem( const MediaItem& rItem ) bool MediaWindowImpl::setZoom( ::com::sun::star::media::ZoomLevel eLevel ) { - return( mxPlayerWindow.is() ? mxPlayerWindow->setZoomLevel( eLevel ) : false ); + return mxPlayerWindow.is() && mxPlayerWindow->setZoomLevel( eLevel ); } ::com::sun::star::media::ZoomLevel MediaWindowImpl::getZoom() const @@ -462,7 +462,7 @@ void MediaWindowImpl::setPlaybackLoop( bool bSet ) bool MediaWindowImpl::isPlaybackLoop() const { - return( mxPlayer.is() ? mxPlayer->isPlaybackLoop() : false ); + return mxPlayer.is() && mxPlayer->isPlaybackLoop(); } void MediaWindowImpl::setMute( bool bSet ) @@ -473,7 +473,7 @@ void MediaWindowImpl::setMute( bool bSet ) bool MediaWindowImpl::isMute() const { - return( mxPlayer.is() ? mxPlayer->isMute() : false ); + return mxPlayer.is() && mxPlayer->isMute(); } void MediaWindowImpl::setVolumeDB( sal_Int16 nVolumeDB ) |