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 /canvas | |
| 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 'canvas')
| -rw-r--r-- | canvas/source/directx/dx_bitmapcanvashelper.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/opengl/ogl_canvashelper.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/vcl/impltools.hxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/canvas/source/directx/dx_bitmapcanvashelper.cxx b/canvas/source/directx/dx_bitmapcanvashelper.cxx index e9577e1331b6..e8eeddd0adab 100644 --- a/canvas/source/directx/dx_bitmapcanvashelper.cxx +++ b/canvas/source/directx/dx_bitmapcanvashelper.cxx @@ -230,7 +230,7 @@ namespace dxcanvas } bool BitmapCanvasHelper::hasAlpha() const { - return mpTarget ? mpTarget->hasAlpha() : false; + return mpTarget && mpTarget->hasAlpha(); } } diff --git a/canvas/source/opengl/ogl_canvashelper.cxx b/canvas/source/opengl/ogl_canvashelper.cxx index 6ee3dabd4263..a1917dd0a33d 100644 --- a/canvas/source/opengl/ogl_canvashelper.cxx +++ b/canvas/source/opengl/ogl_canvashelper.cxx @@ -746,7 +746,7 @@ namespace oglcanvas aFont.SetAlign( ALIGN_BASELINE ); aFont.SetCharSet( (rFontRequest.FontDescription.IsSymbolFont==util::TriState_YES) ? RTL_TEXTENCODING_SYMBOL : RTL_TEXTENCODING_UNICODE ); - aFont.SetVertical( (rFontRequest.FontDescription.IsVertical==util::TriState_YES) ? true : false ); + aFont.SetVertical( rFontRequest.FontDescription.IsVertical==util::TriState_YES ); aFont.SetWeight( static_cast<FontWeight>(rFontRequest.FontDescription.FontDescription.Weight) ); aFont.SetItalic( (rFontRequest.FontDescription.FontDescription.Letterform<=8) ? ITALIC_NONE : ITALIC_NORMAL ); diff --git a/canvas/source/vcl/impltools.hxx b/canvas/source/vcl/impltools.hxx index ab1391bc2b0e..8f80939a2294 100644 --- a/canvas/source/vcl/impltools.hxx +++ b/canvas/source/vcl/impltools.hxx @@ -130,7 +130,7 @@ namespace vclcanvas explicit OutDevStateKeeper( const OutDevProviderSharedPtr& rOutDev ) : mpOutDev( rOutDev.get() ? &(rOutDev->getOutDev()) : NULL ), - mbMappingWasEnabled( mpOutDev ? mpOutDev->IsMapModeEnabled() : false ), + mbMappingWasEnabled( mpOutDev && mpOutDev->IsMapModeEnabled() ), mnAntiAliasing( mpOutDev ? mpOutDev->GetAntialiasing() : 0 ) { init(); |