diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 09:56:42 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 09:56:42 +0000 |
| commit | 8822b950b5059efcf0dd1b7c2764a7ecda203ab7 (patch) | |
| tree | 62dda60ffaa0309ef707ce4ba431c3b5b5a3361e /canvas | |
| parent | 4152d6a07d366fdd2ca493804d58626cd58303cc (diff) | |
INTEGRATION: CWS canvas05 (1.10.2); FILE MERGED
2008/04/21 07:27:52 thb 1.10.2.2: RESYNC: (1.10-1.11); FILE MERGED
2007/12/20 22:18:59 thb 1.10.2.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')
| -rw-r--r-- | canvas/source/vcl/canvascustomsprite.hxx | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/canvas/source/vcl/canvascustomsprite.hxx b/canvas/source/vcl/canvascustomsprite.hxx index 8bb4eebab55a..de35bdea1587 100644 --- a/canvas/source/vcl/canvascustomsprite.hxx +++ b/canvas/source/vcl/canvascustomsprite.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: canvascustomsprite.hxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.12 $ * * This file is part of OpenOffice.org. * @@ -44,6 +44,7 @@ #include <canvas/vclwrapper.hxx> #include <canvas/base/basemutexhelper.hxx> +#include <canvas/base/spritesurface.hxx> #include <canvas/base/canvascustomspritebase.hxx> #include "sprite.hxx" @@ -95,9 +96,11 @@ namespace vclcanvas public RepaintTarget { public: - CanvasCustomSprite( const ::com::sun::star::geometry::RealSize2D& rSpriteSize, - const SpriteCanvasRef& rSpriteCanvas, - bool bShowSpriteBounds ); + CanvasCustomSprite( const ::com::sun::star::geometry::RealSize2D& rSpriteSize, + ::com::sun::star::rendering::XGraphicDevice& rDevice, + const ::canvas::SpriteSurface::Reference& rOwningSpriteCanvas, + const OutDevProviderSharedPtr& rOutDevProvider, + bool bShowSpriteBounds ); virtual void SAL_CALL disposing(); @@ -127,12 +130,6 @@ namespace vclcanvas const ::Point& rPt, const ::Size& rSz, const GraphicAttr& rAttr ) const; - - private: - /** MUST hold here, too, since CanvasHelper only contains a - raw pointer (without refcounting) - */ - SpriteCanvasRef mpSpriteCanvas; }; } |