From 81bd29a61ef3ae052993877524357a4e1f3bc330 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 8 May 2014 11:41:41 +0200 Subject: canvas: sal_Bool->bool Change-Id: I0f0fe3bb937299b4f00a46d7dda6764c9d21a18f --- canvas/source/cairo/cairo_canvashelper.cxx | 2 +- canvas/source/cairo/cairo_canvashelper.hxx | 2 +- canvas/source/cairo/cairo_devicehelper.cxx | 4 ++-- canvas/source/cairo/cairo_devicehelper.hxx | 4 ++-- canvas/source/cairo/cairo_spritecanvas.cxx | 2 +- canvas/source/cairo/cairo_spritecanvashelper.cxx | 10 +++++----- canvas/source/cairo/cairo_spritecanvashelper.hxx | 6 +++--- canvas/source/directx/dx_bitmapcanvashelper.cxx | 2 +- canvas/source/directx/dx_bitmapcanvashelper.hxx | 2 +- canvas/source/directx/dx_devicehelper.cxx | 4 ++-- canvas/source/directx/dx_devicehelper.hxx | 4 ++-- canvas/source/directx/dx_spritecanvashelper.cxx | 10 +++++----- canvas/source/directx/dx_spritecanvashelper.hxx | 6 +++--- canvas/source/directx/dx_spritedevicehelper.cxx | 4 ++-- canvas/source/directx/dx_spritedevicehelper.hxx | 4 ++-- canvas/source/opengl/ogl_spritedevicehelper.cxx | 4 ++-- canvas/source/opengl/ogl_spritedevicehelper.hxx | 4 ++-- canvas/source/vcl/canvasbitmaphelper.cxx | 2 +- canvas/source/vcl/canvasbitmaphelper.hxx | 2 +- canvas/source/vcl/canvashelper.cxx | 2 +- canvas/source/vcl/canvashelper.hxx | 2 +- canvas/source/vcl/devicehelper.cxx | 4 ++-- canvas/source/vcl/devicehelper.hxx | 4 ++-- canvas/source/vcl/spritecanvashelper.cxx | 8 ++++---- canvas/source/vcl/spritecanvashelper.hxx | 4 ++-- 25 files changed, 51 insertions(+), 51 deletions(-) diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index f8b851df6652..170d927de94a 100644 --- a/canvas/source/cairo/cairo_canvashelper.cxx +++ b/canvas/source/cairo/cairo_canvashelper.cxx @@ -1553,7 +1553,7 @@ namespace cairocanvas } uno::Reference< rendering::XBitmap > CanvasHelper::getScaledBitmap( const geometry::RealSize2D& newSize, - sal_Bool /*beFast*/ ) + bool /*beFast*/ ) { #ifdef CAIRO_CANVAS_PERF_TRACE struct timespec aTimer; diff --git a/canvas/source/cairo/cairo_canvashelper.hxx b/canvas/source/cairo/cairo_canvashelper.hxx index cc659864bec3..9cf6c61fc875 100644 --- a/canvas/source/cairo/cairo_canvashelper.hxx +++ b/canvas/source/cairo/cairo_canvashelper.hxx @@ -227,7 +227,7 @@ namespace cairocanvas ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > getScaledBitmap( const ::com::sun::star::geometry::RealSize2D& newSize, - sal_Bool beFast ); + bool beFast ); ::com::sun::star::uno::Sequence< sal_Int8 > getData( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, diff --git a/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx index 216994b3bd2e..e4677e6a085c 100644 --- a/canvas/source/cairo/cairo_devicehelper.cxx +++ b/canvas/source/cairo/cairo_devicehelper.cxx @@ -203,13 +203,13 @@ namespace cairocanvas return uno::Reference< rendering::XVolatileBitmap >(); } - sal_Bool DeviceHelper::hasFullScreenMode() + bool DeviceHelper::hasFullScreenMode() { // TODO(F3): offer fullscreen mode the XCanvas way return false; } - sal_Bool DeviceHelper::enterFullScreenMode( sal_Bool /*bEnter*/ ) + bool DeviceHelper::enterFullScreenMode( bool /*bEnter*/ ) { // TODO(F3): offer fullscreen mode the XCanvas way return false; diff --git a/canvas/source/cairo/cairo_devicehelper.hxx b/canvas/source/cairo/cairo_devicehelper.hxx index aaf3d35df170..2d377c9c9a50 100644 --- a/canvas/source/cairo/cairo_devicehelper.hxx +++ b/canvas/source/cairo/cairo_devicehelper.hxx @@ -77,8 +77,8 @@ namespace cairocanvas ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > createVolatileAlphaBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& rDevice, const ::com::sun::star::geometry::IntegerSize2D& size ); - sal_Bool hasFullScreenMode( ); - sal_Bool enterFullScreenMode( sal_Bool bEnter ); + bool hasFullScreenMode( ); + bool enterFullScreenMode( bool bEnter ); ::com::sun::star::uno::Any isAccelerated() const; ::com::sun::star::uno::Any getDeviceHandle() const; diff --git a/canvas/source/cairo/cairo_spritecanvas.cxx b/canvas/source/cairo/cairo_spritecanvas.cxx index c306716bbac7..56b852c7f5ca 100644 --- a/canvas/source/cairo/cairo_spritecanvas.cxx +++ b/canvas/source/cairo/cairo_spritecanvas.cxx @@ -74,7 +74,7 @@ namespace cairocanvas awt::Rectangle aRect; maArguments[2] >>= aRect; - sal_Bool bIsFullscreen( sal_False ); + bool bIsFullscreen( false ); maArguments[3] >>= bIsFullscreen; uno::Reference< awt::XWindow > xParentWindow; diff --git a/canvas/source/cairo/cairo_spritecanvashelper.cxx b/canvas/source/cairo/cairo_spritecanvashelper.cxx index bf30993a3907..eb33f8f3d406 100644 --- a/canvas/source/cairo/cairo_spritecanvashelper.cxx +++ b/canvas/source/cairo/cairo_spritecanvashelper.cxx @@ -189,16 +189,16 @@ namespace cairocanvas return uno::Reference< rendering::XSprite >(); } - sal_Bool SpriteCanvasHelper::updateScreen( const ::basegfx::B2IRange& /*rCurrArea*/, - sal_Bool bUpdateAll, - bool& io_bSurfaceDirty ) + bool SpriteCanvasHelper::updateScreen( const ::basegfx::B2IRange& /*rCurrArea*/, + bool bUpdateAll, + bool& io_bSurfaceDirty ) { if( !mpRedrawManager || !mpOwningSpriteCanvas || !mpOwningSpriteCanvas->getWindowSurface() || !mpOwningSpriteCanvas->getBufferSurface() ) { - return sal_False; // disposed, or otherwise dysfunctional + return false; // disposed, or otherwise dysfunctional } SAL_INFO("canvas.cairo", "SpriteCanvasHelper::updateScreen called"); @@ -268,7 +268,7 @@ namespace cairocanvas // commit to screen mpOwningSpriteCanvas->flush(); - return sal_True; + return true; } void SpriteCanvasHelper::backgroundPaint( const ::basegfx::B2DRange& rUpdateRect ) diff --git a/canvas/source/cairo/cairo_spritecanvashelper.hxx b/canvas/source/cairo/cairo_spritecanvashelper.hxx index 9bec3dfcc294..0f68bfc6f6b7 100644 --- a/canvas/source/cairo/cairo_spritecanvashelper.hxx +++ b/canvas/source/cairo/cairo_spritecanvashelper.hxx @@ -82,9 +82,9 @@ namespace cairocanvas In/out parameter, whether backbuffer surface is dirty (if yes, we're performing a full update, anyway) */ - sal_Bool updateScreen( const ::basegfx::B2IRange& rCurrArea, - sal_Bool bUpdateAll, - bool& io_bSurfaceDirty ); + bool updateScreen( const ::basegfx::B2IRange& rCurrArea, + bool bUpdateAll, + bool& io_bSurfaceDirty ); // SpriteRedrawManager functor calls diff --git a/canvas/source/directx/dx_bitmapcanvashelper.cxx b/canvas/source/directx/dx_bitmapcanvashelper.cxx index e8eeddd0adab..0221cecde14d 100644 --- a/canvas/source/directx/dx_bitmapcanvashelper.cxx +++ b/canvas/source/directx/dx_bitmapcanvashelper.cxx @@ -149,7 +149,7 @@ namespace dxcanvas } uno::Reference< rendering::XBitmap > BitmapCanvasHelper::getScaledBitmap( const geometry::RealSize2D& /*newSize*/, - sal_Bool /*beFast*/ ) + bool /*beFast*/ ) { // TODO(F1): return uno::Reference< rendering::XBitmap >(); diff --git a/canvas/source/directx/dx_bitmapcanvashelper.hxx b/canvas/source/directx/dx_bitmapcanvashelper.hxx index 163c37fd7e55..80f8d9ae8f18 100644 --- a/canvas/source/directx/dx_bitmapcanvashelper.hxx +++ b/canvas/source/directx/dx_bitmapcanvashelper.hxx @@ -96,7 +96,7 @@ namespace dxcanvas ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > getScaledBitmap( const ::com::sun::star::geometry::RealSize2D& newSize, - sal_Bool beFast ); + bool beFast ); ::com::sun::star::uno::Sequence< sal_Int8 > getData( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, diff --git a/canvas/source/directx/dx_devicehelper.cxx b/canvas/source/directx/dx_devicehelper.cxx index 59d26e47627f..673b9f426c9c 100644 --- a/canvas/source/directx/dx_devicehelper.cxx +++ b/canvas/source/directx/dx_devicehelper.cxx @@ -175,12 +175,12 @@ namespace dxcanvas return uno::Reference< rendering::XVolatileBitmap >(); } - sal_Bool DeviceHelper::hasFullScreenMode() + bool DeviceHelper::hasFullScreenMode() { return false; } - sal_Bool DeviceHelper::enterFullScreenMode( sal_Bool /*bEnter*/ ) + bool DeviceHelper::enterFullScreenMode( bool /*bEnter*/ ) { return false; } diff --git a/canvas/source/directx/dx_devicehelper.hxx b/canvas/source/directx/dx_devicehelper.hxx index 8c674131f755..de3237bd466e 100644 --- a/canvas/source/directx/dx_devicehelper.hxx +++ b/canvas/source/directx/dx_devicehelper.hxx @@ -78,8 +78,8 @@ namespace dxcanvas const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& rDevice, const ::com::sun::star::geometry::IntegerSize2D& size ); - sal_Bool hasFullScreenMode(); - sal_Bool enterFullScreenMode( sal_Bool bEnter ); + bool hasFullScreenMode(); + bool enterFullScreenMode( bool bEnter ); ::com::sun::star::uno::Any isAccelerated() const; ::com::sun::star::uno::Any getDeviceHandle() const; diff --git a/canvas/source/directx/dx_spritecanvashelper.cxx b/canvas/source/directx/dx_spritecanvashelper.cxx index 2f0e3a26cd50..db7f9352f2df 100644 --- a/canvas/source/directx/dx_spritecanvashelper.cxx +++ b/canvas/source/directx/dx_spritecanvashelper.cxx @@ -171,15 +171,15 @@ namespace dxcanvas return uno::Reference< rendering::XSprite >(); } - sal_Bool SpriteCanvasHelper::updateScreen( const ::basegfx::B2IRectangle& rCurrArea, - sal_Bool bUpdateAll, - bool& io_bSurfaceDirty ) + bool SpriteCanvasHelper::updateScreen( const ::basegfx::B2IRectangle& rCurrArea, + bool bUpdateAll, + bool& io_bSurfaceDirty ) { if( !mpRedrawManager || !mpRenderModule || !mpBackBuffer ) { - return sal_False; // disposed, or otherwise dysfunctional + return false; // disposed, or otherwise dysfunctional } #if defined(DX_DEBUG_IMAGES) @@ -251,7 +251,7 @@ namespace dxcanvas io_bSurfaceDirty = false; - return sal_True; + return true; } void SpriteCanvasHelper::backgroundPaint( const ::basegfx::B2DRange& rUpdateRect ) diff --git a/canvas/source/directx/dx_spritecanvashelper.hxx b/canvas/source/directx/dx_spritecanvashelper.hxx index ec764913afd2..f6fb74f88cf1 100644 --- a/canvas/source/directx/dx_spritecanvashelper.hxx +++ b/canvas/source/directx/dx_spritecanvashelper.hxx @@ -86,9 +86,9 @@ namespace dxcanvas In/out parameter, whether backbuffer surface is dirty (if yes, we're performing a full update, anyway) */ - sal_Bool updateScreen( const ::basegfx::B2IRectangle& rCurrArea, - sal_Bool bUpdateAll, - bool& io_bSurfaceDirty ); + bool updateScreen( const ::basegfx::B2IRectangle& rCurrArea, + bool bUpdateAll, + bool& io_bSurfaceDirty ); // SpriteRedrawManager functor calls diff --git a/canvas/source/directx/dx_spritedevicehelper.cxx b/canvas/source/directx/dx_spritedevicehelper.cxx index 89c52ce6c125..a8f1db36671a 100644 --- a/canvas/source/directx/dx_spritedevicehelper.cxx +++ b/canvas/source/directx/dx_spritedevicehelper.cxx @@ -164,13 +164,13 @@ namespace dxcanvas return uno::Reference< rendering::XVolatileBitmap >(); } - sal_Bool SpriteDeviceHelper::hasFullScreenMode() + bool SpriteDeviceHelper::hasFullScreenMode() { // TODO(F3): offer fullscreen mode the XCanvas way return false; } - sal_Bool SpriteDeviceHelper::enterFullScreenMode( sal_Bool /*bEnter*/ ) + bool SpriteDeviceHelper::enterFullScreenMode( bool /*bEnter*/ ) { // TODO(F3): offer fullscreen mode the XCanvas way return false; diff --git a/canvas/source/directx/dx_spritedevicehelper.hxx b/canvas/source/directx/dx_spritedevicehelper.hxx index 455010f7ca86..81a8bb4ee263 100644 --- a/canvas/source/directx/dx_spritedevicehelper.hxx +++ b/canvas/source/directx/dx_spritedevicehelper.hxx @@ -64,8 +64,8 @@ namespace dxcanvas const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& rDevice, const ::com::sun::star::geometry::IntegerSize2D& size ); - sal_Bool hasFullScreenMode( ); - sal_Bool enterFullScreenMode( sal_Bool bEnter ); + bool hasFullScreenMode( ); + bool enterFullScreenMode( bool bEnter ); ::sal_Int32 createBuffers( ::sal_Int32 nBuffers ); void destroyBuffers( ); diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx index 6c8802da7526..52491c678737 100644 --- a/canvas/source/opengl/ogl_spritedevicehelper.cxx +++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx @@ -831,13 +831,13 @@ namespace oglcanvas return uno::Reference< rendering::XVolatileBitmap >(); } - sal_Bool SpriteDeviceHelper::hasFullScreenMode() + bool SpriteDeviceHelper::hasFullScreenMode() { // TODO(F3): offer fullscreen mode the XCanvas way return false; } - sal_Bool SpriteDeviceHelper::enterFullScreenMode( sal_Bool /*bEnter*/ ) + bool SpriteDeviceHelper::enterFullScreenMode( bool /*bEnter*/ ) { // TODO(F3): offer fullscreen mode the XCanvas way return false; diff --git a/canvas/source/opengl/ogl_spritedevicehelper.hxx b/canvas/source/opengl/ogl_spritedevicehelper.hxx index 23f5f27481e2..29a02bf89411 100644 --- a/canvas/source/opengl/ogl_spritedevicehelper.hxx +++ b/canvas/source/opengl/ogl_spritedevicehelper.hxx @@ -70,8 +70,8 @@ namespace oglcanvas const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& rDevice, const ::com::sun::star::geometry::IntegerSize2D& size ); - sal_Bool hasFullScreenMode( ); - sal_Bool enterFullScreenMode( sal_Bool bEnter ); + bool hasFullScreenMode( ); + bool enterFullScreenMode( bool bEnter ); ::sal_Int32 createBuffers( ::sal_Int32 nBuffers ); void destroyBuffers( ); diff --git a/canvas/source/vcl/canvasbitmaphelper.cxx b/canvas/source/vcl/canvasbitmaphelper.cxx index 9178ff744c69..efbd61e72369 100644 --- a/canvas/source/vcl/canvasbitmaphelper.cxx +++ b/canvas/source/vcl/canvasbitmaphelper.cxx @@ -106,7 +106,7 @@ namespace vclcanvas } uno::Reference< rendering::XBitmap > CanvasBitmapHelper::getScaledBitmap( const geometry::RealSize2D& newSize, - sal_Bool beFast ) + bool beFast ) { ENSURE_OR_THROW( mpDevice, "disposed CanvasHelper" ); diff --git a/canvas/source/vcl/canvasbitmaphelper.hxx b/canvas/source/vcl/canvasbitmaphelper.hxx index ddd958ac661d..31fb60cba44a 100644 --- a/canvas/source/vcl/canvasbitmaphelper.hxx +++ b/canvas/source/vcl/canvasbitmaphelper.hxx @@ -86,7 +86,7 @@ namespace vclcanvas ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > getScaledBitmap( const ::com::sun::star::geometry::RealSize2D& newSize, - sal_Bool beFast ); + bool beFast ); ::com::sun::star::uno::Sequence< sal_Int8 > getData( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx index 521056068892..0bd3954f0885 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -928,7 +928,7 @@ namespace vclcanvas } uno::Reference< rendering::XBitmap > CanvasHelper::getScaledBitmap( const geometry::RealSize2D& newSize, - sal_Bool beFast ) + bool beFast ) { if( !mpOutDev.get() || !mpDevice ) return uno::Reference< rendering::XBitmap >(); // we're disposed diff --git a/canvas/source/vcl/canvashelper.hxx b/canvas/source/vcl/canvashelper.hxx index 3c35684ffa78..536b5de4d52c 100644 --- a/canvas/source/vcl/canvashelper.hxx +++ b/canvas/source/vcl/canvashelper.hxx @@ -244,7 +244,7 @@ namespace vclcanvas ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > getScaledBitmap( const ::com::sun::star::geometry::RealSize2D& newSize, - sal_Bool beFast ); + bool beFast ); ::com::sun::star::uno::Sequence< sal_Int8 > getData( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, diff --git a/canvas/source/vcl/devicehelper.cxx b/canvas/source/vcl/devicehelper.cxx index e0c5fe001cac..d90d8771ee89 100644 --- a/canvas/source/vcl/devicehelper.cxx +++ b/canvas/source/vcl/devicehelper.cxx @@ -149,12 +149,12 @@ namespace vclcanvas return uno::Reference< rendering::XVolatileBitmap >(); } - sal_Bool DeviceHelper::hasFullScreenMode() + bool DeviceHelper::hasFullScreenMode() { return false; } - sal_Bool DeviceHelper::enterFullScreenMode( sal_Bool bEnter ) + bool DeviceHelper::enterFullScreenMode( bool bEnter ) { (void)bEnter; return false; diff --git a/canvas/source/vcl/devicehelper.hxx b/canvas/source/vcl/devicehelper.hxx index 821e78d6ffbb..3ae48b570a01 100644 --- a/canvas/source/vcl/devicehelper.hxx +++ b/canvas/source/vcl/devicehelper.hxx @@ -68,8 +68,8 @@ namespace vclcanvas ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > createVolatileAlphaBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& rDevice, const ::com::sun::star::geometry::IntegerSize2D& size ); - sal_Bool hasFullScreenMode( ); - sal_Bool enterFullScreenMode( sal_Bool bEnter ); + bool hasFullScreenMode( ); + bool enterFullScreenMode( bool bEnter ); ::com::sun::star::uno::Any isAccelerated() const; ::com::sun::star::uno::Any getDeviceHandle() const; diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx index 1003fc23f199..13ae62900f2b 100644 --- a/canvas/source/vcl/spritecanvashelper.cxx +++ b/canvas/source/vcl/spritecanvashelper.cxx @@ -241,15 +241,15 @@ namespace vclcanvas return uno::Reference< rendering::XSprite >(); } - sal_Bool SpriteCanvasHelper::updateScreen( sal_Bool bUpdateAll, - bool& io_bSurfaceDirty ) + bool SpriteCanvasHelper::updateScreen( bool bUpdateAll, + bool& io_bSurfaceDirty ) { if( !mpRedrawManager || !mpOwningSpriteCanvas || !mpOwningSpriteCanvas->getFrontBuffer() || !mpOwningSpriteCanvas->getBackBuffer() ) { - return sal_False; // disposed, or otherwise dysfunctional + return false; // disposed, or otherwise dysfunctional } // commit to backbuffer @@ -361,7 +361,7 @@ namespace vclcanvas pTargetWindow->Sync(); } - return sal_True; + return true; } void SpriteCanvasHelper::backgroundPaint( const ::basegfx::B2DRange& rUpdateRect ) diff --git a/canvas/source/vcl/spritecanvashelper.hxx b/canvas/source/vcl/spritecanvashelper.hxx index e40298a544c2..dc165d460296 100644 --- a/canvas/source/vcl/spritecanvashelper.hxx +++ b/canvas/source/vcl/spritecanvashelper.hxx @@ -80,8 +80,8 @@ namespace vclcanvas In/out parameter, whether backbuffer surface is dirty (if yes, we're performing a full update, anyway) */ - sal_Bool updateScreen( sal_Bool bUpdateAll, - bool& io_bSurfaceDirty ); + bool updateScreen( bool bUpdateAll, + bool& io_bSurfaceDirty ); // SpriteRedrawManager functor calls -- cgit