diff options
| author | sb <sb@openoffice.org> | 2010-04-14 17:21:13 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-04-14 17:21:13 +0200 |
| commit | 10b1f939953d971de57c5bb20f901631ef5bfeea (patch) | |
| tree | c93247da79c85bee1f96f0b655a27f463ec640d8 /slideshow/source/engine/shapes/viewbackgroundshape.cxx | |
| parent | 6fc142c2e5993e1763a897186eef76a984105f5c (diff) | |
| parent | 17d0f112effa923bc6bfeb799a775b9050941573 (diff) | |
sb118: merged in backout
Diffstat (limited to 'slideshow/source/engine/shapes/viewbackgroundshape.cxx')
| -rw-r--r-- | slideshow/source/engine/shapes/viewbackgroundshape.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.cxx b/slideshow/source/engine/shapes/viewbackgroundshape.cxx index 5826f752cbec..bbaef1f486e0 100644 --- a/slideshow/source/engine/shapes/viewbackgroundshape.cxx +++ b/slideshow/source/engine/shapes/viewbackgroundshape.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewbackgroundshape.cxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -71,7 +68,7 @@ namespace slideshow const GDIMetaFileSharedPtr& rMtf ) const { RTL_LOGFILE_CONTEXT( aLog, "::presentation::internal::ViewBackgroundShape::prefetch()" ); - ENSURE_OR_RETURN( rMtf, + ENSURE_OR_RETURN_FALSE( rMtf, "ViewBackgroundShape::prefetch(): no valid metafile!" ); const ::basegfx::B2DHomMatrix& rCanvasTransform( @@ -131,7 +128,7 @@ namespace slideshow *rMtf.get(), ::cppcanvas::Renderer::Parameters() ) ); - ENSURE_OR_RETURN( pRenderer, + ENSURE_OR_RETURN_FALSE( pRenderer, "ViewBackgroundShape::prefetch(): Could not create Renderer" ); pRenderer->setTransformation( aShapeTransform ); @@ -172,7 +169,7 @@ namespace slideshow if( !prefetch( rDestinationCanvas, rMtf ) ) return false; - ENSURE_OR_RETURN( mxBitmap.is(), + ENSURE_OR_RETURN_FALSE( mxBitmap.is(), "ViewBackgroundShape::draw(): Invalid background bitmap" ); ::basegfx::B2DHomMatrix aTransform( mpViewLayer->getTransformation() ); |