diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 09:39:57 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 09:39:57 +0000 |
| commit | db7eae30e4583b47ad9f05c0a806af5fec18db94 (patch) | |
| tree | cab0b189647ed25e93b59ee3241f3905efe79ff8 /canvas/source/directx/dx_textlayout.cxx | |
| parent | d20f4a5bd71dac75095e2965a6807272ce7e5407 (diff) | |
INTEGRATION: CWS canvas05 (1.2.2); FILE MERGED
2008/04/21 07:30:20 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/source/directx/dx_textlayout.cxx')
| -rwxr-xr-x | canvas/source/directx/dx_textlayout.cxx | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/canvas/source/directx/dx_textlayout.cxx b/canvas/source/directx/dx_textlayout.cxx index 2c7df2bc0eee..e1fd917ed772 100755 --- a/canvas/source/directx/dx_textlayout.cxx +++ b/canvas/source/directx/dx_textlayout.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dx_textlayout.cxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.4 $ * * This file is part of OpenOffice.org. * @@ -28,6 +28,9 @@ * ************************************************************************/ +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_canvas.hxx" + #include <ctype.h> // don't ask. msdev breaks otherwise... #include <canvas/debug.hxx> #include <canvas/verbosetrace.hxx> @@ -230,25 +233,28 @@ namespace dxcanvas } } - bool TextLayout::draw( const DXBitmapSharedPtr &rBitmap, - const rendering::ViewState& rViewState, - const rendering::RenderState& rRenderState, - const ::basegfx::B2ISize& rOutputOffset, - const uno::Reference< rendering::XGraphicDevice >& xGraphicDevice ) const + bool TextLayout::draw( const GraphicsSharedPtr& rGraphics, + const rendering::ViewState& rViewState, + const rendering::RenderState& rRenderState, + const ::basegfx::B2ISize& rOutputOffset, + const uno::Reference< rendering::XGraphicDevice >& xGraphicDevice, + bool bAlphaSurface ) const { ::osl::MutexGuard aGuard( m_aMutex ); ::dxcanvas::TextLayoutDrawHelper aDrawHelper(xGraphicDevice); // render text - aDrawHelper.drawText(rBitmap, + aDrawHelper.drawText( + rGraphics, rViewState, rRenderState, rOutputOffset, maText, maLogicalAdvancements, mpFont.getRef(), - mpFont->getFontMatrix()); + mpFont->getFontMatrix(), + bAlphaSurface); return true; } |