diff options
| author | th <th@openoffice.org> | 2000-12-08 17:37:14 +0000 |
|---|---|---|
| committer | th <th@openoffice.org> | 2000-12-08 17:37:14 +0000 |
| commit | 5aff4d1fe5109479bb50bf30261caf17901ff619 (patch) | |
| tree | 684521ac1b608159af76e0abdf75a710cee5eaf3 /vcl/win | |
| parent | 5578eb72e784f6177a2c7befd221eea9d2b950a8 (diff) | |
#81659# / #80872# - ignore Charset from the Font
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/source/gdi/salgdi3.cxx | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 3daddc97a068..07488c2bb8fc 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: salgdi3.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: th $ $Date: 2000-11-06 20:51:17 $ + * last change: $Author: th $ $Date: 2000-12-08 18:37:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -564,12 +564,19 @@ void ImplGetLogFontFromFontSelect( HDC hDC, nNameLen = (sizeof( rLogFont.lfFaceName )/sizeof( wchar_t ))-1-nOff; memcpy( rLogFont.lfFaceName+nOff, aName.GetBuffer(), nNameLen*sizeof( wchar_t ) ); rLogFont.lfFaceName[nNameLen+nOff] = 0; +/* if ( pFont->mpFontData && ((pFont->meCharSet == RTL_TEXTENCODING_DONTKNOW) || ((WIN_BYTE)(pFont->mpFontData->mpSysData) == OEM_CHARSET)) ) rLogFont.lfCharSet = (WIN_BYTE)(pFont->mpFontData->mpSysData); else rLogFont.lfCharSet = ImplCharSetToWin( pFont->meCharSet ); +*/ + if ( pFont->mpFontData ) + rLogFont.lfCharSet = (WIN_BYTE)(pFont->mpFontData->mpSysData); + else + rLogFont.lfCharSet = ImplCharSetToWin( pFont->meCharSet ); + rLogFont.lfPitchAndFamily = ImplPitchToWin( pFont->mePitch ); rLogFont.lfPitchAndFamily |= ImplFamilyToWin( pFont->meFamily ); rLogFont.lfWeight = ImplWeightToWin( pFont->meWeight ); @@ -633,12 +640,18 @@ USHORT SalGraphics::SetFont( ImplFontSelectData* pFont ) nNameLen = sizeof( maGraphicsData.mpLogFont->lfFaceName )-1; memcpy( maGraphicsData.mpLogFont->lfFaceName, aName.GetBuffer(), nNameLen ); maGraphicsData.mpLogFont->lfFaceName[nNameLen] = 0; +/* if ( pFont->mpFontData && ((pFont->meCharSet == RTL_TEXTENCODING_DONTKNOW) || ((WIN_BYTE)(pFont->mpFontData->mpSysData) == OEM_CHARSET)) ) maGraphicsData.mpLogFont->lfCharSet = (WIN_BYTE)(pFont->mpFontData->mpSysData); else maGraphicsData.mpLogFont->lfCharSet = ImplCharSetToWin( pFont->meCharSet ); +*/ + if ( pFont->mpFontData ) + maGraphicsData.mpLogFont->lfCharSet = (WIN_BYTE)(pFont->mpFontData->mpSysData); + else + maGraphicsData.mpLogFont->lfCharSet = ImplCharSetToWin( pFont->meCharSet ); maGraphicsData.mpLogFont->lfPitchAndFamily = ImplPitchToWin( pFont->mePitch ); maGraphicsData.mpLogFont->lfPitchAndFamily |= ImplFamilyToWin( pFont->meFamily ); maGraphicsData.mpLogFont->lfWeight = ImplWeightToWin( pFont->meWeight ); |