summaryrefslogtreecommitdiff
path: root/canvas
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-04-03 13:52:06 +0200
committerNoel Grandin <noel@peralex.com>2014-04-03 13:54:02 +0200
commit5babf1b9037eb283798322eecd8334e6ff1db655 (patch)
treea6be386ebc21a7e0c47b5ac78279edc873cf0578 /canvas
parentc03c9da8c249c2e2a61bab3d6fad325d5934f5e0 (diff)
remove unnecessary scope qualifier from sal_Bool uses
i.e. convert "::sal_Bool" to "sal_Bool" Change-Id: Ie5943aee4fee617bf2670655558927ed25b7e067
Diffstat (limited to 'canvas')
-rw-r--r--canvas/source/cairo/cairo_spritecanvas.cxx4
-rw-r--r--canvas/source/cairo/cairo_spritecanvas.hxx4
-rw-r--r--canvas/source/cairo/cairo_spritedevicehelper.cxx4
-rw-r--r--canvas/source/cairo/cairo_spritedevicehelper.hxx4
-rw-r--r--canvas/source/directx/dx_spritecanvas.cxx4
-rw-r--r--canvas/source/directx/dx_spritecanvas.hxx4
-rw-r--r--canvas/source/directx/dx_spritedevicehelper.cxx4
-rw-r--r--canvas/source/directx/dx_spritedevicehelper.hxx4
-rw-r--r--canvas/source/opengl/ogl_spritecanvas.cxx4
-rw-r--r--canvas/source/opengl/ogl_spritecanvas.hxx6
-rw-r--r--canvas/source/opengl/ogl_spritedevicehelper.cxx4
-rw-r--r--canvas/source/opengl/ogl_spritedevicehelper.hxx4
-rw-r--r--canvas/source/simplecanvas/simplecanvasimpl.cxx4
-rw-r--r--canvas/source/vcl/spritecanvas.cxx4
-rw-r--r--canvas/source/vcl/spritecanvas.hxx4
-rw-r--r--canvas/source/vcl/spritedevicehelper.cxx4
-rw-r--r--canvas/source/vcl/spritedevicehelper.hxx4
17 files changed, 35 insertions, 35 deletions
diff --git a/canvas/source/cairo/cairo_spritecanvas.cxx b/canvas/source/cairo/cairo_spritecanvas.cxx
index 09cf42736f34..c306716bbac7 100644
--- a/canvas/source/cairo/cairo_spritecanvas.cxx
+++ b/canvas/source/cairo/cairo_spritecanvas.cxx
@@ -121,12 +121,12 @@ namespace cairocanvas
SpriteCanvasBaseT::disposeThis();
}
- ::sal_Bool SAL_CALL SpriteCanvas::showBuffer( ::sal_Bool bUpdateAll ) throw (uno::RuntimeException, std::exception)
+ sal_Bool SAL_CALL SpriteCanvas::showBuffer( sal_Bool bUpdateAll ) throw (uno::RuntimeException, std::exception)
{
return updateScreen( bUpdateAll );
}
- ::sal_Bool SAL_CALL SpriteCanvas::switchBuffer( ::sal_Bool bUpdateAll ) throw (uno::RuntimeException)
+ sal_Bool SAL_CALL SpriteCanvas::switchBuffer( sal_Bool bUpdateAll ) throw (uno::RuntimeException)
{
return updateScreen( bUpdateAll );
}
diff --git a/canvas/source/cairo/cairo_spritecanvas.hxx b/canvas/source/cairo/cairo_spritecanvas.hxx
index ce5b429da264..6737c38c9e95 100644
--- a/canvas/source/cairo/cairo_spritecanvas.hxx
+++ b/canvas/source/cairo/cairo_spritecanvas.hxx
@@ -123,8 +123,8 @@ namespace cairocanvas
DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase );
// XBufferController (partial)
- virtual ::sal_Bool SAL_CALL showBuffer( ::sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::sal_Bool SAL_CALL switchBuffer( ::sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
// XSpriteCanvas (partial)
virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/canvas/source/cairo/cairo_spritedevicehelper.cxx b/canvas/source/cairo/cairo_spritedevicehelper.cxx
index 465771736c17..c73aa748c86c 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.cxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.cxx
@@ -85,13 +85,13 @@ namespace cairocanvas
// _always_ will have exactly one backbuffer
}
- ::sal_Bool SpriteDeviceHelper::showBuffer( bool, ::sal_Bool )
+ sal_Bool SpriteDeviceHelper::showBuffer( bool, sal_Bool )
{
OSL_FAIL("Not supposed to be called, handled by SpriteCanvas");
return sal_False;
}
- ::sal_Bool SpriteDeviceHelper::switchBuffer( bool, ::sal_Bool )
+ sal_Bool SpriteDeviceHelper::switchBuffer( bool, sal_Bool )
{
OSL_FAIL("Not supposed to be called, handled by SpriteCanvas");
return sal_False;
diff --git a/canvas/source/cairo/cairo_spritedevicehelper.hxx b/canvas/source/cairo/cairo_spritedevicehelper.hxx
index e5959460a480..7df14756e124 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 );
+ sal_Bool showBuffer( bool, sal_Bool );
+ sal_Bool switchBuffer( bool, sal_Bool bUpdateAll );
::com::sun::star::uno::Any isAccelerated() const;
::com::sun::star::uno::Any getDeviceHandle() const;
diff --git a/canvas/source/directx/dx_spritecanvas.cxx b/canvas/source/directx/dx_spritecanvas.cxx
index 9d93a610405f..d4d9072f9cf9 100644
--- a/canvas/source/directx/dx_spritecanvas.cxx
+++ b/canvas/source/directx/dx_spritecanvas.cxx
@@ -122,7 +122,7 @@ namespace dxcanvas
SpriteCanvasBaseT::disposeThis();
}
- ::sal_Bool SAL_CALL SpriteCanvas::showBuffer( ::sal_Bool bUpdateAll ) throw (uno::RuntimeException)
+ sal_Bool SAL_CALL SpriteCanvas::showBuffer( sal_Bool bUpdateAll ) throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -132,7 +132,7 @@ namespace dxcanvas
return !mbIsVisible ? false : SpriteCanvasBaseT::showBuffer( bUpdateAll );
}
- ::sal_Bool SAL_CALL SpriteCanvas::switchBuffer( ::sal_Bool bUpdateAll ) throw (uno::RuntimeException)
+ sal_Bool SAL_CALL SpriteCanvas::switchBuffer( sal_Bool bUpdateAll ) throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
diff --git a/canvas/source/directx/dx_spritecanvas.hxx b/canvas/source/directx/dx_spritecanvas.hxx
index 8bf7f5977c98..b6bc4228eb9a 100644
--- a/canvas/source/directx/dx_spritecanvas.hxx
+++ b/canvas/source/directx/dx_spritecanvas.hxx
@@ -118,8 +118,8 @@ namespace dxcanvas
DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase );
// XBufferController (partial)
- virtual ::sal_Bool SAL_CALL showBuffer( ::sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::sal_Bool SAL_CALL switchBuffer( ::sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException);
// XSpriteCanvas (partial)
virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/canvas/source/directx/dx_spritedevicehelper.cxx b/canvas/source/directx/dx_spritedevicehelper.cxx
index 8ab7b3a4a4a5..89c52ce6c125 100644
--- a/canvas/source/directx/dx_spritedevicehelper.cxx
+++ b/canvas/source/directx/dx_spritedevicehelper.cxx
@@ -189,13 +189,13 @@ namespace dxcanvas
// _always_ will have exactly one backbuffer
}
- ::sal_Bool SpriteDeviceHelper::showBuffer( bool, ::sal_Bool )
+ sal_Bool SpriteDeviceHelper::showBuffer( bool, sal_Bool )
{
OSL_FAIL("Not supposed to be called, handled by SpriteCanvas");
return sal_False;
}
- ::sal_Bool SpriteDeviceHelper::switchBuffer( bool, ::sal_Bool )
+ sal_Bool SpriteDeviceHelper::switchBuffer( bool, sal_Bool )
{
OSL_FAIL("Not supposed to be called, handled by SpriteCanvas");
return sal_False;
diff --git a/canvas/source/directx/dx_spritedevicehelper.hxx b/canvas/source/directx/dx_spritedevicehelper.hxx
index 4c33627aeab2..455010f7ca86 100644
--- a/canvas/source/directx/dx_spritedevicehelper.hxx
+++ b/canvas/source/directx/dx_spritedevicehelper.hxx
@@ -69,8 +69,8 @@ namespace dxcanvas
::sal_Int32 createBuffers( ::sal_Int32 nBuffers );
void destroyBuffers( );
- ::sal_Bool showBuffer( bool bIsVisible, ::sal_Bool bUpdateAll );
- ::sal_Bool switchBuffer( bool bIsVisible, ::sal_Bool bUpdateAll );
+ sal_Bool showBuffer( bool bIsVisible, sal_Bool bUpdateAll );
+ sal_Bool switchBuffer( bool bIsVisible, sal_Bool bUpdateAll );
const IDXRenderModuleSharedPtr& getRenderModule() const { return mpRenderModule; }
const DXSurfaceBitmapSharedPtr& getBackBuffer() const { return mpBackBuffer; }
diff --git a/canvas/source/opengl/ogl_spritecanvas.cxx b/canvas/source/opengl/ogl_spritecanvas.cxx
index b804e4b07a16..32f1db40cbf8 100644
--- a/canvas/source/opengl/ogl_spritecanvas.cxx
+++ b/canvas/source/opengl/ogl_spritecanvas.cxx
@@ -93,7 +93,7 @@ namespace oglcanvas
SpriteCanvasBaseT::disposeThis();
}
- ::sal_Bool SAL_CALL SpriteCanvas::showBuffer( ::sal_Bool bUpdateAll ) throw (uno::RuntimeException, std::exception)
+ sal_Bool SAL_CALL SpriteCanvas::showBuffer( sal_Bool bUpdateAll ) throw (uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -103,7 +103,7 @@ namespace oglcanvas
return !mbIsVisible ? false : SpriteCanvasBaseT::showBuffer( bUpdateAll );
}
- ::sal_Bool SAL_CALL SpriteCanvas::switchBuffer( ::sal_Bool bUpdateAll ) throw (uno::RuntimeException)
+ sal_Bool SAL_CALL SpriteCanvas::switchBuffer( sal_Bool bUpdateAll ) throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
diff --git a/canvas/source/opengl/ogl_spritecanvas.hxx b/canvas/source/opengl/ogl_spritecanvas.hxx
index 57a121cd0cca..a026144276c1 100644
--- a/canvas/source/opengl/ogl_spritecanvas.hxx
+++ b/canvas/source/opengl/ogl_spritecanvas.hxx
@@ -85,15 +85,15 @@ namespace oglcanvas
DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase );
// XBufferController (partial)
- virtual ::sal_Bool SAL_CALL showBuffer( ::sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::sal_Bool SAL_CALL switchBuffer( ::sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
// XSpriteCanvas
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimatedSprite > SAL_CALL createSpriteFromAnimation( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimation >& animation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimatedSprite > SAL_CALL createSpriteFromBitmaps( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > >& animationBitmaps, ::sal_Int8 interpolationMode ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCustomSprite > SAL_CALL createCustomSprite( const ::com::sun::star::geometry::RealSize2D& spriteSize ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite > SAL_CALL createClonedSprite( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite >& original ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::sal_Bool SAL_CALL updateScreen( ::sal_Bool bUpdateAll )
+ virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll )
throw (::com::sun::star::uno::RuntimeException,
std::exception) SAL_OVERRIDE;
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index 34ce27b54af5..6c8802da7526 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*/ )
+ sal_Bool SpriteDeviceHelper::showBuffer( bool bIsVisible, sal_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 )
+ sal_Bool SpriteDeviceHelper::switchBuffer( bool bIsVisible, sal_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 f50691899134..23f5f27481e2 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 );
+ sal_Bool showBuffer( bool bIsVisible, sal_Bool bUpdateAll );
+ sal_Bool switchBuffer( bool bIsVisible, sal_Bool bUpdateAll );
::com::sun::star::uno::Any isAccelerated() const;
::com::sun::star::uno::Any getDeviceHandle() const;
diff --git a/canvas/source/simplecanvas/simplecanvasimpl.cxx b/canvas/source/simplecanvas/simplecanvasimpl.cxx
index fcc514b31974..07c8717121e6 100644
--- a/canvas/source/simplecanvas/simplecanvasimpl.cxx
+++ b/canvas/source/simplecanvas/simplecanvasimpl.cxx
@@ -184,8 +184,8 @@ namespace
// Ifc XSimpleCanvas
virtual void SAL_CALL selectFont( const OUString& sFontName,
double size,
- ::sal_Bool bold,
- ::sal_Bool italic ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
+ sal_Bool bold,
+ sal_Bool italic ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
{
::osl::MutexGuard aGuard( m_aMutex );
diff --git a/canvas/source/vcl/spritecanvas.cxx b/canvas/source/vcl/spritecanvas.cxx
index ca815d855b91..9dc31332ef0c 100644
--- a/canvas/source/vcl/spritecanvas.cxx
+++ b/canvas/source/vcl/spritecanvas.cxx
@@ -128,12 +128,12 @@ namespace vclcanvas
SpriteCanvasBaseT::disposeThis();
}
- ::sal_Bool SAL_CALL SpriteCanvas::showBuffer( ::sal_Bool bUpdateAll ) throw (uno::RuntimeException, std::exception)
+ sal_Bool SAL_CALL SpriteCanvas::showBuffer( sal_Bool bUpdateAll ) throw (uno::RuntimeException, std::exception)
{
return updateScreen( bUpdateAll );
}
- ::sal_Bool SAL_CALL SpriteCanvas::switchBuffer( ::sal_Bool bUpdateAll ) throw (uno::RuntimeException)
+ sal_Bool SAL_CALL SpriteCanvas::switchBuffer( sal_Bool bUpdateAll ) throw (uno::RuntimeException)
{
return updateScreen( bUpdateAll );
}
diff --git a/canvas/source/vcl/spritecanvas.hxx b/canvas/source/vcl/spritecanvas.hxx
index 2343f38f2b52..f2015ee49887 100644
--- a/canvas/source/vcl/spritecanvas.hxx
+++ b/canvas/source/vcl/spritecanvas.hxx
@@ -125,8 +125,8 @@ namespace vclcanvas
DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase );
// XBufferController (partial)
- virtual ::sal_Bool SAL_CALL showBuffer( ::sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::sal_Bool SAL_CALL switchBuffer( ::sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
// XSpriteCanvas (partial)
virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/canvas/source/vcl/spritedevicehelper.cxx b/canvas/source/vcl/spritedevicehelper.cxx
index 9b6ace50f926..c33bc7b33c63 100644
--- a/canvas/source/vcl/spritedevicehelper.cxx
+++ b/canvas/source/vcl/spritedevicehelper.cxx
@@ -74,13 +74,13 @@ namespace vclcanvas
// _always_ will have exactly one backbuffer
}
- ::sal_Bool SpriteDeviceHelper::showBuffer( bool, ::sal_Bool )
+ sal_Bool SpriteDeviceHelper::showBuffer( bool, sal_Bool )
{
OSL_FAIL("Not supposed to be called, handled by SpriteCanvas");
return sal_False;
}
- ::sal_Bool SpriteDeviceHelper::switchBuffer( bool, ::sal_Bool )
+ sal_Bool SpriteDeviceHelper::switchBuffer( bool, sal_Bool )
{
OSL_FAIL("Not supposed to be called, handled by SpriteCanvas");
return sal_False;
diff --git a/canvas/source/vcl/spritedevicehelper.hxx b/canvas/source/vcl/spritedevicehelper.hxx
index bf97638495b9..74793aba2d46 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 );
+ sal_Bool showBuffer( bool bWindowVisible, sal_Bool bUpdateAll );
+ sal_Bool switchBuffer( bool bWindowVisible, sal_Bool bUpdateAll );
::com::sun::star::uno::Any isAccelerated() const;
::com::sun::star::uno::Any getDeviceHandle() const;