diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 09:42:27 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 09:42:27 +0000 |
| commit | 0d910998cb9fa8c57b1588289231c01c8164804c (patch) | |
| tree | fa626f93a2d46d8ad54ca75d3843c02bdd347d23 /canvas/source/null | |
| parent | e3781ea6c922f64c19886a086171c1ba61fb8a03 (diff) | |
INTEGRATION: CWS canvas05 (1.3.68); FILE MERGED
2008/04/21 07:27:16 thb 1.3.68.2: RESYNC: (1.3-1.4); FILE MERGED
2007/10/01 13:02:02 thb 1.3.68.1: #i78888# #i78925# #i79258# #i79437# Merge from CWS picom
Diffstat (limited to 'canvas/source/null')
| -rw-r--r-- | canvas/source/null/null_canvasbitmap.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/canvas/source/null/null_canvasbitmap.cxx b/canvas/source/null/null_canvasbitmap.cxx index 2657d085071c..28854a8d6482 100644 --- a/canvas/source/null/null_canvasbitmap.cxx +++ b/canvas/source/null/null_canvasbitmap.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: null_canvasbitmap.cxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.5 $ * * This file is part of OpenOffice.org. * @@ -32,6 +32,7 @@ #include "precompiled_canvas.hxx" #include <canvas/debug.hxx> +#include <tools/diagnose_ex.h> #include <canvas/canvastools.hxx> #include "null_canvasbitmap.hxx" @@ -46,7 +47,7 @@ namespace nullcanvas bool bHasAlpha ) : mpDevice( rDevice ) { - ENSURE_AND_THROW( mpDevice.is(), + ENSURE_OR_THROW( mpDevice.is(), "CanvasBitmap::CanvasBitmap(): Invalid surface or device" ); maCanvasHelper.init( rSize, |