diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 09:44:59 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 09:44:59 +0000 |
| commit | 853cd5ae05c2a0b70bd15383e819f89d2fac9444 (patch) | |
| tree | a7c013408e4d71f176d8943d36b716157ce70370 /canvas/source | |
| parent | 6ddded01c7fb1021f871f67617f29cd72e5e5dc9 (diff) | |
INTEGRATION: CWS canvas05 (1.5.26); FILE MERGED
2008/04/21 07:27:40 thb 1.5.26.2: RESYNC: (1.5-1.6); FILE MERGED
2007/10/01 13:02:02 thb 1.5.26.1: #i78888# #i78925# #i79258# #i79437# Merge from CWS picom
Diffstat (limited to 'canvas/source')
| -rw-r--r-- | canvas/source/null/null_spritehelper.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/canvas/source/null/null_spritehelper.cxx b/canvas/source/null/null_spritehelper.cxx index 2b7cf1af3510..23b0ac6662fe 100644 --- a/canvas/source/null/null_spritehelper.cxx +++ b/canvas/source/null/null_spritehelper.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: null_spritehelper.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/verbosetrace.hxx> #include <rtl/logfile.hxx> @@ -68,7 +69,7 @@ namespace nullcanvas void SpriteHelper::init( const geometry::RealSize2D& rSpriteSize, const SpriteCanvasRef& rSpriteCanvas ) { - ENSURE_AND_THROW( rSpriteCanvas.get(), + ENSURE_OR_THROW( rSpriteCanvas.get(), "SpriteHelper::init(): Invalid device, sprite canvas or surface" ); mpSpriteCanvas = rSpriteCanvas; @@ -94,6 +95,6 @@ namespace nullcanvas ::basegfx::B2DPolyPolygon SpriteHelper::polyPolygonFromXPolyPolygon2D( uno::Reference< rendering::XPolyPolygon2D >& xPoly ) const { - return ::canvas::tools::polyPolygonFromXPolyPolygon2D( xPoly ); + return ::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D( xPoly ); } } |