mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS canvas05 (1.4.26); FILE MERGED

Browse Source 
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:
Kurt Zenker
2008-06-24 09:47:06 +00:00
parent a4fe084051
commit f0b876302e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
canvas/source/tools/canvascustomspritehelper.cxx
View File

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