strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS canvas05 (1.2.18); FILE MERGED

Browse source 
2008/04/21 07:55:12 thb 1.2.18.2: RESYNC: (1.2-1.3); FILE MERGED
2007/10/01 13:49:13 thb 1.2.18.1: #i79258# Merge from CWS picom
This commit is contained in:
Kurt Zenker 2008-06-24 11:11:04 +00:00
parent 651402cce0
commit fce7fc1fa7
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
slideshow/source/engine/shapes/gdimtftools.cxx
View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: gdimtftools.cxx,v $
* $Revision: 1.3 $
* $Revision: 1.4 $
*
* This file is part of OpenOffice.org.
*
@ -33,6 +33,7 @@
// must be first
#include <canvas/debug.hxx>
#include <tools/diagnose_ex.h>
#include <gdimtftools.hxx>
#include <com/sun/star/document/XExporter.hpp>
@ -188,7 +189,7 @@ bool getMetaFile( const uno::Reference< lang::XComponent >& xSource,
int mtfLoadFlags,
const uno::Reference< uno::XComponentContext >& rxContext )
{
ENSURE_AND_RETURN( rxContext.is(),
ENSURE_OR_RETURN( rxContext.is(),
"getMetaFile(): Invalid context" );
// create dummy XGraphicRenderer, which receives the
@ -388,7 +389,7 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames& o_rFrames,
break;
default:
ENSURE_AND_RETURN(false,
ENSURE_OR_RETURN(false,
"getAnimationFromGraphic(): Unexpected case" );
break;
}