diff options
| author | Sven Jacobi <sj@openoffice.org> | 2001-11-13 10:00:50 +0000 |
|---|---|---|
| committer | Sven Jacobi <sj@openoffice.org> | 2001-11-13 10:00:50 +0000 |
| commit | 504fa309a8a6d36459d869abdf1198163d9d3d71 (patch) | |
| tree | 961347128c306a92e855494d34b3fc2f234f3627 /svtools | |
| parent | 3406cc852d8fac3aa1fedadd5ce936d72ef681eb (diff) | |
#94620# set orrect textencoding for shift_jis and big5
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/filter.vcl/wmf/winmtf.cxx | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/svtools/source/filter.vcl/wmf/winmtf.cxx b/svtools/source/filter.vcl/wmf/winmtf.cxx index 7c196457d911..d1a03acd9d6e 100644 --- a/svtools/source/filter.vcl/wmf/winmtf.cxx +++ b/svtools/source/filter.vcl/wmf/winmtf.cxx @@ -2,9 +2,9 @@ * * $RCSfile: winmtf.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: sj $ $Date: 2001-11-06 17:14:38 $ + * last change: $Author: sj $ $Date: 2001-11-13 11:00:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -178,9 +178,7 @@ WinMtfFontStyle::WinMtfFontStyle( LOGFONTW& rFont ) { Size aFontSize( Size( 0, rFont.lfHeight ) ); - aFont.SetName( UniString( (char*)rFont.lfFaceName, gsl_getSystemTextEncoding() ) ); aFont.SetSize( aFontSize ); - CharSet eCharSet; switch ( rFont.lfCharSet ) { @@ -192,16 +190,23 @@ WinMtfFontStyle::WinMtfFontStyle( LOGFONTW& rFont ) eCharSet = RTL_TEXTENCODING_SYMBOL; break; + case SHIFTJIS_CHARSET: + eCharSet = RTL_TEXTENCODING_SHIFT_JIS; + break; + + case CHINESEBIG5_CHARSET: + eCharSet = RTL_TEXTENCODING_BIG5; + break; + case OEM_CHARSET: case DEFAULT_CHARSET: - case SHIFTJIS_CHARSET: case HANGEUL_CHARSET: - case CHINESEBIG5_CHARSET: default: eCharSet = gsl_getSystemTextEncoding(); break; } aFont.SetCharSet( eCharSet ); + aFont.SetName( UniString( (char*)rFont.lfFaceName, eCharSet ) ); FontFamily eFamily; switch ( rFont.lfPitchAndFamily & 0xf0 ) |