diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-24 12:24:55 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-24 12:36:19 +0200 |
| commit | 3ac5138cfc01c1795ae05963fa4e5a6c7d22f4de (patch) | |
| tree | 60c0b053ae6773a840aaa65d1679c92832072845 /canvas | |
| parent | ed83ba34a55857f1a4f1c1f1577bb25dcf733bd4 (diff) | |
loplugin:simplifybool
Change-Id: I8087e16e50c06534e7d9a08c3bc72ab53de9f126
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/cairo/cairo_canvasfont.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/cairo/cairo_spritecanvas.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/tools/page.hxx | 2 | ||||
| -rw-r--r-- | canvas/source/vcl/canvasfont.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/vcl/spritecanvas.cxx | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/canvas/source/cairo/cairo_canvasfont.cxx b/canvas/source/cairo/cairo_canvasfont.cxx index f668b852ffcd..9a2b8650ba54 100644 --- a/canvas/source/cairo/cairo_canvasfont.cxx +++ b/canvas/source/cairo/cairo_canvasfont.cxx @@ -49,7 +49,7 @@ namespace cairocanvas { maFont->SetAlign( ALIGN_BASELINE ); maFont->SetCharSet( (rFontRequest.FontDescription.IsSymbolFont==com::sun::star::util::TriState_YES) ? RTL_TEXTENCODING_SYMBOL : RTL_TEXTENCODING_UNICODE ); - maFont->SetVertical( (rFontRequest.FontDescription.IsVertical==com::sun::star::util::TriState_YES) ? true : false ); + maFont->SetVertical( rFontRequest.FontDescription.IsVertical==com::sun::star::util::TriState_YES ); // TODO(F2): improve panose->vclenum conversion maFont->SetWeight( static_cast<FontWeight>(rFontRequest.FontDescription.FontDescription.Weight) ); diff --git a/canvas/source/cairo/cairo_spritecanvas.cxx b/canvas/source/cairo/cairo_spritecanvas.cxx index 40c37d1ca104..61db9c889827 100644 --- a/canvas/source/cairo/cairo_spritecanvas.cxx +++ b/canvas/source/cairo/cairo_spritecanvas.cxx @@ -135,7 +135,7 @@ namespace cairocanvas // avoid repaints on hidden window (hidden: not mapped to // screen). Return failure, since the screen really has _not_ // been updated (caller should try again later) - return !mbIsVisible ? false : maCanvasHelper.updateScreen( + return mbIsVisible && maCanvasHelper.updateScreen( ::basegfx::unotools::b2IRectangleFromAwtRectangle(maBounds), bUpdateAll, mbSurfaceDirty); diff --git a/canvas/source/tools/page.hxx b/canvas/source/tools/page.hxx index d4a0f8422bee..54773f21413d 100644 --- a/canvas/source/tools/page.hxx +++ b/canvas/source/tools/page.hxx @@ -121,7 +121,7 @@ namespace canvas return false; // call refresh() if requested, otherwise we're up to date... - return bRefresh ? refresh() : true; + return !bRefresh || refresh(); } bool refresh() diff --git a/canvas/source/vcl/canvasfont.cxx b/canvas/source/vcl/canvasfont.cxx index 7efcd3196cae..5477ea6bb257 100644 --- a/canvas/source/vcl/canvasfont.cxx +++ b/canvas/source/vcl/canvasfont.cxx @@ -51,7 +51,7 @@ namespace vclcanvas { maFont->SetAlign( ALIGN_BASELINE ); maFont->SetCharSet( (rFontRequest.FontDescription.IsSymbolFont==com::sun::star::util::TriState_YES) ? RTL_TEXTENCODING_SYMBOL : RTL_TEXTENCODING_UNICODE ); - maFont->SetVertical( (rFontRequest.FontDescription.IsVertical==com::sun::star::util::TriState_YES) ? true : false ); + maFont->SetVertical( rFontRequest.FontDescription.IsVertical==com::sun::star::util::TriState_YES ); // TODO(F2): improve panose->vclenum conversion maFont->SetWeight( static_cast<FontWeight>(rFontRequest.FontDescription.FontDescription.Weight) ); diff --git a/canvas/source/vcl/spritecanvas.cxx b/canvas/source/vcl/spritecanvas.cxx index 9dc31332ef0c..bcfe42d91b48 100644 --- a/canvas/source/vcl/spritecanvas.cxx +++ b/canvas/source/vcl/spritecanvas.cxx @@ -145,7 +145,7 @@ namespace vclcanvas // avoid repaints on hidden window (hidden: not mapped to // screen). Return failure, since the screen really has _not_ // been updated (caller should try again later) - return !mbIsVisible ? false : maCanvasHelper.updateScreen(bUpdateAll, + return !mbIsVisible && maCanvasHelper.updateScreen(bUpdateAll, mbSurfaceDirty); } |