From 8919f47cfd19fa27e76e1ecee362f8571f5550ff Mon Sep 17 00:00:00 2001
From: Kurt Zenker <kz@openoffice.org>
Date: Tue, 24 Jun 2008 09:42:41 +0000
Subject: [PATCH] INTEGRATION: CWS canvas05 (1.3.68); FILE MERGED 2008/04/21
 07:27:37 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

---
 canvas/source/null/null_canvascustomsprite.cxx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/canvas/source/null/null_canvascustomsprite.cxx b/canvas/source/null/null_canvascustomsprite.cxx
index d56c4a34d822..6846a6ebea9e 100644
--- a/canvas/source/null/null_canvascustomsprite.cxx
+++ b/canvas/source/null/null_canvascustomsprite.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: null_canvascustomsprite.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/verbosetrace.hxx>
 
 #include <rtl/logfile.hxx>
@@ -54,7 +55,7 @@ namespace nullcanvas
                                             const SpriteCanvasRef&                          rRefDevice ) :
         mpSpriteCanvas( rRefDevice )
     {
-        ENSURE_AND_THROW( rRefDevice.get(),
+        ENSURE_OR_THROW( rRefDevice.get(),
                           "CanvasCustomSprite::CanvasCustomSprite(): Invalid sprite canvas" );
 
         maCanvasHelper.init( ::basegfx::B2ISize(