diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 10:06:25 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 10:06:25 +0000 |
| commit | c921e28cc4447ee040850b9b26e5a0c46252cb5d (patch) | |
| tree | 47bd5e3fe593b16005fde39fb8745f244f757580 /canvas | |
| parent | 0d4e840976a18003a7dfe59e51d7011a8465c430 (diff) | |
INTEGRATION: CWS canvas05 (1.5.110); FILE MERGED
2008/04/21 07:27:55 thb 1.5.110.2: RESYNC: (1.5-1.6); FILE MERGED
2007/12/20 22:19:00 thb 1.5.110.1: #i81092# #i78888# #i78925# #i79258# #i79437# #i84784# Large canvas rework, completing various areas such as color spaces, bitmap data access, true sprite and non-sprite implementations, and upstreaming the canvas parts of rodos emf+ rendering
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/vcl/textlayout.hxx | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/canvas/source/vcl/textlayout.hxx b/canvas/source/vcl/textlayout.hxx index 855c6608ab0d..7abe06ea7af0 100644 --- a/canvas/source/vcl/textlayout.hxx +++ b/canvas/source/vcl/textlayout.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: textlayout.hxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.7 $ * * This file is part of OpenOffice.org. * @@ -62,7 +62,9 @@ namespace vclcanvas sal_Int8 nDirection, sal_Int64 nRandomSeed, const CanvasFont::Reference& rFont, - const DeviceRef& rRefDevice ); + const ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XGraphicDevice>& xDevice, + const OutDevProviderSharedPtr& rOutDev ); /// Dispose all internal references virtual void SAL_CALL disposing(); @@ -102,11 +104,13 @@ namespace vclcanvas const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState ) const; - ::com::sun::star::rendering::StringContext maText; - ::com::sun::star::uno::Sequence< double > maLogicalAdvancements; - CanvasFont::Reference mpFont; - DeviceRef mpRefDevice; - sal_Int8 mnTextDirection; + ::com::sun::star::rendering::StringContext maText; + ::com::sun::star::uno::Sequence< double > maLogicalAdvancements; + CanvasFont::Reference mpFont; + ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XGraphicDevice> mxDevice; + OutDevProviderSharedPtr mpOutDevProvider; + sal_Int8 mnTextDirection; }; } |