diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 09:53:47 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 09:53:47 +0000 |
| commit | 874c31b3a8ed75383059a6f9405e192276268d20 (patch) | |
| tree | be1bf571b981ebd1d33c32be18a3cd6d0cf334ee /canvas/source | |
| parent | c5c516e1267252e97093652d5519e981ff15cb67 (diff) | |
INTEGRATION: CWS canvas05 (1.6.68); FILE MERGED
2008/04/21 07:29:05 thb 1.6.68.3: RESYNC: (1.7-1.8); FILE MERGED
2007/11/06 12:36:46 thb 1.6.68.2: RESYNC: (1.6-1.7); FILE MERGED
2007/10/01 13:02:03 thb 1.6.68.1: #i78888# #i78925# #i79258# #i79437# Merge from CWS picom
Diffstat (limited to 'canvas/source')
| -rw-r--r-- | canvas/source/vcl/cachedbitmap.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/canvas/source/vcl/cachedbitmap.cxx b/canvas/source/vcl/cachedbitmap.cxx index e0d94640e5fd..96bee5a12a89 100644 --- a/canvas/source/vcl/cachedbitmap.cxx +++ b/canvas/source/vcl/cachedbitmap.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: cachedbitmap.cxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.9 $ * * 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 "cachedbitmap.hxx" #include "repainttarget.hxx" @@ -77,9 +78,9 @@ namespace vclcanvas const uno::Reference< rendering::XCanvas >& rTargetCanvas, bool bSameViewTransform ) { - ENSURE_AND_THROW( bSameViewTransform, - "CachedBitmap::doRedraw(): base called with changed view transform " - "(told otherwise during construction)" ); + ENSURE_OR_THROW( bSameViewTransform, + "CachedBitmap::doRedraw(): base called with changed view transform " + "(told otherwise during construction)" ); // TODO(P1): Could adapt to modified clips as well if( rNewState.Clip != rOldState.Clip ) @@ -87,7 +88,7 @@ namespace vclcanvas RepaintTarget* pTarget = dynamic_cast< RepaintTarget* >(rTargetCanvas.get()); - ENSURE_AND_THROW( pTarget, + ENSURE_OR_THROW( pTarget, "CachedBitmap::redraw(): cannot cast target to RepaintTarget" ); if( !pTarget->repaint( mpGraphicObject, |