diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 08:22:44 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 08:22:44 +0000 |
| commit | d281568b957d7f4119ca273e11115470fa856aab (patch) | |
| tree | a2a68bb05f59db74eb78183223d9c570ee977918 /vcl/win/source | |
| parent | 18fce4c8df100a2b57909122e638b36ebcd70572 (diff) | |
INTEGRATION: CWS vcl34 (1.63.16); FILE MERGED
2005/01/21 14:19:59 hdu 1.63.16.2: #118959# fix font coverage for fonts without CMAP
2005/01/04 14:39:48 hdu 1.63.16.1: #118959# fix font coverage for symbol fonts without CMAP
Diffstat (limited to 'vcl/win/source')
| -rw-r--r-- | vcl/win/source/gdi/salgdi3.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index d41644b8eca8..26d17eeaa4d9 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.64 $ + * $Revision: 1.65 $ * - * last change: $Author: kz $ $Date: 2005-01-21 13:39:35 $ + * last change: $Author: rt $ $Date: 2005-01-31 09:22:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -877,8 +877,6 @@ void ImplWinFontData::ReadCmapTable( HDC hDC ) pCodePairs[2] = 0xF020; // original symbols pCodePairs[3] = 0xF100; } - else - mpUnicodeMap = ImplFontCharMap::GetDefaultMap(); } else { @@ -963,9 +961,12 @@ void ImplWinFontData::ReadCmapTable( HDC hDC ) for( pCP = pCodePairs; itInt != aSupportedRanges.end(); ++itInt ) *(pCP++) = *itInt; } + } + if( nRangeCount > 0 ) mpUnicodeMap = new ImplFontCharMap( nRangeCount, pCodePairs ); - } + else + mpUnicodeMap = ImplFontCharMap::GetDefaultMap(); } // ======================================================================= |