diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 09:57:17 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 09:57:17 +0000 |
| commit | 0b4e1261d4fc0bf73a7ac964c40c94ebf4ec9587 (patch) | |
| tree | 9f233d82dd3ff867b5f9db178a57b3a8db2f8e82 /canvas | |
| parent | f466b08d9349719cf003c65c2f124e06048896ac (diff) | |
INTEGRATION: CWS canvas05 (1.6.112); FILE MERGED
2008/04/21 07:29:02 thb 1.6.112.2: RESYNC: (1.6-1.7); FILE MERGED
2007/12/20 22:18:59 thb 1.6.112.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/canvasfont.hxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/canvas/source/vcl/canvasfont.hxx b/canvas/source/vcl/canvasfont.hxx index 5c5815570cf2..7c979e4e7b17 100644 --- a/canvas/source/vcl/canvasfont.hxx +++ b/canvas/source/vcl/canvasfont.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: canvasfont.hxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.8 $ * * This file is part of OpenOffice.org. * @@ -40,6 +40,7 @@ #include <com/sun/star/geometry/Matrix2D.hpp> #include <com/sun/star/rendering/FontRequest.hpp> #include <com/sun/star/rendering/XCanvasFont.hpp> +#include <com/sun/star/rendering/XGraphicDevice.hpp> #include <vcl/font.hxx> @@ -70,7 +71,8 @@ namespace vclcanvas CanvasFont( const ::com::sun::star::rendering::FontRequest& fontRequest, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& extraFontProperties, const ::com::sun::star::geometry::Matrix2D& rFontMatrix, - const DeviceRef& rDevice ); + ::com::sun::star::rendering::XGraphicDevice& rDevice, + const OutDevProviderSharedPtr& rOutDevProvider ); /// Dispose all internal references virtual void SAL_CALL disposing(); @@ -90,9 +92,10 @@ namespace vclcanvas ::Font getVCLFont() const; private: - ::canvas::vcltools::VCLObject<Font> maFont; - ::com::sun::star::rendering::FontRequest maFontRequest; - DeviceRef mpRefDevice; + ::canvas::vcltools::VCLObject<Font> maFont; + ::com::sun::star::rendering::FontRequest maFontRequest; + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice> mpRefDevice; + OutDevProviderSharedPtr mpOutDevProvider; }; } |