INTEGRATION: CWS sb59 (1.7.22); FILE MERGED

2006/08/11 15:36:04 thb 1.7.22.1: #i68336# Removed unused params; added a few using declarations for hidden methods; added a few casts; added some default statements to get cppcanvas warning free
This commit is contained in:
Oliver Bolte
2006-10-12 14:01:07 +00:00
parent 0c9508304f
commit 090d1b5a7d

View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: implspritecanvas.cxx,v $ * $RCSfile: implspritecanvas.cxx,v $
* *
* $Revision: 1.8 $ * $Revision: 1.9 $
* *
* last change: $Author: obo $ $Date: 2006-09-17 12:53:18 $ * last change: $Author: obo $ $Date: 2006-10-12 15:01:07 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -88,6 +88,9 @@ namespace cppcanvas
} }
ImplSpriteCanvas::ImplSpriteCanvas(const ImplSpriteCanvas& rOrig) : ImplSpriteCanvas::ImplSpriteCanvas(const ImplSpriteCanvas& rOrig) :
Canvas(),
BitmapCanvas(),
SpriteCanvas(),
ImplCanvas( rOrig ), ImplCanvas( rOrig ),
ImplBitmapCanvas( rOrig ), ImplBitmapCanvas( rOrig ),
mxSpriteCanvas( rOrig.getUNOSpriteCanvas() ), mxSpriteCanvas( rOrig.getUNOSpriteCanvas() ),
@@ -156,7 +159,7 @@ namespace cppcanvas
{ {
return SpriteSharedPtr( new internal::ImplSprite( mxSpriteCanvas, return SpriteSharedPtr( new internal::ImplSprite( mxSpriteCanvas,
mxSpriteCanvas->createSpriteFromBitmaps( rAnimationBitmaps, mxSpriteCanvas->createSpriteFromBitmaps( rAnimationBitmaps,
rendering::InterpolationMode::NEAREST_NEIGHBOR ), nInterpolationMode ),
mpTransformArbiter ) ); mpTransformArbiter ) );
} }