diff options
| author | thb <thb@openoffice.org> | 2010-04-12 18:17:01 +0200 |
|---|---|---|
| committer | thb <thb@openoffice.org> | 2010-04-12 18:17:01 +0200 |
| commit | 630a7d6e0ac8d418b20d5958becedab51026cdd9 (patch) | |
| tree | 84fbf2e2b375d981478de331a3e6c0d7de99dc05 /canvas/source | |
| parent | ce1a6f91416ea6a3ca8aa067c0fac1e909ee272c (diff) | |
| parent | 0768a7d2726ce4f0772b52d95eeb23143336655c (diff) | |
Merged DEV300_m76
Diffstat (limited to 'canvas/source')
| -rwxr-xr-x | canvas/source/directx/dx_5rm.cxx | 2 | ||||
| -rwxr-xr-x | canvas/source/directx/dx_9rm.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/vcl/canvashelper.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/canvas/source/directx/dx_5rm.cxx b/canvas/source/directx/dx_5rm.cxx index bf3045e52678..642ef7bd7db6 100755 --- a/canvas/source/directx/dx_5rm.cxx +++ b/canvas/source/directx/dx_5rm.cxx @@ -1005,7 +1005,7 @@ namespace dxcanvas break; default: - ENSURE_OR_RETURN(false, + ENSURE_OR_RETURN_FALSE(false, "DXSurface::update(): Unknown/unimplemented buffer format" ); break; } diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx index 849ac3713885..a0f485befa12 100755 --- a/canvas/source/directx/dx_9rm.cxx +++ b/canvas/source/directx/dx_9rm.cxx @@ -541,7 +541,7 @@ namespace dxcanvas break; default: - ENSURE_OR_RETURN(false, + ENSURE_OR_RETURN_FALSE(false, "DXSurface::update(): Unknown/unimplemented buffer format" ); break; } diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx index f82ce1344a5c..a83b260d52d5 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -1387,7 +1387,7 @@ namespace vclcanvas const ::Size& rSz, const GraphicAttr& rAttr ) const { - ENSURE_OR_RETURN( rGrf, + ENSURE_OR_RETURN_FALSE( rGrf, "Invalid Graphic" ); if( !mpOutDev ) |