mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS canvas05 (1.2.2); FILE MERGED

Browse Source 
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
This commit is contained in:
Kurt Zenker
2008-06-24 09:40:37 +00:00
parent e64d063885
commit a37b6df864
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
canvas/source/directx/dx_textlayout_drawhelper.hxx
View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: dx_textlayout_drawhelper.hxx,v $ * $RCSfile: dx_textlayout_drawhelper.hxx,v $
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@@ -44,9 +44,11 @@
class ::com::sun::star::rendering::XCanvasFont; class ::com::sun::star::rendering::XCanvasFont;
namespace Gdiplus { class Graphics; }
namespace dxcanvas namespace dxcanvas
{ {
class DXBitmap; struct Bitmap;
class TextLayoutDrawHelper class TextLayoutDrawHelper
{ {
public: public:
@@ -55,7 +57,7 @@ namespace dxcanvas
~TextLayoutDrawHelper(); ~TextLayoutDrawHelper();
// draw text // draw text
void drawText( const ::boost::shared_ptr< DXBitmap > &rBitmap, void drawText( const boost::shared_ptr<Gdiplus::Graphics>& rGraphics,
const ::com::sun::star::rendering::ViewState& rViewState, const ::com::sun::star::rendering::ViewState& rViewState,
const ::com::sun::star::rendering::RenderState& rRenderState, const ::com::sun::star::rendering::RenderState& rRenderState,
const ::basegfx::B2ISize& rOutputOffset, const ::basegfx::B2ISize& rOutputOffset,
@@ -63,7 +65,8 @@ namespace dxcanvas
const ::com::sun::star::uno::Sequence< double >& rLogicalAdvancements, const ::com::sun::star::uno::Sequence< double >& rLogicalAdvancements,
const ::com::sun::star::uno::Reference< const ::com::sun::star::uno::Reference<
::com::sun::star::rendering::XCanvasFont >& rCanvasFont, ::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( ::com::sun::star::geometry::RealRectangle2D queryTextBounds(
const ::com::sun::star::rendering::StringContext& rText, const ::com::sun::star::rendering::StringContext& rText,