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
This commit is contained in:
@@ -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;
|
||||
|
Reference in New Issue
Block a user