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
This commit is contained in:
Kurt Zenker
2008-06-24 09:42:41 +00:00
parent 0d910998cb
commit 8919f47cfd

View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: null_canvascustomsprite.cxx,v $ * $RCSfile: null_canvascustomsprite.cxx,v $
* $Revision: 1.4 $ * $Revision: 1.5 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@@ -32,6 +32,7 @@
#include "precompiled_canvas.hxx" #include "precompiled_canvas.hxx"
#include <canvas/debug.hxx> #include <canvas/debug.hxx>
#include <tools/diagnose_ex.h>
#include <canvas/verbosetrace.hxx> #include <canvas/verbosetrace.hxx>
#include <rtl/logfile.hxx> #include <rtl/logfile.hxx>
@@ -54,7 +55,7 @@ namespace nullcanvas
const SpriteCanvasRef& rRefDevice ) : const SpriteCanvasRef& rRefDevice ) :
mpSpriteCanvas( rRefDevice ) mpSpriteCanvas( rRefDevice )
{ {
ENSURE_AND_THROW( rRefDevice.get(), ENSURE_OR_THROW( rRefDevice.get(),
"CanvasCustomSprite::CanvasCustomSprite(): Invalid sprite canvas" ); "CanvasCustomSprite::CanvasCustomSprite(): Invalid sprite canvas" );
maCanvasHelper.init( ::basegfx::B2ISize( maCanvasHelper.init( ::basegfx::B2ISize(