From f0b876302e22fb03ee80aa50e3b724c4b91ba0b6 Mon Sep 17 00:00:00 2001
From: Kurt Zenker <kz@openoffice.org>
Date: Tue, 24 Jun 2008 09:47:06 +0000
Subject: INTEGRATION: CWS canvas05 (1.4.26); FILE MERGED 2008/04/21 07:31:25
 thb 1.4.26.2: RESYNC: (1.4-1.5); FILE MERGED 2007/10/01 13:02:02 thb
 1.4.26.1: #i78888# #i78925# #i79258# #i79437# Merge from CWS picom

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

(limited to 'canvas/source')

diff --git a/canvas/source/tools/canvascustomspritehelper.cxx b/canvas/source/tools/canvascustomspritehelper.cxx
index 4155b572496f..c52e9bd2ca2c 100644
--- a/canvas/source/tools/canvascustomspritehelper.cxx
+++ b/canvas/source/tools/canvascustomspritehelper.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: canvascustomspritehelper.cxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
  *
  * 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 <canvas/canvastools.hxx>
 
@@ -185,7 +186,7 @@ namespace canvas
     void CanvasCustomSpriteHelper::init( const geometry::RealSize2D&        rSpriteSize,
                                          const SpriteSurface::Reference&    rOwningSpriteCanvas )
     {
-        ENSURE_AND_THROW( rOwningSpriteCanvas.get(),
+        ENSURE_OR_THROW( rOwningSpriteCanvas.get(),
                           "CanvasCustomSpriteHelper::init(): Invalid owning sprite canvas" );
 
         mpSpriteCanvas = rOwningSpriteCanvas;
-- 
cgit