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
This commit is contained in:
parent
4152d6a07d
commit
8822b950b5
1 changed files with 7 additions and 10 deletions
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue