diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-07-22 16:26:49 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-07-22 16:26:49 +0000 |
| commit | c5fed10ef4f7d45e67f411e85a9a68a8db7cc4e2 (patch) | |
| tree | 6097da2f1d33987b613a3183dcb9b11d1b3326c4 /vcl/os2 | |
| parent | 4dc52566e6d7c39ee315ff068f36c460f234cfb0 (diff) | |
INTEGRATION: CWS os2port03 (1.5.116); FILE MERGED
2008/07/16 13:38:47 obr 1.5.116.2: RESYNC: (1.5-1.9); FILE MERGED
2008/04/15 14:42:28 ydario 1.5.116.1: Issue number: i85203
Submitted by: ydario
Reviewed by: ydario
Diffstat (limited to 'vcl/os2')
| -rw-r--r-- | vcl/os2/inc/salgdi.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/os2/inc/salgdi.h b/vcl/os2/inc/salgdi.h index cc0dcb05c41b..44526909c569 100644 --- a/vcl/os2/inc/salgdi.h +++ b/vcl/os2/inc/salgdi.h @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: salgdi.h,v $ - * $Revision: 1.9 $ + * $Revision: 1.10 $ * * This file is part of OpenOffice.org. * @@ -69,7 +69,7 @@ public: bool HasChar( sal_uInt32 cChar ) const; PFONTMETRICS GetFontMetrics() const { return pFontMetric; } - BYTE GetCharSet() const { return meOs2CharSet; } + USHORT GetCharSet() const { return meOs2CharSet; } BYTE GetPitchAndFamily() const { return mnPitchAndFamily; } bool IsGlyphApiDisabled() const { return mbDisableGlyphApi; } bool SupportsKorean() const { return mbHasKoreanRange; } @@ -90,7 +90,7 @@ private: // TODO: get rid of the members below needed to work with the Win9x non-unicode API BYTE* mpFontCharSets; // all Charsets for the current font (used on W98 for kerning) BYTE mnFontCharSetCount; // Number of Charsets of the current font; 0 - if not queried - BYTE meOs2CharSet; + USHORT meOs2CharSet; BYTE mnPitchAndFamily; bool mbAliasSymbolsHigh; bool mbAliasSymbolsLow; |