diff options
| author | Herbert Duerr <hdu@openoffice.org> | 2002-09-04 16:49:25 +0000 |
|---|---|---|
| committer | Herbert Duerr <hdu@openoffice.org> | 2002-09-04 16:49:25 +0000 |
| commit | d6c0a05bc23fba0c081dd73487b32978dbf79f51 (patch) | |
| tree | 8e6b5094ae8e459dbde43c01c2bbbad7ce135cc6 | |
| parent | a42e4fb444a60f726277d113ebd5243825339ae9 (diff) | |
#100194# adjust to SalLayout::DrawText changes
| -rw-r--r-- | vcl/unx/inc/xfont.hxx | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/vcl/unx/inc/xfont.hxx b/vcl/unx/inc/xfont.hxx index df421e9cd8dd..2cd17682a109 100644 --- a/vcl/unx/inc/xfont.hxx +++ b/vcl/unx/inc/xfont.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xfont.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: vg $ $Date: 2002-07-22 16:43:59 $ + * last change: $Author: hdu $ $Date: 2002-09-04 17:49:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,26 +75,15 @@ #ifndef _VCL_VCLENUM_HXX #include <vclenum.hxx> #endif +#ifndef _SV_SALLAYOUT_HXX +#include <sallayout.hxx> +#endif // _SV_SALLAYOUT_HXX typedef unsigned short sal_MultiByte; class ImplFontMetricData; class ExtendedXlfd; -#ifdef ENABLE_CTL -#ifndef _SV_SALLAYOUT_HXX -#include <sallayout.hxx> -#endif // _SV_SALLAYOUT_HXX - -class X11FontLayout : public GenericSalLayout -{ -public: - X11FontLayout( const ImplLayoutArgs& rArgs ) - : GenericSalLayout( rArgs ) - {} -}; -#endif // ENABLE_CTL - struct VerticalTextItem { BOOL mbFixed; @@ -186,10 +175,6 @@ class ExtendedFontStruct : public SvRefBase sal_Size GetCharWidth( sal_Unicode nFrom, sal_Unicode nTo, long *pWidthArray, ExtendedFontStruct *pFallback ); ULONG GetFontCodeRanges( sal_uInt32* pCodePairs ) const; - -#ifdef ENABLE_CTL - X11FontLayout* LayoutText( const ImplLayoutArgs& ); -#endif // ENABLE_CTL }; // Declaration and Implementation for ExtendedFontStructRef: Add RefCounting @@ -197,4 +182,11 @@ class ExtendedFontStruct : public SvRefBase // a separate source file: all ref member functions are inline SV_DECL_IMPL_REF( ExtendedFontStruct ); +class X11FontLayout : public GenericSalLayout +{ +public: + X11FontLayout( const ImplLayoutArgs&, ExtendedFontStruct& ); + virtual void DrawText( SalGraphics& ) const; +}; + #endif /* EXTENDED_FONTSTRUCT_HXX */ |