diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-07-13 08:35:04 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-07-13 08:35:04 +0000 |
| commit | 29b20ecf5bf5ad96ae3f7d188385397fdd44acd3 (patch) | |
| tree | 070c75dc06e5adcaad84657a119039f0d94ef96d /vcl/unx | |
| parent | 32435c6614e3d647b905026624c4b6d8528bf70c (diff) | |
INTEGRATION: CWS fontlists02 (1.13.102); FILE MERGED
2004/03/25 16:39:00 hdu 1.13.102.1: Font Management Refactoring, first step:
Keep the externally visible original algorithms intact
Split up the ImplFontCache::Get(..) monster method
Make implicit relationships between font management classes explicit
Allow derivation from ImplFontData+ImplFontEntry for font technology specific caching
Get rid of linear searches in mainstream code, use efficient STL containers
Get rid of some obsolete data types BOOL->bool, USHORT->int, etc.
Improve infrastructure for unicode surrogate processing
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/inc/xfont.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/unx/inc/xfont.hxx b/vcl/unx/inc/xfont.hxx index a127a12e016f..6fd290589b24 100644 --- a/vcl/unx/inc/xfont.hxx +++ b/vcl/unx/inc/xfont.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xfont.hxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: rt $ $Date: 2004-06-17 12:26:53 $ + * last change: $Author: rt $ $Date: 2004-07-13 09:35:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,7 +77,7 @@ #endif #ifndef _SV_SALLAYOUT_HXX #include <sallayout.hxx> -#endif // _SV_SALLAYOUT_HXX +#endif typedef unsigned short sal_MultiByte; @@ -155,7 +155,7 @@ class ExtendedFontStruct : public SvRefBase int LoadEncoding( rtl_TextEncoding nEncoding ); FontPitch GetSpacing( rtl_TextEncoding nEncoding ); - Bool GetFontBoundingBox( XCharStruct *pCharStruct, + bool GetFontBoundingBox( XCharStruct *pCharStruct, int *pAscent, int *pDescent ) ; sal_Size GetDefaultWidth(); @@ -171,12 +171,12 @@ class ExtendedFontStruct : public SvRefBase const Size& rPixelSize, sal_Bool bVertical, ExtendedXlfd* pXlfd ); ~ExtendedFontStruct(); - Bool Match( const ExtendedXlfd *pXlfd, + bool Match( const ExtendedXlfd *pXlfd, const Size& rPixelSize, sal_Bool bVertical ) const; XFontStruct* GetFontStruct( rtl_TextEncoding nEncoding ); XFontStruct* GetFontStruct( sal_Unicode nChar, rtl_TextEncoding *pEncoding ); - Bool ToImplFontMetricData( ImplFontMetricData *pMetric ); + bool ToImplFontMetricData( ImplFontMetricData *pMetric ); rtl_TextEncoding GetAsciiEncoding( int *pAsciiRange = NULL ) const; sal_Size GetCharWidth( sal_Unicode, sal_Int32* pPhysWidth, sal_Int32* pLogWidth ); |