diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 10:05:30 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 10:05:30 +0000 |
| commit | f6e6e4572f9aeb65bb2769a1e1b2dd138c92e5e9 (patch) | |
| tree | 6f1f2cefba825081b56cdbcf648c1e6b73ed80b7 /canvas/source | |
| parent | d1ea8dc9000c10fb6fed72d246284b58be59a92f (diff) | |
INTEGRATION: CWS canvas05 (1.4.26); FILE MERGED
2008/04/21 07:27:43 thb 1.4.26.2: RESYNC: (1.4-1.5); FILE MERGED
2007/12/20 22:19:00 thb 1.4.26.1: #i81092# #i78888# #i78925# #i79258# #i79437# #i84784# Large canvas rework, completing various areas such as color spaces, bitmap data access, true sprite and non-sprite implementations, and upstreaming the canvas parts of rodos emf+ rendering
Diffstat (limited to 'canvas/source')
| -rw-r--r-- | canvas/source/vcl/spritehelper.hxx | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/canvas/source/vcl/spritehelper.hxx b/canvas/source/vcl/spritehelper.hxx index f919b3c39db1..64b35d6f0703 100644 --- a/canvas/source/vcl/spritehelper.hxx +++ b/canvas/source/vcl/spritehelper.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: spritehelper.hxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.6 $ * * This file is part of OpenOffice.org. * @@ -36,6 +36,7 @@ #include <vcl/virdev.hxx> #include <canvas/base/canvascustomspritehelper.hxx> +#include <canvas/base/spritesurface.hxx> #include <canvas/vclwrapper.hxx> #include "backbuffer.hxx" @@ -76,11 +77,11 @@ namespace vclcanvas @param rBackBufferMask Buffer of the sprite content (alpha part) */ - void init( const ::com::sun::star::geometry::RealSize2D& rSpriteSize, - const SpriteCanvasRef& rSpriteCanvas, - const BackBufferSharedPtr& rBackBuffer, - const BackBufferSharedPtr& rBackBufferMask, - bool bShowSpriteBounds ); + void init( const ::com::sun::star::geometry::RealSize2D& rSpriteSize, + const ::canvas::SpriteSurface::Reference& rOwningSpriteCanvas, + const BackBufferSharedPtr& rBackBuffer, + const BackBufferSharedPtr& rBackBufferMask, + bool bShowSpriteBounds ); void disposing(); @@ -111,11 +112,6 @@ namespace vclcanvas BackBufferSharedPtr mpBackBuffer; BackBufferSharedPtr mpBackBufferMask; - // necessary to avoid downcasts later on (Sprite interface - // only gets passed ptr to SpriteSurface interface, not - // concrete implementations) - SpriteCanvasRef mpSpriteCanvas; - /// Cached bitmap for the current sprite content mutable ::canvas::vcltools::VCLObject<BitmapEx> maContent; |