diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 09:20:35 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 09:20:35 +0000 |
| commit | ae544eb3a6d56e792b2019a6a8d8574ce5d8c43a (patch) | |
| tree | 5b9bf03b10a157904da79f66c074b1bd21f65f90 /canvas/source/cairo/cairo_canvasfont.hxx | |
| parent | 3991cd8664212156582d1b85abe14742530121bf (diff) | |
INTEGRATION: CWS canvas05 (1.3.56); FILE MERGED
2008/04/21 07:31:55 thb 1.3.56.2: RESYNC: (1.3-1.4); FILE MERGED
2008/03/18 22:00:56 thb 1.3.56.1: Implementing non-backbuffered canvas for cairocanvas as well - reworked to share most of the code
Diffstat (limited to 'canvas/source/cairo/cairo_canvasfont.hxx')
| -rw-r--r-- | canvas/source/cairo/cairo_canvasfont.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/canvas/source/cairo/cairo_canvasfont.hxx b/canvas/source/cairo/cairo_canvasfont.hxx index 30d59f917901..7b6f49eaf25e 100644 --- a/canvas/source/cairo/cairo_canvasfont.hxx +++ b/canvas/source/cairo/cairo_canvasfont.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: cairo_canvasfont.hxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.5 $ * * This file is part of OpenOffice.org. * @@ -66,10 +66,10 @@ namespace cairocanvas CanvasFont, ::com::sun::star::rendering::XCanvasFont > Reference; - 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 ); + 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 SurfaceProviderRef& rDevice ); /// Dispose all internal references virtual void SAL_CALL disposing(); @@ -89,9 +89,9 @@ namespace cairocanvas ::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; + SurfaceProviderRef mpRefDevice; }; } |