diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 09:41:08 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 09:41:08 +0000 |
| commit | 5bd2a180c76e2333cb8d7feb64443351d5ab132a (patch) | |
| tree | da3cc0554ac6d511764105bca2f6924a4e3a26f8 /canvas | |
| parent | 3bd6907b0c9d5c2158a609b7c92cfeacaf791fcc (diff) | |
INTEGRATION: CWS canvas05 (1.2.2); FILE MERGED
2008/06/02 22:20:50 thb 1.2.2.4: Removed obsolete XTunnel now for real; re-added size getter for BitmapCanvas; smallish cleanups
2008/06/02 16:32:53 thb 1.2.2.3: removing cruft; removing xtunnel hack
2008/04/21 07:29:48 thb 1.2.2.2: RESYNC: (1.2-1.3); FILE MERGED
2008/01/22 00:25:24 thb 1.2.2.1: #i81092# Making gdiplus and dx canvas more independent
Diffstat (limited to 'canvas')
| -rwxr-xr-x | canvas/source/directx/dx_vcltools.hxx | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/canvas/source/directx/dx_vcltools.hxx b/canvas/source/directx/dx_vcltools.hxx index 96c2083b8f51..c3566951d46a 100755 --- a/canvas/source/directx/dx_vcltools.hxx +++ b/canvas/source/directx/dx_vcltools.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dx_vcltools.hxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.4 $ * * This file is part of OpenOffice.org. * @@ -42,16 +42,15 @@ namespace com { namespace sun { namespace star { namespace lang class XUnoTunnel; } } } } +namespace Gdiplus { class Graphics; } namespace dxcanvas { - class SurfaceGraphics; - namespace tools { /** Raw RGBA bitmap data, contiguous in memory - */ + */ struct RawRGBABitmap { sal_Int32 mnWidth; @@ -59,12 +58,9 @@ namespace dxcanvas ::boost::shared_ptr< sal_uInt8 > mpBitmapData; }; - bool drawVCLBitmapFromUnoTunnel( const ::boost::shared_ptr< SurfaceGraphics >& rGraphics, - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XUnoTunnel >& xTunnel ); - - ::com::sun::star::util::TriState isAlphaVCLBitmapFromUnoTunnel( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XUnoTunnel >& xTunnel ); + bool drawVCLBitmapFromXBitmap( const ::boost::shared_ptr< Gdiplus::Graphics >& rGraphics, + const ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XBitmap >& xBitmap ); } } |