canvas/source/cairo/cairo_spritedevicehelper.cxx | 8 ++++----
canvas/source/cairo/cairo_spritedevicehelper.hxx | 4 ++--
canvas/source/opengl/ogl_spritedevicehelper.cxx | 4 ++--
canvas/source/opengl/ogl_spritedevicehelper.hxx | 4 ++--
canvas/source/vcl/spritedevicehelper.cxx | 8 ++++----
canvas/source/vcl/spritedevicehelper.hxx | 4 ++--
6 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 05a676e86cbca3730c6b9e91ffdf8af214b90708
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Jul 2 11:45:45 2014 +0200
canvas: sal_Bool -> bool
Change-Id: I4292b0e8810fac781e64272b315dd32eced3623c
diff --git a/canvas/source/cairo/cairo_spritedevicehelper.cxx
b/canvas/source/cairo/cairo_spritedevicehelper.cxx
index 9673aec..8288186 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.cxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.cxx
@@ -85,16 +85,16 @@ namespace cairocanvas
// _always_ will have exactly one backbuffer
}
- sal_Bool SpriteDeviceHelper::showBuffer( bool, sal_Bool )
+ bool SpriteDeviceHelper::showBuffer( bool, bool )
{
OSL_FAIL("Not supposed to be called, handled by SpriteCanvas");
- return sal_False;
+ return false;
}
- sal_Bool SpriteDeviceHelper::switchBuffer( bool, sal_Bool )
+ bool SpriteDeviceHelper::switchBuffer( bool, bool )
{
OSL_FAIL("Not supposed to be called, handled by SpriteCanvas");
- return sal_False;
+ return false;
}
uno::Any SpriteDeviceHelper::isAccelerated() const
diff --git a/canvas/source/cairo/cairo_spritedevicehelper.hxx
b/canvas/source/cairo/cairo_spritedevicehelper.hxx
index bcd9a84..b359de0 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.hxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.hxx
@@ -54,8 +54,8 @@ namespace cairocanvas
// XWindowGraphicDevice
::sal_Int32 createBuffers( ::sal_Int32 nBuffers );
void destroyBuffers( );
- sal_Bool showBuffer( bool, sal_Bool );
- sal_Bool switchBuffer( bool, sal_Bool bUpdateAll );
+ bool showBuffer( bool, bool );
+ bool switchBuffer( bool, bool bUpdateAll );
::com::sun::star::uno::Any isAccelerated() const;
::com::sun::star::uno::Any getDeviceHandle() const;
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx
b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index d0dd6bb..781beaf 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -875,7 +875,7 @@ namespace oglcanvas
};
}
- sal_Bool SpriteDeviceHelper::showBuffer( bool bIsVisible, sal_Bool
/*bUpdateAll*/ )
+ bool SpriteDeviceHelper::showBuffer( bool bIsVisible, bool /*bUpdateAll*/ )
{
// hidden or disposed?
if( !bIsVisible || !mpChildWindow || !mpSpriteCanvas )
@@ -940,7 +940,7 @@ namespace oglcanvas
return true;
}
- sal_Bool SpriteDeviceHelper::switchBuffer( bool bIsVisible, sal_Bool
bUpdateAll )
+ bool SpriteDeviceHelper::switchBuffer( bool bIsVisible, bool bUpdateAll )
{
// no difference for VCL canvas
return showBuffer( bIsVisible, bUpdateAll );
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.hxx
b/canvas/source/opengl/ogl_spritedevicehelper.hxx
index 29a02bf..5fe9ed1 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.hxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.hxx
@@ -75,8 +75,8 @@ namespace oglcanvas
::sal_Int32 createBuffers( ::sal_Int32 nBuffers );
void destroyBuffers( );
- sal_Bool showBuffer( bool bIsVisible, sal_Bool bUpdateAll );
- sal_Bool switchBuffer( bool bIsVisible, sal_Bool bUpdateAll );
+ bool showBuffer( bool bIsVisible, bool bUpdateAll );
+ bool switchBuffer( bool bIsVisible, bool bUpdateAll );
::com::sun::star::uno::Any isAccelerated() const;
::com::sun::star::uno::Any getDeviceHandle() const;
diff --git a/canvas/source/vcl/spritedevicehelper.cxx
b/canvas/source/vcl/spritedevicehelper.cxx
index c33bc7b..dca0451 100644
--- a/canvas/source/vcl/spritedevicehelper.cxx
+++ b/canvas/source/vcl/spritedevicehelper.cxx
@@ -74,16 +74,16 @@ namespace vclcanvas
// _always_ will have exactly one backbuffer
}
- sal_Bool SpriteDeviceHelper::showBuffer( bool, sal_Bool )
+ bool SpriteDeviceHelper::showBuffer( bool, bool )
{
OSL_FAIL("Not supposed to be called, handled by SpriteCanvas");
- return sal_False;
+ return false;
}
- sal_Bool SpriteDeviceHelper::switchBuffer( bool, sal_Bool )
+ bool SpriteDeviceHelper::switchBuffer( bool, bool )
{
OSL_FAIL("Not supposed to be called, handled by SpriteCanvas");
- return sal_False;
+ return false;
}
void SpriteDeviceHelper::disposing()
diff --git a/canvas/source/vcl/spritedevicehelper.hxx
b/canvas/source/vcl/spritedevicehelper.hxx
index 74793ab..2dc0563 100644
--- a/canvas/source/vcl/spritedevicehelper.hxx
+++ b/canvas/source/vcl/spritedevicehelper.hxx
@@ -50,8 +50,8 @@ namespace vclcanvas
::sal_Int32 createBuffers( ::sal_Int32 nBuffers );
void destroyBuffers( );
- sal_Bool showBuffer( bool bWindowVisible, sal_Bool bUpdateAll );
- sal_Bool switchBuffer( bool bWindowVisible, sal_Bool bUpdateAll );
+ bool showBuffer( bool bWindowVisible, bool bUpdateAll );
+ bool switchBuffer( bool bWindowVisible, bool bUpdateAll );
::com::sun::star::uno::Any isAccelerated() const;
::com::sun::star::uno::Any getDeviceHandle() const;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
