diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 09:59:03 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 09:59:03 +0000 |
| commit | ebb33b71f1988921d3178d1fd52fcb5ffa3f4716 (patch) | |
| tree | a2aae42b261f641ef5b2d7be257b0ab6a623a440 /canvas/source | |
| parent | 95a3a96cb0f86b2f4dbfbc68ce6867d2fd041ab0 (diff) | |
INTEGRATION: CWS canvas05 (1.8.26); FILE MERGED
2008/04/21 07:28:50 thb 1.8.26.4: RESYNC: (1.9-1.10); FILE MERGED
2007/12/20 22:18:59 thb 1.8.26.3: #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
2007/11/06 12:36:58 thb 1.8.26.2: RESYNC: (1.8-1.9); FILE MERGED
2007/10/01 13:02:03 thb 1.8.26.1: #i78888# #i78925# #i79258# #i79437# Merge from CWS picom
Diffstat (limited to 'canvas/source')
| -rw-r--r-- | canvas/source/vcl/canvashelper.hxx | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/canvas/source/vcl/canvashelper.hxx b/canvas/source/vcl/canvashelper.hxx index 9d9afe3ce394..a4319daeae1d 100644 --- a/canvas/source/vcl/canvashelper.hxx +++ b/canvas/source/vcl/canvashelper.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: canvashelper.hxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.11 $ * * This file is part of OpenOffice.org. * @@ -86,10 +86,10 @@ namespace vclcanvas @param bHaveAlpha When true, hasAlpha() will always return true, otherwise, false. */ - void init( SpriteCanvas& rDevice, - const OutDevProviderSharedPtr& rOutDev, - bool bProtect, - bool bHaveAlpha ); + void init( ::com::sun::star::rendering::XGraphicDevice& rDevice, + const OutDevProviderSharedPtr& rOutDev, + bool bProtect, + bool bHaveAlpha ); /** Set primary output device @@ -272,8 +272,6 @@ namespace vclcanvas getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, const ::com::sun::star::geometry::IntegerPoint2D& pos ); - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapPalette > getPalette(); - ::com::sun::star::rendering::IntegerBitmapLayout getMemoryLayout(); /// Repaint a cached bitmap @@ -315,19 +313,19 @@ namespace vclcanvas Deliberately not a refcounted reference, because of potential circular references for spritecanvas. */ - SpriteCanvas* mpDevice; + ::com::sun::star::rendering::XGraphicDevice* mpDevice; /// Rendering to this outdev preserves its state - OutDevProviderSharedPtr mpProtectedOutDev; + OutDevProviderSharedPtr mpProtectedOutDev; /// Rendering to this outdev does not preserve its state - OutDevProviderSharedPtr mpOutDev; + OutDevProviderSharedPtr mpOutDev; /// Rendering to this outdev does not preserve its state - OutDevProviderSharedPtr mp2ndOutDev; + OutDevProviderSharedPtr mp2ndOutDev; /// When true, content is able to represent alpha - bool mbHaveAlpha; + bool mbHaveAlpha; private: ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > |