diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 09:46:16 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 09:46:16 +0000 |
| commit | a4fe084051c06090910d9caa614828c6bfd42de2 (patch) | |
| tree | 2b6a8a436a0b898c431c633cc6d99050f6f15890 /canvas/source | |
| parent | 5c8e2d84391f5ec8fa385652e900fb007ec62d5a (diff) | |
INTEGRATION: CWS canvas05 (1.5.68); FILE MERGED
2008/04/21 07:31:13 thb 1.5.68.2: RESYNC: (1.5-1.6); FILE MERGED
2007/10/01 13:02:02 thb 1.5.68.1: #i78888# #i78925# #i79258# #i79437# Merge from CWS picom
Diffstat (limited to 'canvas/source')
| -rw-r--r-- | canvas/source/tools/bitmap.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/canvas/source/tools/bitmap.cxx b/canvas/source/tools/bitmap.cxx index ad310fd7d170..2222da13e278 100644 --- a/canvas/source/tools/bitmap.cxx +++ b/canvas/source/tools/bitmap.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: bitmap.cxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.7 $ * * 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/rendering/bitmap.hxx> #include <canvas/rendering/isurfaceproxy.hxx> #include <basegfx/vector/b2isize.hxx> @@ -54,8 +55,8 @@ namespace canvas mpSurfaceProxy(), mbIsSurfaceDirty( true ) { - ENSURE_AND_THROW( rMgr, - "Bitmap::Bitmap(): Invalid surface proxy manager" ); + ENSURE_OR_THROW( rMgr, + "Bitmap::Bitmap(): Invalid surface proxy manager" ); Image::Description desc; |