diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 09:40:37 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 09:40:37 +0000 |
| commit | a37b6df864dc6e16cad5dc8175f70ff62c94b158 (patch) | |
| tree | 3d7c69c69f86b5e0bb1a5c39d996a74fdc6d2d85 | |
| parent | e64d0638854b69103ae1a00aaaea1467e0b606c1 (diff) | |
INTEGRATION: CWS canvas05 (1.2.2); FILE MERGED
2008/04/21 07:29:14 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
| -rwxr-xr-x | canvas/source/directx/dx_textlayout_drawhelper.hxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/canvas/source/directx/dx_textlayout_drawhelper.hxx b/canvas/source/directx/dx_textlayout_drawhelper.hxx index 6124d4d8b3f8..b6e4cd60a64f 100755 --- a/canvas/source/directx/dx_textlayout_drawhelper.hxx +++ b/canvas/source/directx/dx_textlayout_drawhelper.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dx_textlayout_drawhelper.hxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.4 $ * * This file is part of OpenOffice.org. * @@ -44,9 +44,11 @@ class ::com::sun::star::rendering::XCanvasFont; +namespace Gdiplus { class Graphics; } + namespace dxcanvas { - class DXBitmap; + struct Bitmap; class TextLayoutDrawHelper { public: @@ -55,15 +57,16 @@ namespace dxcanvas ~TextLayoutDrawHelper(); // draw text - void drawText( const ::boost::shared_ptr< DXBitmap > &rBitmap, - const ::com::sun::star::rendering::ViewState& rViewState, + void drawText( const boost::shared_ptr<Gdiplus::Graphics>& rGraphics, + const ::com::sun::star::rendering::ViewState& rViewState, const ::com::sun::star::rendering::RenderState& rRenderState, const ::basegfx::B2ISize& rOutputOffset, const ::com::sun::star::rendering::StringContext& rText, const ::com::sun::star::uno::Sequence< double >& rLogicalAdvancements, const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont >& rCanvasFont, - const ::com::sun::star::geometry::Matrix2D& rFontMatrix ); + const ::com::sun::star::geometry::Matrix2D& rFontMatrix, + bool bAlphaSurface ); ::com::sun::star::geometry::RealRectangle2D queryTextBounds( const ::com::sun::star::rendering::StringContext& rText, |