diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 09:40:10 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 09:40:10 +0000 |
| commit | 54b132b52b512980aca2578879f162cb17216adb (patch) | |
| tree | 962576061fce85824afff66bbe8611aaefe1d491 /canvas/source | |
| parent | db7eae30e4583b47ad9f05c0a806af5fec18db94 (diff) | |
INTEGRATION: CWS canvas05 (1.2.2); FILE MERGED
2008/04/21 07:30: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/source')
| -rwxr-xr-x | canvas/source/directx/dx_textlayout.hxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/canvas/source/directx/dx_textlayout.hxx b/canvas/source/directx/dx_textlayout.hxx index 91cd9df9953a..a8562ed34f7a 100755 --- a/canvas/source/directx/dx_textlayout.hxx +++ b/canvas/source/directx/dx_textlayout.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dx_textlayout.hxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.4 $ * * This file is part of OpenOffice.org. * @@ -43,7 +43,7 @@ #include <boost/utility.hpp> #include "dx_canvasfont.hxx" -#include "dx_surfacegraphics.hxx" +#include "dx_ibitmap.hxx" #include "dx_winstuff.hxx" #include "dx_gdiplususer.hxx" @@ -93,12 +93,13 @@ namespace dxcanvas virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); - bool draw( const DXBitmapSharedPtr& rBitmap, + bool draw( const GraphicsSharedPtr& rGraphics, const ::com::sun::star::rendering::ViewState& rViewState, const ::com::sun::star::rendering::RenderState& rRenderState, const ::basegfx::B2ISize& rOutputOffset, const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XGraphicDevice >& xGraphicDevice ) const; + ::com::sun::star::rendering::XGraphicDevice >& xGraphicDevice, + bool bAlphaSurface ) const; protected: ~TextLayout(); // we're a ref-counted UNO class. _We_ destroy ourselves. |